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

jpoth pushed a commit to branch otel-flaky
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 960ec628a2badf00f9598e75b5faca9b743e8e8f
Author: John Poth <poth.j...@gmail.com>
AuthorDate: Thu Sep 5 11:16:38 2024 +0200

    Revert "Otel close scope only once"
    
    This reverts commit e23ac0c558afc5482e6650020ce97e4ab75b8c76.
---
 .../src/main/java/org/apache/camel/tracing/ActiveSpanManager.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 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 293151c767f..92dc551619f 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,9 +76,8 @@ public final class ActiveSpanManager {
         if (holder != null) {
             Holder parent = holder.getParent();
             exchange.setProperty(ExchangePropertyKey.ACTIVE_SPAN, parent);
-            if (!holder.isClosed()) {
-                holder.closeScope();
-            }
+
+            holder.closeScope();
             if (Boolean.TRUE.equals(exchange.getContext().isUseMDCLogging())) {
                 if (parent != null) {
                     SpanAdapter span = parent.getSpan();

Reply via email to