This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 03836e0e722 CAMEL-19968: The Tracing Strategy is failing when using
pollEnrich (#11727)
03836e0e722 is described below
commit 03836e0e722d6163ccd1fd3385d37643c19c165b
Author: Rhuan Rocha <[email protected]>
AuthorDate: Mon Oct 16 03:22:15 2023 -0300
CAMEL-19968: The Tracing Strategy is failing when using pollEnrich (#11727)
* CAMEL-19968: The Tracing Strategy is failing when using pollEnrich with
seda endpoint
Signed-off-by: Rhuan Rocha <[email protected]>
* CAMEL-19968: The Tracing Strategy is failing when using pollEnrich with
seda endpoint
Signed-off-by: Rhuan Rocha <[email protected]>
---------
Signed-off-by: Rhuan Rocha <[email protected]>
---
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 0be8875ac2e..ee08a2227f4 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -439,7 +439,7 @@ Enriches a message with data from a secondary resource
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Camel error handling.
+Error handler settings
]]>
</xs:documentation>
</xs:annotation>
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;