Add property to control consumed tracing types

Author: mhalbritter

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

@@ -167,7 +167,8 @@ static class BraveNoBaggageConfiguration {
 		@Bean
 		@ConditionalOnMissingBean
 		Factory propagationFactory(TracingProperties properties) {
-			return CompositePropagationFactory.create(properties.getPropagation().getType());
+			return CompositePropagationFactory.create(properties.getPropagation().getType(),
+					properties.getPropagation().getConsumeTypes());
 		}
 
 	}
@@ -187,7 +188,8 @@ static class BraveBaggageConfiguration {
 		BaggagePropagation.FactoryBuilder propagationFactoryBuilder(
 				ObjectProvider<BaggagePropagationCustomizer> baggagePropagationCustomizers) {
 			Factory delegate = CompositePropagationFactory.create(BRAVE_BAGGAGE_MANAGER,
-					this.tracingProperties.getPropagation().getType());
+					this.tracingProperties.getPropagation().getType(),
+					this.tracingProperties.getPropagation().getConsumeTypes());
 			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

@@ -16,7 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.tracing;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -134,31 +133,34 @@ public TraceContext decorate(TraceContext context) {
 
 	/**
 	 * Creates a new {@link CompositePropagationFactory}, which uses the given
-	 * {@code injectionTypes} for injection and all supported types for extraction.
+	 * {@code injectionTypes} for injection and {@code extractionTypes} for extraction.
 	 * @param baggageManager the baggage manager to use, or {@code null}
 	 * @param injectionTypes the propagation types for injection
+	 * @param extractionTypes the propagation types for extraction
 	 * @return the {@link CompositePropagationFactory}
 	 */
 	static CompositePropagationFactory create(BaggageManager baggageManager,
-			Collection<TracingProperties.Propagation.PropagationType> injectionTypes) {
+			Collection<TracingProperties.Propagation.PropagationType> injectionTypes,
+			Collection<TracingProperties.Propagation.PropagationType> extractionTypes) {
 		List<Factory> injectors = injectionTypes.stream()
 			.map((injection) -> factoryForType(baggageManager, injection))
 			.toList();
-		List<Factory> extractors = Arrays.stream(TracingProperties.Propagation.PropagationType.values())
+		List<Factory> extractors = extractionTypes.stream()
 			.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.
+	 * {@code injectionTypes} for injection and {@code extractionTypes} for extraction.
 	 * @param injectionTypes the propagation types for injection
+	 * @param extractionTypes the propagation types for extraction
 	 * @return the {@link CompositePropagationFactory}
 	 */
-	static CompositePropagationFactory create(
-			Collection<TracingProperties.Propagation.PropagationType> injectionTypes) {
-		return create(null, injectionTypes);
+	static CompositePropagationFactory create(Collection<TracingProperties.Propagation.PropagationType> injectionTypes,
+			Collection<TracingProperties.Propagation.PropagationType> extractionTypes) {
+		return create(null, injectionTypes, extractionTypes);
 	}
 
 	private static Factory factoryForType(BaggageManager baggageManager,

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

@@ -17,7 +17,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;
@@ -113,30 +112,34 @@ public <C> Context extract(Context context, C carrier, TextMapGetter<C> getter)
 
 	/**
 	 * Creates a new {@link CompositeTextMapPropagator}, which uses the given
-	 * {@code injectionTypes} for injection and all supported types for extraction.
+	 * {@code injectionTypes} for injection and {@code extractionTypes} for extraction.
 	 * @param injectionTypes the propagation types for injection
+	 * @param extractionTypes the propagation types for extraction
 	 * @return the {@link CompositeTextMapPropagator}
 	 */
-	static TextMapPropagator create(Collection<TracingProperties.Propagation.PropagationType> injectionTypes) {
-		return create(null, injectionTypes);
+	static TextMapPropagator create(Collection<TracingProperties.Propagation.PropagationType> injectionTypes,
+			Collection<TracingProperties.Propagation.PropagationType> extractionTypes) {
+		return create(null, injectionTypes, extractionTypes);
 	}
 
 	/**
 	 * Creates a new {@link CompositeTextMapPropagator}, which uses the given
-	 * {@code injectionTypes} for injection and all supported types for extraction.
+	 * {@code injectionTypes} for injection and {@code extractionTypes} for extraction.
 	 * @param baggagePropagator the baggage propagator to use, or {@code null}
 	 * @param injectionTypes the propagation types for injection
+	 * @param extractionTypes the propagation types for extraction
 	 * @return the {@link CompositeTextMapPropagator}
 	 */
 	static CompositeTextMapPropagator create(TextMapPropagator baggagePropagator,
-			Collection<TracingProperties.Propagation.PropagationType> injectionTypes) {
+			Collection<TracingProperties.Propagation.PropagationType> injectionTypes,
+			Collection<TracingProperties.Propagation.PropagationType> extractionTypes) {
 		List<TextMapPropagator> injectors = injectionTypes.stream()
 			.map((injection) -> forType(injection, baggagePropagator != null))
 			.collect(Collectors.toCollection(ArrayList::new));
 		if (baggagePropagator != null) {
 			injectors.add(baggagePropagator);
 		}
-		List<TextMapPropagator> extractors = Arrays.stream(TracingProperties.Propagation.PropagationType.values())
+		List<TextMapPropagator> extractors = extractionTypes.stream()
 			.map((extraction) -> forType(extraction, baggagePropagator != null))
 			.toList();
 		return new CompositeTextMapPropagator(injectors, extractors,

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

@@ -188,7 +188,8 @@ TextMapPropagator textMapPropagatorWithBaggage(OtelCurrentTraceContext otelCurre
 			BaggageTextMapPropagator baggagePropagator = new BaggageTextMapPropagator(remoteFields,
 					new OtelBaggageManager(otelCurrentTraceContext, remoteFields, Collections.emptyList()));
 			return CompositeTextMapPropagator.create(baggagePropagator,
-					this.tracingProperties.getPropagation().getType());
+					this.tracingProperties.getPropagation().getType(),
+					this.tracingProperties.getPropagation().getConsumeTypes());
 		}
 
 		@Bean
@@ -207,7 +208,8 @@ static class NoBaggageConfiguration {
 
 		@Bean
 		TextMapPropagator textMapPropagator(TracingProperties properties) {
-			return CompositeTextMapPropagator.create(properties.getPropagation().getType());
+			return CompositeTextMapPropagator.create(properties.getPropagation().getType(),
+					properties.getPropagation().getConsumeTypes());
 		}
 
 	}

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

@@ -170,6 +170,11 @@ public static class Propagation {
 		 */
 		private List<PropagationType> type = List.of(PropagationType.W3C);
 
+		/**
+		 * Tracing context propagation types consumed by the application.
+		 */
+		private List<PropagationType> consumeTypes = List.of(PropagationType.values());
+
 		public List<PropagationType> getType() {
 			return this.type;
 		}
@@ -178,6 +183,14 @@ public void setType(List<PropagationType> type) {
 			this.type = type;
 		}
 
+		void setConsumeTypes(List<PropagationType> consumeTypes) {
+			this.consumeTypes = consumeTypes;
+		}
+
+		List<PropagationType> getConsumeTypes() {
+			return this.consumeTypes;
+		}
+
 		/**
 		 * Supported propagation types. The declared order of the values matter.
 		 */