(camel) branch main updated: Otel close scope only once

[jpoth]

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

jpoth 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 e23ac0c558a Otel close scope only once
e23ac0c558a is described below

commit e23ac0c558afc5482e6650020ce97e4ab75b8c76
Author: John Poth <poth.j...@gmail.com>
AuthorDate: Mon Aug 26 15:17:49 2024 +0200

    Otel close scope only once
---
 .../src/main/java/org/apache/camel/tracing/ActiveSpanManager.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
 
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
index 92dc551619f..293151c767f 100644
--- 
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
+++ 
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java
@@ -76,8 +76,9 @@ public final class ActiveSpanManager {
         if (holder != null) {
             Holder parent = holder.getParent();
             exchange.setProperty(ExchangePropertyKey.ACTIVE_SPAN, parent);
-
-            holder.closeScope();
+            if (!holder.isClosed()) {
+                holder.closeScope();
+            }
             if (Boolean.TRUE.equals(exchange.getContext().isUseMDCLogging())) {
                 if (parent != null) {
                     SpanAdapter span = parent.getSpan();