(camel) branch camel-4.4.x updated: Backport 4.4.x (#15699)

[davsclaus]

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

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


The following commit(s) were added to refs/heads/camel-4.4.x by this push:
     new fa24d28d302 Backport 4.4.x (#15699)
fa24d28d302 is described below

commit fa24d28d3025a214809f85a556d1830074b6e1f9
Author: John Poth <poth.j...@gmail.com>
AuthorDate: Wed Sep 25 15:13:24 2024 +0200

    Backport 4.4.x (#15699)
    
    * CAMEL-21261 - camel-opentelemetry: let's use the strict context storage 
in tests to check for leaks
    
    (cherry picked from commit 0614ca2a862c291f08e63a855af315403fe77bb0)
    
    * CAMEL-21261 - camel-opentelemetry: let's use the context propagators 
defined in the tracer
    
    (cherry picked from commit 68d5b245b35e99ea08ee96ec397e4190a9800419)
---
 components/camel-opentelemetry/pom.xml                     | 14 ++++++++++++++
 .../apache/camel/opentelemetry/OpenTelemetryTracer.java    |  4 ++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/components/camel-opentelemetry/pom.xml 
b/components/camel-opentelemetry/pom.xml
index 182c3bafd87..012128f744f 100644
--- a/components/camel-opentelemetry/pom.xml
+++ b/components/camel-opentelemetry/pom.xml
@@ -100,6 +100,20 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        
<io.opentelemetry.context.enableStrictContext>true</io.opentelemetry.context.enableStrictContext>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>full</id>
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 6858d20e819..a961116ac6e 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
@@ -144,7 +144,7 @@ public class OpenTelemetryTracer extends 
org.apache.camel.tracing.Tracer {
             baggage = spanFromExchange.getBaggage();
         } else {
             ExtractAdapter adapter = 
sd.getExtractAdapter(exchange.getIn().getHeaders(), encoding);
-            Context ctx = 
GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator().extract(Context.current(),
 adapter,
+            Context ctx = 
getContextPropagators().getTextMapPropagator().extract(Context.current(), 
adapter,
                     new OpenTelemetryGetter(adapter));
             Span span = Span.fromContext(ctx);
             baggage = Baggage.fromContext(ctx);
@@ -174,7 +174,7 @@ public class OpenTelemetryTracer extends 
org.apache.camel.tracing.Tracer {
         } else {
             ctx = Context.current().with(otelSpan);
         }
-        
GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator().inject(ctx, 
adapter, new OpenTelemetrySetter());
+        getContextPropagators().getTextMapPropagator().inject(ctx, adapter, 
new OpenTelemetrySetter());
     }
 
     @Override