You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2023/02/19 08:59:07 UTC
[camel] branch remove-ScopeWrapper created (now 0c6e45741bb)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch remove-ScopeWrapper
in repository https://gitbox.apache.org/repos/asf/camel.git
at 0c6e45741bb remove the ScopeWrapper workaround
This branch includes the following new commits:
new 0c6e45741bb remove the ScopeWrapper workaround
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/01: remove the ScopeWrapper workaround
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch remove-ScopeWrapper
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0c6e45741bb048e0b3e4a4b18e0b97529e39b237
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sun Feb 19 09:58:50 2023 +0100
remove the ScopeWrapper workaround
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/tracing/ActiveSpanManager.java | 27 +---------------------
parent/pom.xml | 2 +-
3 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index ab2b7c1071a..78868376b1f 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -396,7 +396,7 @@
<ognl-version>3.3.4</ognl-version>
<openjpa-version>3.2.2</openjpa-version>
<openstack4j-version>3.10</openstack4j-version>
- <opentelemetry-version>1.21.0</opentelemetry-version>
+ <opentelemetry-version>1.23.1</opentelemetry-version>
<opentelemetry-alpha-version>${opentelemetry-version}-alpha</opentelemetry-alpha-version>
<optaplanner-version>8.32.0.Final</optaplanner-version>
<os-maven-plugin-version>1.7.0</os-maven-plugin-version>
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 bce194f27ec..287a5d615ba 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
@@ -119,7 +119,7 @@ public final class ActiveSpanManager {
public Holder(Holder parent, SpanAdapter span) {
this.parent = parent;
this.span = span;
- this.scope = new ScopeWrapper(span.makeCurrent(), Thread.currentThread().getId());
+ this.scope = span.makeCurrent();
}
public Holder getParent() {
@@ -142,29 +142,4 @@ public final class ActiveSpanManager {
}
}
- /**
- * Makes closing scopes idempotent and prevents restoring scope on the wrong thread: Should be removed if
- * https://github.com/open-telemetry/opentelemetry-java/issues/5055 is fixed.
- */
- private static class ScopeWrapper implements AutoCloseable {
- private final long startThreadId;
- private final AutoCloseable inner;
- private boolean closed;
-
- public ScopeWrapper(AutoCloseable inner, long startThreadId) {
- this.startThreadId = startThreadId;
- this.inner = inner;
- }
-
- @Override
- public void close() throws Exception {
- if (!closed && Thread.currentThread().getId() == startThreadId) {
- closed = true;
- inner.close();
- } else {
- LOG.debug("not closing scope, closed - {}, started on thread - '{}', current thread - '{}'",
- closed, startThreadId, Thread.currentThread().getId());
- }
- }
- }
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c154061e81..6cd726382d0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -391,7 +391,7 @@
<ognl-version>3.3.4</ognl-version>
<openjpa-version>3.2.2</openjpa-version>
<openstack4j-version>3.10</openstack4j-version>
- <opentelemetry-version>1.21.0</opentelemetry-version>
+ <opentelemetry-version>1.23.1</opentelemetry-version>
<opentelemetry-alpha-version>${opentelemetry-version}-alpha</opentelemetry-alpha-version>
<optaplanner-version>8.32.0.Final</optaplanner-version>
<os-maven-plugin-version>1.7.0</os-maven-plugin-version>