This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 c460c7a1fe0 Regen for commit 74612964230fa14d86fd7502a2dcb7a2ef435a5e
(#9651)
c460c7a1fe0 is described below
commit c460c7a1fe00d2c8afec87e510ce186a9915f171
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Mar 27 12:02:09 2023 +0200
Regen for commit 74612964230fa14d86fd7502a2dcb7a2ef435a5e (#9651)
Signed-off-by: GitHub <nore...@github.com>
Co-authored-by: davsclaus <davscl...@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 -
.../org/apache/camel/tracing/decorators/KafkaSpanDecorator.java | 2 +-
7 files changed, 13 insertions(+), 8 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 706e0ea8691..182b2055390 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
@@ -48,7 +48,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 7708ebd45d2..7e0cfc54984 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
@@ -45,7 +45,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 53e6c1e4078..ff552a18676 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
@@ -43,7 +43,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;
diff --git
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/KafkaSpanDecorator.java
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/KafkaSpanDecorator.java
index ebb1e88e927..2116d316f67 100644
---
a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/KafkaSpanDecorator.java
+++
b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/KafkaSpanDecorator.java
@@ -82,7 +82,7 @@ public class KafkaSpanDecorator extends
AbstractMessagingSpanDecorator {
/**
* Extracts header value from the exchange for given header
- *
+ *
* @param exchange the {@link Exchange}
* @param header the header name
* @param type the class type of the exchange header
