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 11:27:06 UTC
[camel] branch opentelemetry-1.20.1 created (now 8cf852ca685)
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a change to branch opentelemetry-1.20.1
in repository https://gitbox.apache.org/repos/asf/camel.git
at 8cf852ca685 upgrade opentelemetry to the version 1.20.1
This branch includes the following new commits:
new 8cf852ca685 upgrade opentelemetry to the version 1.20.1
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: upgrade opentelemetry to the version 1.20.1
Posted by bv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch opentelemetry-1.20.1
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8cf852ca6858e13e1f14b4111686a48e1e9a769a
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 +-
.../SetCorrelationContextProcessor.java | 2 +-
.../apache/camel/opentelemetry/ABCRouteTest.java | 6 ++--
.../CamelOpenTelemetryTestSupport.java | 4 +--
.../ClientRecipientListRouteTest.java | 6 ++--
.../CustomComponentNameRouteTest.java | 6 ++--
.../opentelemetry/MulticastParallelRouteTest.java | 6 ++--
.../camel/opentelemetry/MulticastRouteTest.java | 6 ++--
.../camel/opentelemetry/RouteConcurrentTest.java | 8 +++---
.../camel/opentelemetry/SpanProcessorsTest.java | 8 +++---
.../apache/camel/opentelemetry/SpanTestData.java | 32 +++++++++++-----------
.../camel/opentelemetry/TestSEDASpanDecorator.java | 2 +-
.../apache/camel/opentelemetry/TwoServiceTest.java | 6 ++--
.../opentelemetry/TwoServiceWithExcludeTest.java | 6 ++--
parent/pom.xml | 2 +-
15 files changed, 51 insertions(+), 51 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/ABCRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java
index eed6d4b0d9a..320f281d3f9 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ABCRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-public class ABCRouteTest extends CamelOpenTelemetryTestSupport {
+class ABCRouteTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("seda:b server").setUri("seda://b").setOperation("b")
.setParentId(2).addLogMessage("routing at b"),
@@ -31,12 +31,12 @@ public class ABCRouteTest extends CamelOpenTelemetryTestSupport {
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
};
- public ABCRouteTest() {
+ ABCRouteTest() {
super(testdata);
}
@Test
- public void testRoute() {
+ void testRoute() {
template.requestBody("direct:start", "Hello");
verify();
}
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java
index 3508eb46a7a..f34a2382442 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CamelOpenTelemetryTestSupport.java
@@ -39,7 +39,7 @@ import org.apache.camel.tracing.SpanDecorator;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-public class CamelOpenTelemetryTestSupport extends CamelTestSupport {
+class CamelOpenTelemetryTestSupport extends CamelTestSupport {
static final AttributeKey<String> CAMEL_URI_KEY = AttributeKey.stringKey("camel-uri");
static final AttributeKey<String> COMPONENT_KEY = AttributeKey.stringKey("component");
@@ -53,7 +53,7 @@ public class CamelOpenTelemetryTestSupport extends CamelTestSupport {
private OpenTelemetryTracer ottracer;
private SdkTracerProvider tracerFactory;
- public CamelOpenTelemetryTestSupport(SpanTestData[] testdata) {
+ CamelOpenTelemetryTestSupport(SpanTestData[] testdata) {
this.testdata = testdata;
}
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ClientRecipientListRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ClientRecipientListRouteTest.java
index 63945d11d4f..1fa8ff97fad 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ClientRecipientListRouteTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/ClientRecipientListRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-public class ClientRecipientListRouteTest extends CamelOpenTelemetryTestSupport {
+class ClientRecipientListRouteTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("seda:a server").setUri("seda://a").setOperation("a")
@@ -32,12 +32,12 @@ public class ClientRecipientListRouteTest extends CamelOpenTelemetryTestSupport
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
};
- public ClientRecipientListRouteTest() {
+ ClientRecipientListRouteTest() {
super(testdata);
}
@Test
- public void testRoute() {
+ void testRoute() {
template.requestBody("direct:start", "Hello");
verify();
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CustomComponentNameRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CustomComponentNameRouteTest.java
index cc8a860fdf4..27ddfdbd462 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CustomComponentNameRouteTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/CustomComponentNameRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-public class CustomComponentNameRouteTest extends CamelOpenTelemetryTestSupport {
+class CustomComponentNameRouteTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("myseda:b server").setUri("myseda://b").setOperation("b")
@@ -32,12 +32,12 @@ public class CustomComponentNameRouteTest extends CamelOpenTelemetryTestSupport
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
};
- public CustomComponentNameRouteTest() {
+ CustomComponentNameRouteTest() {
super(testdata);
}
@Test
- public void testRoute() {
+ void testRoute() {
template.requestBody("direct:start", "Hello");
verify();
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastParallelRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastParallelRouteTest.java
index 1ce73c5aeed..15fb907365e 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastParallelRouteTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastParallelRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-public class MulticastParallelRouteTest extends CamelOpenTelemetryTestSupport {
+class MulticastParallelRouteTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("seda:b server").setUri("seda://b").setOperation("b")
@@ -32,12 +32,12 @@ public class MulticastParallelRouteTest extends CamelOpenTelemetryTestSupport {
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
};
- public MulticastParallelRouteTest() {
+ MulticastParallelRouteTest() {
super(testdata);
}
@Test
- public void testRoute() {
+ void testRoute() {
template.requestBody("direct:start", "Hello");
verify(true);
}
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastRouteTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastRouteTest.java
index caa85e62bea..c464d593682 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastRouteTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/MulticastRouteTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-public class MulticastRouteTest extends CamelOpenTelemetryTestSupport {
+class MulticastRouteTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("seda:b server").setUri("seda://b").setOperation("b")
@@ -32,12 +32,12 @@ public class MulticastRouteTest extends CamelOpenTelemetryTestSupport {
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
};
- public MulticastRouteTest() {
+ MulticastRouteTest() {
super(testdata);
}
@Test
- public void testRoute() {
+ void testRoute() {
template.requestBody("direct:start", "Hello");
verify();
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/RouteConcurrentTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/RouteConcurrentTest.java
index 8e623e294fe..964932bdb95 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/RouteConcurrentTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/RouteConcurrentTest.java
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class RouteConcurrentTest extends CamelOpenTelemetryTestSupport {
+class RouteConcurrentTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("seda:foo server").setUri("seda://foo?concurrentConsumers=5").setOperation("foo"),
@@ -33,12 +33,12 @@ public class RouteConcurrentTest extends CamelOpenTelemetryTestSupport {
.setParentId(0)
};
- public RouteConcurrentTest() {
+ RouteConcurrentTest() {
super(testdata);
}
@Test
- public void testSingleInvocationsOfRoute() {
+ void testSingleInvocationsOfRoute() {
NotifyBuilder notify = new NotifyBuilder(context).whenDone(2).create();
template.sendBody("seda:foo", "Hello World");
@@ -49,7 +49,7 @@ public class RouteConcurrentTest extends CamelOpenTelemetryTestSupport {
}
@Test
- public void testConcurrentInvocationsOfRoute() {
+ void testConcurrentInvocationsOfRoute() {
NotifyBuilder notify = new NotifyBuilder(context).whenDone(10).create();
for (int i = 0; i < 5; i++) {
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..8b06a7b28af 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
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import static org.apache.camel.language.simple.SimpleLanguage.simple;
import static org.junit.jupiter.api.Assertions.assertEquals;
-public class SpanProcessorsTest extends CamelOpenTelemetryTestSupport {
+class SpanProcessorsTest extends CamelOpenTelemetryTestSupport {
private static final SpanTestData[] TEST_DATA = {
new SpanTestData().setLabel("seda:b server").setUri("seda://b").setOperation("b")
@@ -37,16 +37,16 @@ public class SpanProcessorsTest extends CamelOpenTelemetryTestSupport {
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
};
- public SpanProcessorsTest() {
+ SpanProcessorsTest() {
super(TEST_DATA);
}
@Test
- public void testRoute() {
+ void testRoute() {
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/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTestData.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTestData.java
index 3c5fccd500f..31143a90dcb 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTestData.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/SpanTestData.java
@@ -24,7 +24,7 @@ import java.util.Map;
import io.opentelemetry.api.trace.SpanKind;
-public class SpanTestData {
+class SpanTestData {
private String label;
private String uri;
@@ -36,70 +36,70 @@ public class SpanTestData {
private ArrayList<SpanTestData> childs = new ArrayList<>();
private Map<String, String> baggage = new HashMap<>();
- public String getLabel() {
+ String getLabel() {
return label;
}
- public SpanTestData setLabel(String label) {
+ SpanTestData setLabel(String label) {
this.label = label;
return this;
}
- public String getUri() {
+ String getUri() {
return uri;
}
- public SpanTestData setUri(String uri) {
+ SpanTestData setUri(String uri) {
this.uri = uri;
return this;
}
- public String getOperation() {
+ String getOperation() {
return operation;
}
- public SpanTestData setOperation(String operation) {
+ SpanTestData setOperation(String operation) {
this.operation = operation;
return this;
}
- public SpanKind getKind() {
+ SpanKind getKind() {
return kind;
}
- public SpanTestData setKind(SpanKind kind) {
+ SpanTestData setKind(SpanKind kind) {
this.kind = kind;
return this;
}
- public int getParentId() {
+ int getParentId() {
return parentId;
}
- public SpanTestData setParentId(int parentId) {
+ SpanTestData setParentId(int parentId) {
this.parentId = parentId;
return this;
}
- public SpanTestData addLogMessage(String mesg) {
+ SpanTestData addLogMessage(String mesg) {
logMessages.add(mesg);
return this;
}
- public List<String> getLogMessages() {
+ List<String> getLogMessages() {
return logMessages;
}
- public SpanTestData addTag(String key, String val) {
+ SpanTestData addTag(String key, String val) {
tags.put(key, val);
return this;
}
- public Map<String, String> getTags() {
+ Map<String, String> getTags() {
return tags;
}
- public SpanTestData setChilds(SpanTestData[] childs) {
+ SpanTestData setChilds(SpanTestData[] childs) {
Collections.addAll(this.childs, childs);
return this;
}
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TestSEDASpanDecorator.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TestSEDASpanDecorator.java
index 93cfb835f4b..c9597b97bdc 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TestSEDASpanDecorator.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TestSEDASpanDecorator.java
@@ -21,7 +21,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.tracing.SpanAdapter;
import org.apache.camel.tracing.decorators.SedaSpanDecorator;
-public class TestSEDASpanDecorator extends SedaSpanDecorator {
+class TestSEDASpanDecorator extends SedaSpanDecorator {
@Override
public void pre(SpanAdapter span, Exchange exchange, Endpoint endpoint) {
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceTest.java
index 3500bf3b422..563a089ce41 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceTest.java
@@ -20,7 +20,7 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-public class TwoServiceTest extends CamelOpenTelemetryTestSupport {
+class TwoServiceTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("ServiceB server").setUri("direct://ServiceB").setOperation("ServiceB")
@@ -28,12 +28,12 @@ public class TwoServiceTest extends CamelOpenTelemetryTestSupport {
new SpanTestData().setLabel("ServiceA server").setUri("direct://ServiceA").setOperation("ServiceA")
};
- public TwoServiceTest() {
+ TwoServiceTest() {
super(testdata);
}
@Test
- public void testRoute() {
+ void testRoute() {
template.requestBody("direct:ServiceA", "Hello");
verify();
diff --git a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceWithExcludeTest.java b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceWithExcludeTest.java
index da3a506d89d..dc8fd800ca6 100644
--- a/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceWithExcludeTest.java
+++ b/components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/TwoServiceWithExcludeTest.java
@@ -23,13 +23,13 @@ import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
-public class TwoServiceWithExcludeTest extends CamelOpenTelemetryTestSupport {
+class TwoServiceWithExcludeTest extends CamelOpenTelemetryTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("ServiceA server").setUri("direct://ServiceA").setOperation("ServiceA")
};
- public TwoServiceWithExcludeTest() {
+ TwoServiceWithExcludeTest() {
super(testdata);
}
@@ -39,7 +39,7 @@ public class TwoServiceWithExcludeTest extends CamelOpenTelemetryTestSupport {
}
@Test
- public void testRoute() {
+ void testRoute() {
template.requestBody("direct:ServiceA", "Hello");
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>