Polish

Author: mhalbritter

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfiguration.java

@@ -16,10 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.tracing;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 import brave.CurrentSpanCustomizer;
@@ -38,27 +34,23 @@
 import brave.baggage.CorrelationScopeDecorator;
 import brave.context.slf4j.MDCScopeDecorator;
 import brave.handler.SpanHandler;
-import brave.propagation.B3Propagation;
 import brave.propagation.CurrentTraceContext;
 import brave.propagation.CurrentTraceContext.ScopeDecorator;
 import brave.propagation.CurrentTraceContextCustomizer;
 import brave.propagation.Propagation.Factory;
 import brave.propagation.ThreadLocalCurrentTraceContext;
 import brave.sampler.Sampler;
-import io.micrometer.tracing.BaggageManager;
 import io.micrometer.tracing.brave.bridge.BraveBaggageManager;
 import io.micrometer.tracing.brave.bridge.BraveCurrentTraceContext;
 import io.micrometer.tracing.brave.bridge.BravePropagator;
 import io.micrometer.tracing.brave.bridge.BraveSpanCustomizer;
 import io.micrometer.tracing.brave.bridge.BraveTracer;
 import io.micrometer.tracing.brave.bridge.CompositeSpanHandler;
-import io.micrometer.tracing.brave.bridge.W3CPropagation;
 import io.micrometer.tracing.exporter.SpanExportingPredicate;
 import io.micrometer.tracing.exporter.SpanFilter;
 import io.micrometer.tracing.exporter.SpanReporter;
 
 import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.actuate.autoconfigure.tracing.TracingProperties.Propagation.PropagationType;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -194,7 +186,8 @@ static class BraveBaggageConfiguration {
 		@ConditionalOnMissingBean
 		BaggagePropagation.FactoryBuilder propagationFactoryBuilder(
 				ObjectProvider<BaggagePropagationCustomizer> baggagePropagationCustomizers) {
-			Factory delegate =  CompositePropagationFactory.create(BRAVE_BAGGAGE_MANAGER, this.tracingProperties.getPropagation().getType());
+			Factory delegate = CompositePropagationFactory.create(BRAVE_BAGGAGE_MANAGER,
+					this.tracingProperties.getPropagation().getType());
 			FactoryBuilder builder = BaggagePropagation.newFactoryBuilder(delegate);
 			baggagePropagationCustomizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
 			return builder;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java

@@ -57,9 +57,9 @@ class CompositePropagationFactory extends Propagation.Factory implements Propaga
 		this.injectors = stream(this.injectorFactories).map(Factory::get).toList();
 		this.extractors = stream(extractorFactories).map(Factory::get).toList();
 		this.supportsJoin = Stream.concat(stream(this.injectorFactories), stream(this.extractorFactories))
-				.allMatch(Factory::supportsJoin);
+			.allMatch(Factory::supportsJoin);
 		this.requires128BitTraceId = Stream.concat(stream(this.injectorFactories), stream(this.extractorFactories))
-				.anyMatch(Factory::requires128BitTraceId);
+			.anyMatch(Factory::requires128BitTraceId);
 	}
 
 	Iterable<Factory> getInjectorFactories() {
@@ -69,9 +69,9 @@ Iterable<Factory> getInjectorFactories() {
 	@Override
 	public List<String> keys() {
 		return Stream.concat(this.injectors.stream(), this.extractors.stream())
-				.flatMap((entry) -> entry.keys().stream())
-				.distinct()
-				.toList();
+			.flatMap((entry) -> entry.keys().stream())
+			.distinct()
+			.toList();
 	}
 
 	@Override
@@ -130,23 +130,25 @@ public TraceContext decorate(TraceContext context) {
 	}
 
 	/**
-	 * Creates a new {@link CompositePropagationFactory}, which uses the given {@code injectionTypes} for injection and all supported
-	 * types for extraction.
-	 *
+	 * Creates a new {@link CompositePropagationFactory}, which uses the given
+	 * {@code injectionTypes} for injection and all supported types for extraction.
 	 * @param baggageManager the baggage manager to use, or {@code null}
 	 * @param injectionTypes the propagation types for injection
 	 * @return the {@link CompositePropagationFactory}
 	 */
-	static CompositePropagationFactory create(BaggageManager baggageManager, Iterable<TracingProperties.Propagation.PropagationType> injectionTypes) {
-		List<Factory> injectors = stream(injectionTypes).map((injector) -> factoryForType(baggageManager, injector)).toList();
-		List<Factory> extractors = Arrays.stream(TracingProperties.Propagation.PropagationType.values()).map((extractor) -> factoryForType(baggageManager, extractor)).toList();
+	static CompositePropagationFactory create(BaggageManager baggageManager,
+			Iterable<TracingProperties.Propagation.PropagationType> injectionTypes) {
+		List<Factory> injectors = stream(injectionTypes).map((injection) -> factoryForType(baggageManager, injection))
+			.toList();
+		List<Factory> extractors = Arrays.stream(TracingProperties.Propagation.PropagationType.values())
+			.map((extraction) -> factoryForType(baggageManager, extraction))
+			.toList();
 		return new CompositePropagationFactory(injectors, extractors);
 	}
 
 	/**
-	 * Creates a new {@link CompositePropagationFactory}, which uses the given {@code injectionTypes} for injection and all supported
-	 * types for extraction.
-	 *
+	 * Creates a new {@link CompositePropagationFactory}, which uses the given
+	 * {@code injectionTypes} for injection and all supported types for extraction.
 	 * @param injectionTypes the propagation types for injection
 	 * @return the {@link CompositePropagationFactory}
 	 */
@@ -158,7 +160,8 @@ private static <T> Stream<T> stream(Iterable<T> iterable) {
 		return StreamSupport.stream(iterable.spliterator(), false);
 	}
 
-	private static Factory factoryForType(BaggageManager baggageManager, TracingProperties.Propagation.PropagationType type) {
+	private static Factory factoryForType(BaggageManager baggageManager,
+			TracingProperties.Propagation.PropagationType type) {
 		return switch (type) {
 			case B3 -> b3Single();
 			case B3_MULTI -> b3Multi();
@@ -168,7 +171,6 @@ private static Factory factoryForType(BaggageManager baggageManager, TracingProp
 
 	/**
 	 * Creates a new B3 propagation factory using a single B3 header.
-	 *
 	 * @return the B3 propagation factory
 	 */
 	private static Factory b3Single() {
@@ -177,7 +179,6 @@ private static Factory b3Single() {
 
 	/**
 	 * Creates a new B3 propagation factory using multiple B3 headers.
-	 *
 	 * @return the B3 propagation factory
 	 */
 	private static Factory b3Multi() {
@@ -186,7 +187,6 @@ private static Factory b3Multi() {
 
 	/**
 	 * Creates a new W3C propagation factory.
-	 *
 	 * @param baggageManager baggage manager to use, or {@code null}
 	 * @return the W3C propagation factory
 	 */
@@ -195,5 +195,4 @@ private static W3CPropagation w3c(BaggageManager baggageManager) {
 				: new W3CPropagation();
 	}
 
-
 }