From 975e2d110c3d3c0acde69dc787f1196b0b6ce4c2 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 19 Jun 2023 21:03:05 +0200 Subject: [PATCH] Polish CompositePropagationFactory Remove shaded Guava import --- .../autoconfigure/tracing/CompositePropagationFactory.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java index c648f9adcf7..0ec3db30c2b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/CompositePropagationFactory.java @@ -28,7 +28,6 @@ import brave.propagation.Propagation; import brave.propagation.Propagation.Factory; import brave.propagation.TraceContext; import brave.propagation.TraceContextOrSamplingFlags; -import graphql.com.google.common.collect.Streams; import io.micrometer.tracing.BaggageManager; import io.micrometer.tracing.brave.bridge.W3CPropagation; @@ -79,7 +78,7 @@ class CompositePropagationFactory extends Propagation.Factory { @Override public TraceContext decorate(TraceContext context) { - return Streams.concat(this.injectors.stream(), this.extractors.stream()) + return Stream.concat(this.injectors.stream(), this.extractors.stream()) .map((factory) -> factory.decorate(context)) .filter((decorated) -> decorated != context) .findFirst()