Polish

Author: mhalbritter

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

@@ -17,10 +17,10 @@
 package org.springframework.boot.actuate.autoconfigure.tracing;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 import brave.internal.propagation.StringPropagationAdapter;
 import brave.propagation.B3Propagation;
@@ -39,9 +39,9 @@
  */
 class CompositePropagationFactory extends Propagation.Factory implements Propagation<String> {
 
-	private final Iterable<Propagation.Factory> injectorFactories;
+	private final Collection<Propagation.Factory> injectorFactories;
 
-	private final Iterable<Propagation.Factory> extractorFactories;
+	private final Collection<Propagation.Factory> extractorFactories;
 
 	private final List<Propagation<String>> injectors;
 
@@ -51,27 +51,30 @@ class CompositePropagationFactory extends Propagation.Factory implements Propaga
 
 	private final boolean requires128BitTraceId;
 
-	CompositePropagationFactory(Iterable<Factory> injectorFactories, Iterable<Factory> extractorFactories) {
+	private final List<String> keys;
+
+	CompositePropagationFactory(Collection<Factory> injectorFactories, Collection<Factory> extractorFactories) {
 		this.injectorFactories = injectorFactories;
 		this.extractorFactories = extractorFactories;
-		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))
+		this.injectors = this.injectorFactories.stream().map(Factory::get).toList();
+		this.extractors = this.extractorFactories.stream().map(Factory::get).toList();
+		this.supportsJoin = Stream.concat(this.injectorFactories.stream(), this.extractorFactories.stream())
 			.allMatch(Factory::supportsJoin);
-		this.requires128BitTraceId = Stream.concat(stream(this.injectorFactories), stream(this.extractorFactories))
+		this.requires128BitTraceId = Stream.concat(this.injectorFactories.stream(), this.extractorFactories.stream())
 			.anyMatch(Factory::requires128BitTraceId);
+		this.keys = Stream.concat(this.injectors.stream(), this.extractors.stream())
+			.flatMap((entry) -> entry.keys().stream())
+			.distinct()
+			.toList();
 	}
 
