diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java
index 9bd7a0b10..884c80a84 100644
--- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java
+++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/autoconfig/TraceAutoConfiguration.java
@@ -108,18 +108,14 @@ public class TraceAutoConfiguration {
 	@ConditionalOnMissingBean
 	// NOTE: stable bean name as might be used outside sleuth
 	Tracing tracing(@LocalServiceName String serviceName, Propagation.Factory factory,
-			CurrentTraceContext currentTraceContext, Sampler sampler,
-			ErrorParser errorParser, SleuthProperties sleuthProperties,
-			@Nullable List<Reporter<zipkin2.Span>> spanReporters) {
-		Tracing.Builder builder = Tracing.newBuilder().sampler(sampler)
-				.errorParser(errorParser)
-				.localServiceName(StringUtils.isEmpty(serviceName) ? DEFAULT_SERVICE_NAME
-						: serviceName)
+			CurrentTraceContext currentTraceContext, Sampler sampler, ErrorParser errorParser,
+			SleuthProperties sleuthProperties, @Nullable List<Reporter<zipkin2.Span>> spanReporters) {
+		Tracing.Builder builder = Tracing.newBuilder().sampler(sampler).errorParser(errorParser)
+				.localServiceName(StringUtils.isEmpty(serviceName) ? DEFAULT_SERVICE_NAME : serviceName)
 				.propagationFactory(factory).currentTraceContext(currentTraceContext)
 				.spanReporter(new CompositeReporter(this.spanAdjusters,
 						spanReporters != null ? spanReporters : Collections.emptyList()))
-				.traceId128Bit(sleuthProperties.isTraceId128())
-				.supportsJoin(sleuthProperties.isSupportsJoin());
+				.traceId128Bit(sleuthProperties.isTraceId128()).supportsJoin(sleuthProperties.isSupportsJoin());
 		for (FinishedSpanHandler finishedSpanHandlerFactory : this.finishedSpanHandlers) {
 			builder.addFinishedSpanHandler(finishedSpanHandlerFactory);
 		}
@@ -150,8 +146,7 @@ public class TraceAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	Propagation.Factory sleuthPropagation(SleuthProperties sleuthProperties) {
-		if (sleuthProperties.getBaggageKeys().isEmpty()
-				&& sleuthProperties.getPropagationKeys().isEmpty()
+		if (sleuthProperties.getBaggageKeys().isEmpty() && sleuthProperties.getPropagationKeys().isEmpty()
 				&& extraFieldCustomizers.isEmpty()) {
 			return B3Propagation.FACTORY;
 		}
@@ -160,8 +155,7 @@ public class TraceAutoConfiguration {
 			factoryBuilder = this.extraFieldPropagationFactoryBuilder;
 		}
 		else {
-			factoryBuilder = ExtraFieldPropagation
-					.newFactoryBuilder(B3Propagation.FACTORY);
+			factoryBuilder = ExtraFieldPropagation.newFactoryBuilder(B3Propagation.FACTORY);
 		}
 		if (!sleuthProperties.getBaggageKeys().isEmpty()) {
 			factoryBuilder = factoryBuilder
@@ -230,11 +224,9 @@ public class TraceAutoConfiguration {
 
 		private final Reporter<zipkin2.Span> spanReporter;
 
-		private CompositeReporter(List<SpanAdjuster> spanAdjusters,
-				List<Reporter<Span>> spanReporters) {
+		private CompositeReporter(List<SpanAdjuster> spanAdjusters, List<Reporter<Span>> spanReporters) {
 			this.spanAdjusters = spanAdjusters;
-			this.spanReporter = spanReporters.size() == 1 ? spanReporters.get(0)
-					: new ListReporter(spanReporters);
+			this.spanReporter = spanReporters.size() == 1 ? spanReporters.get(0) : new ListReporter(spanReporters);
 		}
 
 		@Override
@@ -248,8 +240,8 @@ public class TraceAutoConfiguration {
 
 		@Override
 		public String toString() {
-			return "CompositeReporter{" + "spanAdjusters=" + this.spanAdjusters
-					+ ", spanReporters=" + this.spanReporter + '}';
+			return "CompositeReporter{" + "spanAdjusters=" + this.spanAdjusters + ", spanReporters=" + this.spanReporter
+					+ '}';
 		}
 
 		private static final class ListReporter implements Reporter<zipkin2.Span> {
@@ -267,8 +259,7 @@ public class TraceAutoConfiguration {
 						spanReporter.report(span);
 					}
 					catch (Exception ex) {
-						log.warn("Exception occurred while trying to report the span "
-								+ span, ex);
+						log.warn("Exception occurred while trying to report the span " + span, ex);
 					}
 				}
 			}
@@ -284,7 +275,7 @@ public class TraceAutoConfiguration {
 
 	@Configuration
 	@ConditionalOnMissingClass("io.micrometer.core.instrument.MeterRegistry")
-	static class TraceMetricsNoOpConfiguration {
+	static class TraceMetricsInMemoryConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean
@@ -300,7 +291,7 @@ public class TraceAutoConfiguration {
 
 		@Configuration
 		@ConditionalOnMissingBean(ReporterMetrics.class)
-		static class NoReporterMetricsConfiguration {
+		static class NoReporterMetricsBeanConfiguration {
 
 			@Bean
 			@ConditionalOnBean(MeterRegistry.class)