Merge branch 'maciej-gromul-main'

Author: marcingrzejszczak

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

@@ -44,10 +44,6 @@ class OtelSpanInScope implements Tracer.SpanInScope {
 	}
 
 	private Scope storedContext(io.opentelemetry.api.trace.Span otelSpan) {
-		if (otelSpan instanceof SpanFromSpanContext) {
-			SpanFromSpanContext spanFromSpanContext = (SpanFromSpanContext) otelSpan;
-			return spanFromSpanContext.otelTraceContext.context().makeCurrent();
-		}
 		if (this.sleuthSpan == null || this.sleuthSpan.context() == null
 				|| this.sleuthSpan.context().context() == null) {
 			return otelSpan.makeCurrent();

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

@@ -19,13 +19,13 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 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;
@@ -43,28 +43,26 @@ class BaggageTests {
 
 	public static final String VALUE_1 = "value1";
 
-	SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
-			.setSampler(io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn()).build();
-
-	OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider)
-			.setPropagators(ContextPropagators.create(B3Propagator.injectingSingleHeader())).build();
-
-	io.opentelemetry.api.trace.Tracer otelTracer = openTelemetrySdk.getTracer("io.micrometer.micrometer-tracing");
-
 	OtelCurrentTraceContext otelCurrentTraceContext = new OtelCurrentTraceContext();
 
 	OtelBaggageManager otelBaggageManager = new OtelBaggageManager(otelCurrentTraceContext,
-			Collections.singletonList(KEY_1), Collections.emptyList(), event -> {
-			});
+			Collections.singletonList(KEY_1), Collections.emptyList(), Function.identity()::apply);
 
 	ContextPropagators contextPropagators = ContextPropagators.create(
 			TextMapPropagator.composite(W3CBaggagePropagator.getInstance(), W3CTraceContextPropagator.getInstance(),
 					new BaggageTextMapPropagator(Collections.singletonList(KEY_1), otelBaggageManager)));
 
+	SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
+			.setSampler(io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn()).build();
+
+	OpenTelemetrySdk openTelemetrySdk = OpenTelemetrySdk.builder().setTracerProvider(sdkTracerProvider)
+			.setPropagators(contextPropagators).build();
+
+	io.opentelemetry.api.trace.Tracer otelTracer = openTelemetrySdk.getTracer("io.micrometer.micrometer-tracing");
+
 	OtelPropagator propagator = new OtelPropagator(contextPropagators, otelTracer);
 
-	Tracer tracer = new OtelTracer(otelTracer, event -> {
-	}, otelBaggageManager);
+	Tracer tracer = new OtelTracer(otelTracer, Function.identity()::apply, otelBaggageManager);
 
 	@Test
 	void canSetAndGetBaggage() {

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

@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.function.Function;
 
 import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator;
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
@@ -31,7 +32,12 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.cloud.sleuth.BaggageInScope;
+import org.springframework.cloud.sleuth.CurrentTraceContext;
 import org.springframework.cloud.sleuth.Span;
+import org.springframework.cloud.sleuth.TraceContext;
+import org.springframework.cloud.sleuth.Tracer;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 class OtelPropagatorTests {
 
@@ -89,4 +95,28 @@ 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);
+		OtelTracer tracer = new OtelTracer(otelTracer, Function.identity()::apply, baggageManager);
+
+		Map<String, String> carrier = new HashMap<>();
+		carrier.put("traceparent", "00-3e425f2373d89640bde06e8285e7bf88-9a5fdefae3abb440-00");
+
+		Span extracted = otelPropagator.extract(carrier, Map::get).start();
+		String expectedSpanId = extracted.context().spanId();
+
+		try (Tracer.SpanInScope ignored = tracer.withSpan(extracted)) {
+			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()
+					.returns(expectedSpanId, TraceContext::spanId)
+					.returns("3e425f2373d89640bde06e8285e7bf88", TraceContext::traceId)
+					.returns("9a5fdefae3abb440", TraceContext::parentId);
+		}
+	}
+
 }