Fixed client & server handler

Author: marcingrzejszczak

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/TracerImplementation.java

@@ -16,9 +16,6 @@
 
 package org.springframework.cloud.sleuth.benchmarks.jmh;
 
-import org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration;
-import org.springframework.cloud.sleuth.autoconfig.otel.OtelAutoConfiguration;
-
 public enum TracerImplementation {
 
 	otel;

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

@@ -20,6 +20,7 @@
 import java.net.URISyntaxException;
 
 import io.opentelemetry.api.trace.Tracer;
+import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.instrumentation.api.tracer.HttpClientTracer;
@@ -71,8 +72,8 @@ public Span handleSend(HttpClientRequest request) {
 			}
 			return OtelSpan.fromOtel(io.opentelemetry.api.trace.Span.getInvalid());
 		}
-		io.opentelemetry.api.trace.Span span = startSpan(request);
-		return span(request, span);
+		Context context = startSpan(Context.current(), request, request);
+		return span(request, context);
 	}
 
 	@Override
@@ -85,16 +86,17 @@ public Span handleSend(HttpClientRequest request, TraceContext parent) {
 		}
 		io.opentelemetry.api.trace.Span span = parent != null ? ((OtelTraceContext) parent).span() : null;
 		if (span == null) {
-			return span(request, startSpan(request));
+			return span(request, startSpan(Context.current(), request, request));
 		}
 		try (Scope scope = span.makeCurrent()) {
-			io.opentelemetry.api.trace.Span withParent = startSpan(request);
+			Context withParent = startSpan(Context.current(), request, request);
 			return span(request, withParent);
 		}
 	}
 
-	private Span span(HttpClientRequest request, io.opentelemetry.api.trace.Span span) {
-		try (Scope scope = startScope(span, request)) {
+	private Span span(HttpClientRequest request, Context context) {
+		try (Scope scope = context.makeCurrent()) {
+			io.opentelemetry.api.trace.Span span = io.opentelemetry.api.trace.Span.fromContext(context);
 			if (span.isRecording()) {
 				String remoteIp = request.remoteIp();
 				if (StringUtils.hasText(remoteIp)) {
@@ -141,13 +143,13 @@ public void handleReceive(HttpClientResponse response, Span span) {
 			if (log.isDebugEnabled()) {
 				log.debug("There was an error, will finish span [" + otel + "] exceptionally");
 			}
-			endExceptionally(otel, response, response.error());
+			endExceptionally(otel.storeInContext(Context.current()), response, response.error());
 		}
 		else {
 			if (log.isDebugEnabled()) {
 				log.debug("There was no error, will finish span [" + otel + "] in a standard way");
 			}
-			end(otel, response);
+			end(otel.storeInContext(Context.current()), response);
 		}
 	}
 

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

@@ -21,6 +21,7 @@
 
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.instrumentation.api.tracer.HttpServerTracer;
 
@@ -64,20 +65,22 @@ public Span handleReceive(HttpServerRequest request) {
 		if (shouldSkip) {
 			return OtelSpan.fromOtel(io.opentelemetry.api.trace.Span.getInvalid());
 		}
-		Context context = startSpan(request, request, request.method());
+		Context context = startSpan(request, request, request, request.method());
 		return OtelSpan.fromOtel(io.opentelemetry.api.trace.Span.fromContext(context), context);
 	}
 
 	@Override
 	public void handleSend(HttpServerResponse response, Span span) {
 		Throwable throwable = response.error();
 		io.opentelemetry.api.trace.Span otel = OtelSpan.toOtel(span);
-		parseResponse(span, response);
-		if (throwable == null) {
-			end(otel, response);
-		}
-		else {
-			endExceptionally(otel, throwable, response);
+		try (Scope scope = otel.makeCurrent()) {
+			parseResponse(span, response);
+			if (throwable == null) {
+				end(Context.current(), response);
+			}
+			else {
+				endExceptionally(Context.current(), throwable, response);
+			}
 		}
 	}
 

tests/otel/spring-cloud-sleuth-instrumentation-messaging-tests/src/test/java/org/springframework/cloud/sleuth/otel/instrument/messaging/TracingChannelInterceptorTest.java

@@ -16,15 +16,7 @@
 
 package org.springframework.cloud.sleuth.otel.instrument.messaging;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import io.opentelemetry.context.Context;
 import io.opentelemetry.context.propagation.ContextPropagators;
-import io.opentelemetry.context.propagation.DefaultContextPropagators;
-import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.extension.trace.propagation.B3Propagator;
 
 import org.springframework.cloud.sleuth.otel.OtelTestTracing;
@@ -41,28 +33,7 @@ public TestTracingAware tracerTest() {
 			this.testTracing = new OtelTestTracing() {
 				@Override
 				protected ContextPropagators contextPropagators() {
-					return DefaultContextPropagators.builder().addTextMapPropagator(b3()).build();
-				}
-
-				TextMapPropagator b3() {
-					return new TextMapPropagator() {
-						@Override
-						public List<String> fields() {
-							List<String> fields = new ArrayList<>(B3Propagator.getInstance().fields());
-							fields.add("b3");
-							return fields;
-						}
-
-						@Override
-						public <C> void inject(Context context, @Nullable C c, Setter<C> setter) {
-							B3Propagator.getInstance().inject(context, c, setter);
-						}
-
-						@Override
-						public <C> Context extract(Context context, @Nullable C c, Getter<C> getter) {
-							return B3Propagator.getInstance().extract(context, c, getter);
-						}
-					};
+					return ContextPropagators.create(B3Propagator.getInstance());
 				}
 			};
 		}