-	Iterable<Factory> getInjectorFactories() {
+	Collection<Factory> getInjectorFactories() {
 		return this.injectorFactories;
 	}
 
 	@Override
 	public List<String> keys() {
-		return Stream.concat(this.injectors.stream(), this.extractors.stream())
-			.flatMap((entry) -> entry.keys().stream())
-			.distinct()
-			.toList();
+		return this.keys;
 	}
 
 	@Override
@@ -137,8 +140,9 @@ public TraceContext decorate(TraceContext context) {
 	 * @return the {@link CompositePropagationFactory}
 	 */
 	static CompositePropagationFactory create(BaggageManager baggageManager,
-			Iterable<TracingProperties.Propagation.PropagationType> injectionTypes) {
-		List<Factory> injectors = stream(injectionTypes).map((injection) -> factoryForType(baggageManager, injection))
+			Collection<TracingProperties.Propagation.PropagationType> injectionTypes) {
+		List<Factory> injectors = injectionTypes.stream()
+			.map((injection) -> factoryForType(baggageManager, injection))
 			.toList();
 		List<Factory> extractors = Arrays.stream(TracingProperties.Propagation.PropagationType.values())
 			.map((extraction) -> factoryForType(baggageManager, extraction))
@@ -152,14 +156,11 @@ static CompositePropagationFactory create(BaggageManager baggageManager,
 	 * @param injectionTypes the propagation types for injection
 	 * @return the {@link CompositePropagationFactory}
 	 */
-	static CompositePropagationFactory create(Iterable<TracingProperties.Propagation.PropagationType> injectionTypes) {
+	static CompositePropagationFactory create(
+			Collection<TracingProperties.Propagation.PropagationType> injectionTypes) {
 		return create(null, injectionTypes);
 	}
 
-	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) {
 		return switch (type) {

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

@@ -21,9 +21,9 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
@@ -41,11 +41,13 @@
  */
 class CompositeTextMapPropagator implements TextMapPropagator {
 
-	private final Iterable<TextMapPropagator> injectors;
+	private final Collection<TextMapPropagator> injectors;
 
-	private final Iterable<TextMapPropagator> mutuallyExclusiveExtractors;
+	private final Collection<TextMapPropagator> mutuallyExclusiveExtractors;
 
-	private final Iterable<TextMapPropagator> alwaysRunningExtractors;
+	private final Collection<TextMapPropagator> alwaysRunningExtractors;
+
+	private final Set<String> fields;
 
 	/**
 	 * Creates a new {@link CompositeTextMapPropagator}.
@@ -57,35 +59,24 @@ class CompositeTextMapPropagator implements TextMapPropagator {
 	 * order, regardless of the mutually exclusive extractors or whether the extractor
 	 * before it has already extracted a context
 	 */
-	CompositeTextMapPropagator(Iterable<TextMapPropagator> injectors,
-			Iterable<TextMapPropagator> mutuallyExclusiveExtractors,
-			Iterable<TextMapPropagator> alwaysRunningExtractors) {
+	CompositeTextMapPropagator(Collection<TextMapPropagator> injectors,
+			Collection<TextMapPropagator> mutuallyExclusiveExtractors,
+			Collection<TextMapPropagator> alwaysRunningExtractors) {
 		this.injectors = injectors;
 		this.mutuallyExclusiveExtractors = mutuallyExclusiveExtractors;
 		this.alwaysRunningExtractors = alwaysRunningExtractors;
+		this.fields = concat(this.injectors, this.mutuallyExclusiveExtractors, this.alwaysRunningExtractors)
+			.flatMap((entry) -> entry.fields().stream())
+			.collect(Collectors.toSet());
 	}
 
-	/**
-	 * Creates a new {@link CompositeTextMapPropagator}.
-	 * @param injectors the injectors
-	 * @param mutuallyExclusiveExtractors the mutually exclusive extractors. They are
-	 * applied in order, and as soon as an extractor extracts a context, the other
-	 * extractors after it are no longer invoked
-	 */
-	CompositeTextMapPropagator(Iterable<TextMapPropagator> injectors,
-			Iterable<TextMapPropagator> mutuallyExclusiveExtractors) {
-		this(injectors, mutuallyExclusiveExtractors, Collections.emptyList());
-	}
-
-	Iterable<TextMapPropagator> getInjectors() {
+	Collection<TextMapPropagator> getInjectors() {
 		return this.injectors;
 	}
 
 	@Override
 	public Collection<String> fields() {
-		return concat(this.injectors, this.mutuallyExclusiveExtractors, this.alwaysRunningExtractors)
-			.flatMap((entry) -> entry.fields().stream())
-			.collect(Collectors.toSet());
+		return this.fields;
 	}
 
 	@Override
@@ -126,7 +117,7 @@ public <C> Context extract(Context context, C carrier, TextMapGetter<C> getter)
 	 * @param injectionTypes the propagation types for injection
 	 * @return the {@link CompositeTextMapPropagator}
 	 */
-	static TextMapPropagator create(List<TracingProperties.Propagation.PropagationType> injectionTypes) {
+	static TextMapPropagator create(Collection<TracingProperties.Propagation.PropagationType> injectionTypes) {
 		return create(null, injectionTypes);
 	}
 
@@ -138,8 +129,8 @@ static TextMapPropagator create(List<TracingProperties.Propagation.PropagationTy
 	 * @return the {@link CompositeTextMapPropagator}
 	 */
 	static CompositeTextMapPropagator create(TextMapPropagator baggagePropagator,
-			Iterable<TracingProperties.Propagation.PropagationType> injectionTypes) {
-		List<TextMapPropagator> injectors = stream(injectionTypes)
+			Collection<TracingProperties.Propagation.PropagationType> injectionTypes) {
+		List<TextMapPropagator> injectors = injectionTypes.stream()
 			.map((injection) -> forType(injection, baggagePropagator != null))
 			.collect(Collectors.toCollection(ArrayList::new));
 		if (baggagePropagator != null) {
@@ -153,18 +144,14 @@ static CompositeTextMapPropagator create(TextMapPropagator baggagePropagator,
 	}
 
 	@SafeVarargs
-	private static <T> Stream<T> concat(Iterable<T>... iterables) {
+	private static <T> Stream<T> concat(Collection<T>... collections) {
 		Stream<T> result = Stream.empty();
-		for (Iterable<T> iterable : iterables) {
-			result = Stream.concat(result, stream(iterable));
+		for (Collection<T> collection : collections) {
+			result = Stream.concat(result, collection.stream());
 		}
 		return result;
 	}
 
-	private static <T> Stream<T> stream(Iterable<T> iterable) {
-		return StreamSupport.stream(iterable.spliterator(), false);
-	}
-
 	/**
 	 * Creates a new B3 propagator using a single B3 header.
 	 * @return the B3 propagator

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/BraveAutoConfigurationTests.java

@@ -18,7 +18,6 @@
 
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.StreamSupport;
 
 import brave.Span;
 import brave.SpanCustomizer;
@@ -271,8 +270,7 @@ void compositeSpanHandlerUsesFilterPredicateAndReportersInOrder() {
 	private List<Factory> getInjectors(Factory factory) {
 		assertThat(factory).as("factory").isNotNull();
 		if (factory instanceof CompositePropagationFactory compositePropagationFactory) {
-			return StreamSupport.stream(compositePropagationFactory.getInjectorFactories().spliterator(), false)
-				.toList();
+			return compositePropagationFactory.getInjectorFactories().stream().toList();
 		}
 		Assertions.fail("Expected CompositePropagationFactory, found %s".formatted(factory.getClass()));
 		throw new AssertionError("Unreachable");

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactoryTests.java

@@ -49,8 +49,10 @@ void returnsAllKeys() {
 	void supportsJoin() {
 		Propagation.Factory supportsJoin = Mockito.mock(Propagation.Factory.class);
 		given(supportsJoin.supportsJoin()).willReturn(true);
+		given(supportsJoin.get()).willReturn(new DummyPropagation("a"));
 		Propagation.Factory doesNotSupportsJoin = Mockito.mock(Propagation.Factory.class);
 		given(doesNotSupportsJoin.supportsJoin()).willReturn(false);
+		given(doesNotSupportsJoin.get()).willReturn(new DummyPropagation("a"));
 		CompositePropagationFactory factory = new CompositePropagationFactory(List.of(supportsJoin),
 				List.of(doesNotSupportsJoin));
 		assertThat(factory.supportsJoin()).isFalse();
@@ -60,8 +62,10 @@ void supportsJoin() {
 	void requires128BitTraceId() {
 		Propagation.Factory requires128BitTraceId = Mockito.mock(Propagation.Factory.class);
 		given(requires128BitTraceId.requires128BitTraceId()).willReturn(true);
+		given(requires128BitTraceId.get()).willReturn(new DummyPropagation("a"));
 		Propagation.Factory doesNotRequire128BitTraceId = Mockito.mock(Propagation.Factory.class);
 		given(doesNotRequire128BitTraceId.requires128BitTraceId()).willReturn(false);
+		given(doesNotRequire128BitTraceId.get()).willReturn(new DummyPropagation("a"));
 		CompositePropagationFactory factory = new CompositePropagationFactory(List.of(requires128BitTraceId),
 				List.of(doesNotRequire128BitTraceId));
 		assertThat(factory.requires128BitTraceId()).isTrue();

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositeTextMapPropagatorTests.java

@@ -58,7 +58,7 @@ void collectsAllFields() {
 	@Test
 	void injectAllFields() {
 		CompositeTextMapPropagator propagator = new CompositeTextMapPropagator(List.of(field("a"), field("b")),
-				Collections.emptyList());
+				Collections.emptyList(), Collections.emptyList());
 		TextMapSetter<Object> setter = setter();
 		Object carrier = carrier();
 		propagator.inject(context(), carrier, setter);
@@ -70,7 +70,7 @@ void injectAllFields() {
 	@Test
 	void extractMutuallyExclusive() {
 		CompositeTextMapPropagator propagator = new CompositeTextMapPropagator(Collections.emptyList(),
-				List.of(field("a"), field("b")));
+				List.of(field("a"), field("b")), Collections.emptyList());
 		Context context = context();
 		Map<String, String> carrier = Map.of("a", "a-value", "b", "b-value");
 		context = propagator.extract(context, carrier, new MapTextMapGetter());

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfigurationTests.java

@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.StreamSupport;
 
 import io.micrometer.tracing.SpanCustomizer;
 import io.micrometer.tracing.otel.bridge.OtelCurrentTraceContext;
@@ -218,7 +217,7 @@ void shouldSupplyW3CPropagationWithoutBaggageWhenDisabled() {
 	private List<TextMapPropagator> getInjectors(TextMapPropagator propagator) {
 		assertThat(propagator).as("propagator").isNotNull();
 		if (propagator instanceof CompositeTextMapPropagator compositePropagator) {
-			return StreamSupport.stream(compositePropagator.getInjectors().spliterator(), false).toList();
+			return compositePropagator.getInjectors().stream().toList();
 		}
 		fail("Expected CompositeTextMapPropagator, found %s".formatted(propagator.getClass()));
 		throw new AssertionError("Unreachable");