SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[#149] Removed the JSON Span logger

Browse Source 
fixes #149
This commit is contained in:
Marcin Grzejszczak
2016-02-09 12:50:09 +01:00
parent b4e85d04d8
commit 51ff572fbe
3 changed files with 0 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/JsonLogSpanListener.java
View File

@@ -1,56 +0,0 @@
/*
* Copyright 2013-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.sleuth.log;
import lombok.Data;
import lombok.SneakyThrows;
import lombok.extern.apachecommons.CommonsLog;
import org.springframework.cloud.sleuth.event.SpanReleasedEvent;
import org.springframework.context.event.EventListener;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
* @author Spencer Gibb
*/
@CommonsLog
@Data
public class JsonLogSpanListener {
private final String prefix;
private final String suffix;
private final ObjectMapper objectMapper = new ObjectMapper();
public JsonLogSpanListener() {
this.prefix = "[span]";
this.suffix = "[endspan]";
this.objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
}
@SneakyThrows
@EventListener(SpanReleasedEvent.class)
@Order(Ordered.LOWEST_PRECEDENCE-10)
public void stop(SpanReleasedEvent event) {
log.info(this.prefix + this.objectMapper.writeValueAsString(event.getSpan()) +
this.suffix);
}
}

12
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/log/SleuthLogAutoConfiguration.java
View File

@@ -16,7 +16,6 @@
package org.springframework.cloud.sleuth.log;
import org.apache.commons.logging.Log;
import org.slf4j.MDC;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -45,15 +44,4 @@ public class SleuthLogAutoConfiguration {
return new Slf4jSpanListener();
}
}
@Configuration
@ConditionalOnClass(Log.class)
protected static class JsonConfiguration {
@Bean
@ConditionalOnProperty("spring.sleuth.log.json.enabled")
public JsonLogSpanListener jsonSlf4jSpanListener() {
return new JsonLogSpanListener();
}
}
}

68
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/log/JsonLogSpanListenerTests.java
View File

@@ -1,68 +0,0 @@
/*
* Copyright 2013-2015 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.cloud.sleuth.log;
import org.junit.Rule;
import org.junit.Test;
import org.springframework.boot.test.OutputCapture;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.event.SpanReleasedEvent;
import org.springframework.util.StringUtils;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Spencer Gibb
*/
public class JsonLogSpanListenerTests {
@Rule
public final OutputCapture output = new OutputCapture();
@Test
public void jsonSpanIsOnOneLine() throws IOException {
JsonLogSpanListener listener = new JsonLogSpanListener();
Span span = Span.builder()
.name("testSpan")
.spanId(1L)
.parent(2L)
.traceId(3L)
.begin(1)
.end(10)
.build();
span.tag("myKey", "myVal");
span.logEvent("myTimelineAnnotation");
listener.stop(new SpanReleasedEvent(this, span));
String output = this.output.toString().trim();
assertTrue("output doesn't contain prefix", output.contains(listener.getPrefix()));
assertTrue("output doesn't contain suffix", output.contains(listener.getSuffix()));
int prefixIndex = output.indexOf(listener.getPrefix());
int suffixIndex = output.indexOf(listener.getSuffix());
String json = output.substring(prefixIndex + listener.getPrefix().length(), suffixIndex);
assertTrue("json is empty", StringUtils.hasText(json));
assertFalse("json contains linefeed", output.contains("\n"));
assertFalse("json contains carriage return", output.contains("\r"));
Span read = listener.getObjectMapper().readValue(json, Span.class);
assertEquals("span not equals", read, span);
}
}