diff --git a/README.adoc b/README.adoc index 1a7ee4a7c..c0292d04a 100644 --- a/README.adoc +++ b/README.adoc @@ -700,16 +700,13 @@ NOTE: The SLF4J MDC is always set and logback users immediately see the trace an shown earlier. Other logging systems have to configure their own formatter to get the same result. The default is as follows: -`logging.pattern.level` set to `%5p [${spring.zipkin.service.name:${spring.application.name:-}},%X{traceId:-},%X{spanId:-},%X{spanExportable:-}]` +`logging.pattern.level` set to `%5p [${spring.zipkin.service.name:${spring.application.name:-}},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]` (this is a Spring Boot feature for logback users). If you do not use SLF4J, this pattern is NOT automatically applied. -IMPORTANT: Starting with version 3.0.0, the logging pattern has changed. -We've converted the MDC entries from B3 to non B3 keys (e.g. `X-B3-TraceId` to `traceId`). - == Building -:jdkversion: 1.8 +:jdkversion: 1.7 === Basic Compile and Test diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/FinishedSpanHandlerTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/FinishedSpanHandlerTests.java index ea64f5846..46e6d1528 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/FinishedSpanHandlerTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/FinishedSpanHandlerTests.java @@ -40,7 +40,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen /** * @author Marcin Grzejszczak */ -@SpringBootTest(classes = FinishedSpanHandlerTests.FinishedSpanHandlerAspectTestsConfig.class, webEnvironment = NONE) +@SpringBootTest( + classes = FinishedSpanHandlerTests.FinishedSpanHandlerAspectTestsConfig.class, + webEnvironment = NONE) public class FinishedSpanHandlerTests { @Autowired