Polish

Author: marcingrzejszczak

spring-cloud-sleuth-otel/src/main/java/org/springframework/cloud/sleuth/otel/bridge/OtelPropagator.java

@@ -21,7 +21,6 @@
 
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.Scope;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapPropagator;
@@ -74,10 +73,7 @@ public String get(C carrier, String key) {
 		});
 		io.opentelemetry.api.trace.Span span = io.opentelemetry.api.trace.Span.fromContextOrNull(extracted);
 		OtelTraceContext otelTraceContext = getOtelTraceContext(extracted, span);
-
-		try (Scope ignored = extracted.makeCurrent()) {
-			return OtelSpanBuilder.fromOtel(this.tracer.spanBuilder("")).setParent(otelTraceContext);
-		}
+		return OtelSpanBuilder.fromOtel(this.tracer.spanBuilder("")).setParent(otelTraceContext);
 	}
 
 	private static OtelTraceContext getOtelTraceContext(Context extracted, io.opentelemetry.api.trace.Span span) {

spring-cloud-sleuth-otel/src/test/java/org/springframework/cloud/sleuth/otel/bridge/BaggageTests.java

@@ -23,9 +23,9 @@
 
 import io.opentelemetry.api.baggage.Baggage;
 import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
+import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapPropagator;
-import io.opentelemetry.extension.trace.propagation.B3Propagator;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import org.junit.jupiter.api.Test;
@@ -49,7 +49,7 @@ class BaggageTests {
 			Collections.singletonList(KEY_1), Collections.emptyList(), Function.identity()::apply);
 
 	ContextPropagators contextPropagators = ContextPropagators.create(
-			TextMapPropagator.composite(W3CBaggagePropagator.getInstance(), B3Propagator.injectingSingleHeader(),
+			TextMapPropagator.composite(W3CBaggagePropagator.getInstance(), W3CTraceContextPropagator.getInstance(),
 					new BaggageTextMapPropagator(Collections.singletonList(KEY_1), otelBaggageManager)));
 
 	SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()

spring-cloud-sleuth-otel/src/test/java/org/springframework/cloud/sleuth/otel/bridge/OtelPropagatorTests.java

@@ -97,7 +97,8 @@ void should_propagate_context_with_baggage_only() {
 
 	@Test
 	void should_use_created_child_context_in_scope_instead_of_parent() {
-		OtelBaggageManager baggageManager = new OtelBaggageManager(otelCurrentTraceContext, Collections.emptyList(), Collections.emptyList(), Function.identity()::apply);
+		OtelBaggageManager baggageManager = new OtelBaggageManager(otelCurrentTraceContext, Collections.emptyList(),
+				Collections.emptyList(), Function.identity()::apply);
 		OtelTracer tracer = new OtelTracer(otelTracer, Function.identity()::apply, baggageManager);
 
 		Map<String, String> carrier = new HashMap<>();
@@ -107,19 +108,15 @@ void should_use_created_child_context_in_scope_instead_of_parent() {
 		String expectedSpanId = extracted.context().spanId();
 
 		try (Tracer.SpanInScope ignored = tracer.withSpan(extracted)) {
-			assertThat(tracer.currentSpan())
-					.extracting(Span::context)
-					.returns(expectedSpanId, TraceContext::spanId)
+			assertThat(tracer.currentSpan()).extracting(Span::context).returns(expectedSpanId, TraceContext::spanId)
 					.returns("3e425f2373d89640bde06e8285e7bf88", TraceContext::traceId)
 					.returns("9a5fdefae3abb440", TraceContext::parentId);
 
-			assertThat(tracer.currentTraceContext())
-					.isNotNull()
-					.extracting(CurrentTraceContext::context)
-					.isNotNull()
+			assertThat(tracer.currentTraceContext()).isNotNull().extracting(CurrentTraceContext::context).isNotNull()
 					.returns(expectedSpanId, TraceContext::spanId)
 					.returns("3e425f2373d89640bde06e8285e7bf88", TraceContext::traceId)
 					.returns("9a5fdefae3abb440", TraceContext::parentId);
 		}
 	}
+
 }