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 2022/12/04 18:04:49 UTC
[camel] branch main updated: upgrade opentelemetry to the version 1.20.1
This is an automated email from the ASF dual-hosted git repository.
bvahdat 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 6efedf23be2 upgrade opentelemetry to the version 1.20.1
6efedf23be2 is described below
commit 6efedf23be203f6f2e19895157fa27c6df6da265
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sun Dec 4 12:26:27 2022 +0100
upgrade opentelemetry to the version 1.20.1
---
camel-dependencies/pom.xml | 2 +-
.../org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java | 2 +-
.../test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java | 3 ++-
parent/pom.xml | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 84298e007b9..b23bda8ffa5 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -442,7 +442,7 @@
<openjpa-version>3.2.2</openjpa-version>
<openstack4j-version>3.10</openstack4j-version>
<opentelemetry-alpha-version>${opentelemetry-version}-alpha</opentelemetry-alpha-version>
- <opentelemetry-version>1.17.0</opentelemetry-version>
+ <opentelemetry-version>1.20.1</opentelemetry-version>
<opentracing-tracerresolver-version>0.1.8</opentracing-tracerresolver-version>
<opentracing-version>0.33.0</opentracing-version>
<optaplanner-version>8.31.0.Final</optaplanner-version>
diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
index 4d9c9af4aee..5b52a148769 100644
--- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
+++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/SetCorrelationContextProcessor.java
@@ -98,7 +98,7 @@ public class SetCorrelationContextProcessor extends AsyncProcessorSupport implem
}
public String getBaggageName() {
- return baggageName.toString();
+ return baggageName;
}
public Expression getExpression() {
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
index a0839948b8d..ebc547fa875 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanProcessorsTest.java
@@ -46,7 +46,8 @@ public class SpanProcessorsTest extends CamelOpenTelemetryTestSupport {
Exchange result = template.request("direct:start",
exchange -> {
exchange.getIn().setBody("Hello");
- exchange.getIn().setHeader("request-header", simple("request-header-value"));
+ exchange.getIn().setHeader("request-header",
+ context.resolveLanguage("simple").createExpression("request-header-value"));
});
verify();
diff --git a/parent/pom.xml b/parent/pom.xml
index 2637fa14d6c..4dd88ecf680 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -427,7 +427,7 @@
<ognl-version>3.1.12</ognl-version>
<openjpa-version>3.2.2</openjpa-version>
<openstack4j-version>3.10</openstack4j-version>
- <opentelemetry-version>1.17.0</opentelemetry-version>
+ <opentelemetry-version>1.20.1</opentelemetry-version>
<opentelemetry-alpha-version>${opentelemetry-version}-alpha</opentelemetry-alpha-version>
<opentracing-version>0.33.0</opentracing-version>
<opentracing-tracerresolver-version>0.1.8</opentracing-tracerresolver-version>