This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 3200bd9 Builds current otel context depending on the exchange's baggage state 3200bd9 is described below commit 3200bd9c775a1aa203a37aea64f754a41e3b9409 Author: Andrew Fernandez <fde...@ymail.com> AuthorDate: Tue Nov 9 14:38:52 2021 +0000 Builds current otel context depending on the exchange's baggage state --- .../java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java index f7aff62..d56073a 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java @@ -138,7 +138,12 @@ public class OpenTelemetryTracer extends org.apache.camel.tracing.Tracer { protected void inject(SpanAdapter span, InjectAdapter adapter) { OpenTelemetrySpanAdapter spanFromExchange = (OpenTelemetrySpanAdapter) span; Span otelSpan = spanFromExchange.getOpenTelemetrySpan(); - Context ctx = Context.current().with(otelSpan).with(spanFromExchange.getBaggage()); + Context ctx; + if (spanFromExchange.getBaggage() != null) { + ctx = Context.current().with(otelSpan).with(spanFromExchange.getBaggage()); + } else { + ctx = Context.current().with(otelSpan); + } GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator().inject(ctx, adapter, new OpenTelemetrySetter()); }