WIP

Author: mhalbritter

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

@@ -17,6 +17,7 @@
 package org.springframework.boot.actuate.autoconfigure.tracing;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -56,6 +57,7 @@
 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;
@@ -81,6 +83,8 @@
 @ConditionalOnEnabledTracing
 public class BraveAutoConfiguration {
 
+	private static final BraveBaggageManager BRAVE_BAGGAGE_MANAGER = new BraveBaggageManager();
+
 	/**
 	 * Default value for application name if {@code spring.application.name} is not set.
 	 */
@@ -95,25 +99,19 @@ CompositeSpanHandler compositeSpanHandler(ObjectProvider<SpanExportingPredicate>
 				filters.orderedStream().toList());
 	}
 
-	@Bean
-	@ConditionalOnMissingBean
-	BraveBaggageManager braveBaggageManager() {
-		return new BraveBaggageManager();
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	public Tracing braveTracing(Environment environment, List<SpanHandler> spanHandlers,
 			List<TracingCustomizer> tracingCustomizers, CurrentTraceContext currentTraceContext,
 			Factory propagationFactory, Sampler sampler) {
 		String applicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
 		Builder builder = Tracing.newBuilder()
-				.currentTraceContext(currentTraceContext)
-				.traceId128Bit(true)
-				.supportsJoin(false)
-				.propagationFactory(propagationFactory)
-				.sampler(sampler)
-				.localServiceName(applicationName);
+			.currentTraceContext(currentTraceContext)
+			.traceId128Bit(true)
+			.supportsJoin(false)
+			.propagationFactory(propagationFactory)
+			.sampler(sampler)
+			.localServiceName(applicationName);
 		spanHandlers.forEach(builder::addSpanHandler);
 		for (TracingCustomizer tracingCustomizer : tracingCustomizers) {
 			tracingCustomizer.customize(builder);
@@ -147,9 +145,8 @@ public Sampler braveSampler(TracingProperties properties) {
 
 	@Bean
 	@ConditionalOnMissingBean(io.micrometer.tracing.Tracer.class)
-	BraveTracer braveTracerBridge(brave.Tracer tracer, CurrentTraceContext currentTraceContext,
-			BraveBaggageManager braveBaggageManager) {
-		return new BraveTracer(tracer, new BraveCurrentTraceContext(currentTraceContext), braveBaggageManager);
+	BraveTracer braveTracerBridge(brave.Tracer tracer, CurrentTraceContext currentTraceContext) {
+		return new BraveTracer(tracer, new BraveCurrentTraceContext(currentTraceContext), BRAVE_BAGGAGE_MANAGER);
 	}
 
 	@Bean
@@ -176,19 +173,10 @@ static class BraveNoBaggageConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean
-		ExtractorFactories extractorFactories() {
-			return ExtractorFactories.of(PropagationFactoryFactory.factoriesFor(PropagationType.values()));
-		}
-
-		@Bean
-		@ConditionalOnMissingBean
-		InjectorFactories injectorFactories(TracingProperties tracing) {
-			return InjectorFactories.of(PropagationFactoryFactory.factoriesFor(tracing.getPropagation().getType()));
-		}
-
-		@Bean
-		@ConditionalOnMissingBean
-		Factory propagationFactory(InjectorFactories injectorFactories, ExtractorFactories extractorFactories) {
+		Factory propagationFactory(TracingProperties properties) {
+			Iterable<Factory> injectorFactories = PropagationFactoryFactory
+				.factoriesFor(properties.getPropagation().getType());
+			Iterable<Factory> extractorFactories = PropagationFactoryFactory.factoriesFor(PropagationType.values());
 			return new CompositePropagationFactory(injectorFactories, extractorFactories);
 		}
 
@@ -204,25 +192,14 @@ static class BraveBaggageConfiguration {
 			this.tracingProperties = tracingProperties;
 		}
 
-		@Bean
-		@ConditionalOnMissingBean
-		ExtractorFactories extractorFactories(BraveBaggageManager braveBaggageManager) {
-			return ExtractorFactories
-					.of(PropagationFactoryFactory.factoriesFor(braveBaggageManager, PropagationType.values()));
-		}
-
-		@Bean
-		@ConditionalOnMissingBean
-		InjectorFactories injectorFactories(BraveBaggageManager braveBaggageManager) {
-			return InjectorFactories.of(PropagationFactoryFactory.factoriesFor(braveBaggageManager,
-					this.tracingProperties.getPropagation().getType()));
-		}
-
 		@Bean
 		@ConditionalOnMissingBean
 		BaggagePropagation.FactoryBuilder propagationFactoryBuilder(
-				ObjectProvider<BaggagePropagationCustomizer> baggagePropagationCustomizers,
-				InjectorFactories injectorFactories, ExtractorFactories extractorFactories) {
+				ObjectProvider<BaggagePropagationCustomizer> baggagePropagationCustomizers) {
+			Iterable<Factory> injectorFactories = PropagationFactoryFactory.factoriesFor(BRAVE_BAGGAGE_MANAGER,
+					this.tracingProperties.getPropagation().getType());
+			Iterable<Factory> extractorFactories = PropagationFactoryFactory.factoriesFor(BRAVE_BAGGAGE_MANAGER,
+					PropagationType.values());
 			Factory delegate = new CompositePropagationFactory(injectorFactories, extractorFactories);
 			FactoryBuilder builder = BaggagePropagation.newFactoryBuilder(delegate);
 			baggagePropagationCustomizers.orderedStream().forEach((customizer) -> customizer.customize(builder));
@@ -264,8 +241,8 @@ CorrelationScopeCustomizer correlationFieldsCorrelationScopeCustomizer() {
 				List<String> correlationFields = this.tracingProperties.getBaggage().getCorrelation().getFields();
 				for (String field : correlationFields) {
 					builder.add(CorrelationScopeConfig.SingleCorrelationField.newBuilder(BaggageField.create(field))
-							.flushOnUpdate()
-							.build());
+						.flushOnUpdate()
+						.build());
 				}
 			};
 		}
@@ -278,60 +255,6 @@ ScopeDecorator correlationScopeDecorator(CorrelationScopeDecorator.Builder build
 
 	}
 
-	/**
-	 * A collection of {@link Factory factories} used for trace context extraction.
-	 *
-	 * @author Moritz Halbritter
-	 * @since 3.0.8
-	 */
-	public interface ExtractorFactories extends Iterable<Factory> {
-
-		/**
-		 * Creates an {@link ExtractorFactories} object from the given factories.
-		 * @param factories factories
-		 * @return {@link ExtractorFactories} object
-		 */
-		static ExtractorFactories of(Iterable<Factory> factories) {
-			return factories::iterator;
-		}
-
-		static ExtractorFactories of(PropagationType... types) {
-			return of(PropagationFactoryFactory.factoriesFor(types));
-		}
-
-		static ExtractorFactories of(BaggageManager baggageManager, PropagationType... types) {
-			return of(PropagationFactoryFactory.factoriesFor(baggageManager, types));
-		}
-
-	}
-
-	/**
-	 * A collection of {@link Factory factories} used for trace context injection.
-	 *
-	 * @author Moritz Halbritter
-	 * @since 3.0.8
-	 */
-	public interface InjectorFactories extends Iterable<Factory> {
-
-		/**
-		 * Creates an {@link InjectorFactories} object from the given factories.
-		 * @param factories factories
-		 * @return {@link InjectorFactories} object
-		 */
-		static InjectorFactories of(Iterable<Factory> factories) {
-			return factories::iterator;
-		}
-
-		static InjectorFactories of(PropagationType... types) {
-			return of(PropagationFactoryFactory.factoriesFor(types));
-		}
-
-		static InjectorFactories of(BaggageManager baggageManager, PropagationType... types) {
-			return of(PropagationFactoryFactory.factoriesFor(baggageManager, types));
-		}
-
-	}
-
 	/**
 	 * Factory for {@link Factory propagation factories}.
 	 */
@@ -365,10 +288,18 @@ private static Factory forType(BaggageManager baggageManager, PropagationType ty
 			};
 		}
 
+		private static List<Factory> factoriesFor(Collection<PropagationType> types) {
+			return factoriesFor(null, types.toArray(PropagationType[]::new));
+		}
+
 		private static List<Factory> factoriesFor(PropagationType... types) {
 			return factoriesFor(null, types);
 		}
 
+		private static List<Factory> factoriesFor(BaggageManager baggageManager, Collection<PropagationType> types) {
+			return factoriesFor(baggageManager, types.toArray(PropagationType[]::new));
+		}
+
 		private static List<Factory> factoriesFor(BaggageManager baggageManager, PropagationType... types) {
 			List<Factory> result = new ArrayList<>(types.length);
 			for (PropagationType type : types) {

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

@@ -25,6 +25,13 @@
 import brave.propagation.TraceContext;
 import brave.propagation.TraceContextOrSamplingFlags;
 
+/**
+ * {@link Factory} which supports multiple tracing formats. It is able to configure
+ * different formats for injecting and for extracting.
+ *
+ * @author Marcin Grzejszczak
+ * @author Moritz Halbritter
+ */
 class CompositePropagationFactory extends Propagation.Factory implements Propagation<String> {
 
 	private final Iterable<Propagation.Factory> injectorFactories;
@@ -45,9 +52,9 @@ class CompositePropagationFactory extends Propagation.Factory implements Propaga
 	@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
@@ -81,13 +88,13 @@ public <K> Propagation<K> create(KeyFactory<K> keyFactory) {
 	@Override
 	public boolean supportsJoin() {
 		return Stream.concat(stream(this.injectorFactories), stream(this.extractorFactories))
-				.allMatch(Factory::supportsJoin);
+			.allMatch(Factory::supportsJoin);
 	}
 
 	@Override
 	public boolean requires128BitTraceId() {
 		return Stream.concat(stream(this.injectorFactories), stream(this.extractorFactories))
-				.allMatch(Factory::requires128BitTraceId);
+			.allMatch(Factory::requires128BitTraceId);
 	}
 
 	@Override

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

@@ -18,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -166,18 +167,32 @@ public void setFields(List<String> fields) {
 	public static class Propagation {
 
 		/**
-		 * Tracing context propagation type.
+		 * Tracing context propagation types.
 		 */
-		private PropagationType type = PropagationType.W3C;
+		private Set<PropagationType> type = Set.of(PropagationType.W3C);
 
-		public PropagationType getType() {
+		public Set<PropagationType> getType() {
 			return this.type;
 		}
 
-		public void setType(PropagationType type) {
+		public void setType(Set<PropagationType> type) {
 			this.type = type;
 		}
 
+		enum PropagationType {
+
+			/**
+			 * B3 propagation type.
+			 */
+			B3,
+
+			/**
+			 * W3C propagation type.
+			 */
+			W3C
+
+		}
+
 	}
 
 }