From 4a25ea4abc1c91419466354d3194a3abdfe2b2e1 Mon Sep 17 00:00:00 2001 From: Ryan Lubke Date: Mon, 13 Jan 2025 17:42:35 -0500 Subject: [PATCH] Bug 37474240 - [37474174->25.03] Span context not properly propagated when using Otel (merge main -> ce/main @ 113450) [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 113451] --- .../tracing/opentelemetry/OpenTelemetryTracer.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/prj/coherence-tracing/opentelemetry/src/main/java/com/tangosol/internal/tracing/opentelemetry/OpenTelemetryTracer.java b/prj/coherence-tracing/opentelemetry/src/main/java/com/tangosol/internal/tracing/opentelemetry/OpenTelemetryTracer.java index 47bc2e7f24347..029ee1e7be3fb 100644 --- a/prj/coherence-tracing/opentelemetry/src/main/java/com/tangosol/internal/tracing/opentelemetry/OpenTelemetryTracer.java +++ b/prj/coherence-tracing/opentelemetry/src/main/java/com/tangosol/internal/tracing/opentelemetry/OpenTelemetryTracer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. + * Copyright (c) 2023, 2025, Oracle and/or its affiliates. * * Licensed under the Universal Permissive License v 1.0 as shown at * https://oss.oracle.com/licenses/upl. @@ -72,11 +72,10 @@ public Map inject(SpanContext spanContext) @Override public SpanContext extract(Map carrier) { - LiteMap extractTarget = new LiteMap<>(); - TextMapPropagator propagator = GlobalOpenTelemetry.getPropagators().getTextMapPropagator(); + TextMapPropagator propagator = GlobalOpenTelemetry.getPropagators().getTextMapPropagator(); return new OpenTelemetrySpanContext(io.opentelemetry.api.trace.Span.fromContext( - propagator.extract(Context.current(), extractTarget, new MapGetter())) + propagator.extract(Context.current(), carrier, new MapGetter())) .getSpanContext()); }