You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/10/15 14:35:44 UTC

[camel] branch camel-3.x updated: CAMEL-19968: The Tracing Strategy is failing when using pollEnrich wi… (#11724)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.x by this push:
     new 01460f132c7 CAMEL-19968: The Tracing Strategy is failing when using pollEnrich wi… (#11724)
01460f132c7 is described below

commit 01460f132c7ad60dfdf735958edbb50829c079fc
Author: Rhuan Rocha <rh...@gmail.com>
AuthorDate: Sun Oct 15 11:35:08 2023 -0300

    CAMEL-19968: The Tracing Strategy is failing when using pollEnrich wi… (#11724)
    
    * CAMEL-19968: The Tracing Strategy is failing when using pollEnrich with seda endpoint
    
    Signed-off-by: Rhuan Rocha <rh...@gmail.com>
    
    * CAMEL-19968: The Tracing Strategy is failing when using pollEnrich with seda endpoint
    
    Signed-off-by: Rhuan Rocha <rh...@gmail.com>
    
    ---------
    
    Signed-off-by: Rhuan Rocha <rh...@gmail.com>
---
 .../apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
index 7e2266bf3ae..da3b3c854a7 100644
--- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
+++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
@@ -48,8 +48,12 @@ public class OpenTelemetryTracingStrategy implements InterceptStrategy {
         }
 
         return new DelegateAsyncProcessor((Exchange exchange) -> {
+            Span span = null;
             OpenTelemetrySpanAdapter spanWrapper = (OpenTelemetrySpanAdapter) ActiveSpanManager.getSpan(exchange);
-            Span span = spanWrapper.getOpenTelemetrySpan();
+            if (spanWrapper != null) {
+                span = spanWrapper.getOpenTelemetrySpan();
+            }
+
             if (span == null) {
                 target.process(exchange);
                 return;