You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/03/28 10:38:49 UTC
[camel] branch camel-3.x updated: Regen for commit a79394825f3324d0dfda5e9abe62ab8eaaaedf67 (#9666)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 14b908170b8 Regen for commit a79394825f3324d0dfda5e9abe62ab8eaaaedf67 (#9666)
14b908170b8 is described below
commit 14b908170b88ce99fdc537be92de1ecafa0eb60c
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Tue Mar 28 12:38:35 2023 +0200
Regen for commit a79394825f3324d0dfda5e9abe62ab8eaaaedf67 (#9666)
Signed-off-by: GitHub <no...@github.com>
Co-authored-by: davsclaus <da...@users.noreply.github.com>
---
.../camel/observation/CamelMicrometerObservationTestSupport.java | 6 ++++--
.../test/java/org/apache/camel/observation/MulticastRouteTest.java | 3 ++-
.../test/java/org/apache/camel/observation/SpanProcessorsTest.java | 3 ++-
.../java/org/apache/camel/opentelemetry/MulticastRouteTest.java | 3 ++-
.../java/org/apache/camel/opentelemetry/SpanProcessorsTest.java | 3 ++-
.../src/main/java/org/apache/camel/tracing/Tracer.java | 1 -
6 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java b/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java
index c3ffbb9c458..945c4f8b8f5 100644
--- a/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java
+++ b/components/camel-observation/src/test/java/org/apache/camel/observation/CamelMicrometerObservationTestSupport.java
@@ -46,7 +46,6 @@ import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.propagation.ContextPropagators;
import io.opentelemetry.context.propagation.TextMapPropagator;
-import io.opentelemetry.extension.trace.propagation.B3Propagator;
import io.opentelemetry.sdk.testing.exporter.InMemorySpanExporter;
import io.opentelemetry.sdk.trace.ReadWriteSpan;
import io.opentelemetry.sdk.trace.ReadableSpan;
@@ -102,7 +101,10 @@ class CamelMicrometerObservationTestSupport extends CamelTestSupport {
io.micrometer.tracing.Tracer otelTracer = otelTracer();
OtelPropagator otelPropagator
- = new OtelPropagator(ContextPropagators.create(TextMapPropagator.composite(W3CTraceContextPropagator.getInstance(), W3CBaggagePropagator.getInstance())), tracer);
+ = new OtelPropagator(
+ ContextPropagators.create(TextMapPropagator.composite(W3CTraceContextPropagator.getInstance(),
+ W3CBaggagePropagator.getInstance())),
+ tracer);
observationRegistry.observationConfig().observationHandler(
new ObservationHandler.FirstMatchingCompositeObservationHandler(
new PropagatingSenderTracingObservationHandler<>(otelTracer, otelPropagator),
diff --git a/components/camel-observation/src/test/java/org/apache/camel/observation/MulticastRouteTest.java b/components/camel-observation/src/test/java/org/apache/camel/observation/MulticastRouteTest.java
index 2b50680b2f9..c2ff9f0f1e5 100644
--- a/components/camel-observation/src/test/java/org/apache/camel/observation/MulticastRouteTest.java
+++ b/components/camel-observation/src/test/java/org/apache/camel/observation/MulticastRouteTest.java
@@ -44,7 +44,8 @@ class MulticastRouteTest extends CamelMicrometerObservationTestSupport {
.setParentId(6),
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
.setKind(SpanKind.SERVER).setParentId(7),
- new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start").setKind(SpanKind.CLIENT)
+ new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.CLIENT)
};
MulticastRouteTest() {
diff --git a/components/camel-observation/src/test/java/org/apache/camel/observation/SpanProcessorsTest.java b/components/camel-observation/src/test/java/org/apache/camel/observation/SpanProcessorsTest.java
index 68ee2925962..c84b98872d1 100644
--- a/components/camel-observation/src/test/java/org/apache/camel/observation/SpanProcessorsTest.java
+++ b/components/camel-observation/src/test/java/org/apache/camel/observation/SpanProcessorsTest.java
@@ -49,7 +49,8 @@ class SpanProcessorsTest extends CamelMicrometerObservationTestSupport {
.setParentId(6),
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
.setKind(SpanKind.SERVER).setParentId(7),
- new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start").setKind(SpanKind.CLIENT)
+ new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.CLIENT)
};
SpanProcessorsTest() {
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 6c807703a95..0c94a2ab474 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
@@ -41,7 +41,8 @@ class MulticastRouteTest extends CamelOpenTelemetryTestSupport {
.setParentId(6),
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
.setParentId(7),
- new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start").setKind(SpanKind.CLIENT)
+ new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.CLIENT)
};
MulticastRouteTest() {
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 f7b5fb2b5f5..58094b95f28 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 @@ class SpanProcessorsTest extends CamelOpenTelemetryTestSupport {
.setParentId(6),
new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
.setParentId(7),
- new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start").setKind(SpanKind.CLIENT)
+ new SpanTestData().setLabel("direct:start server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.CLIENT)
};
SpanProcessorsTest() {
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
index 80108b87d98..19af9c79927 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java
@@ -44,7 +44,6 @@ import org.apache.camel.support.EventNotifierSupport;
import org.apache.camel.support.RoutePolicySupport;
import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.support.service.ServiceSupport;
-import org.apache.camel.tracing.decorators.AbstractInternalSpanDecorator;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;