This is an automated email from the ASF dual-hosted git repository.
acosentino 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 157b96c62eb Regen for commit bb9e1d7c98d94723c47c4e6cd4592950c5ef0ac2
157b96c62eb is described below
commit 157b96c62ebdcdfd40cc64734023bb1bde35511e
Author: davsclaus <davscl...@users.noreply.github.com>
AuthorDate: Wed Mar 8 11:48:03 2023 +0000
Regen for commit bb9e1d7c98d94723c47c4e6cd4592950c5ef0ac2
Signed-off-by: GitHub <nore...@github.com>
---
camel-dependencies/pom.xml | 94 +++++++++++-----------
.../apache/camel/catalog/others/observation.json | 2 +-
.../MicrometerObservationSpanAdapter.java | 1 +
.../observation/MicrometerObservationTracer.java | 27 ++++---
.../org/apache/camel/observation/ABCRouteTest.java | 3 +-
.../CamelMicrometerObservationTestSupport.java | 9 ++-
.../observation/ClientRecipientListRouteTest.java | 3 +-
.../apache/camel/observation/CurrentSpanTest.java | 5 +-
.../observation/CustomComponentNameRouteTest.java | 3 +-
.../observation/MulticastParallelRouteTest.java | 3 +-
.../camel/observation/MulticastRouteTest.java | 3 +-
.../camel/observation/SpanProcessorsTest.java | 3 +-
.../apache/camel/observation/TwoServiceTest.java | 3 +-
.../observation/TwoServiceWithExcludeTest.java | 3 +-
...opagatingReceiverTracingObservationHandler.java | 3 +-
...PropagatingSenderTracingObservationHandler.java | 3 +-
.../camel/opentelemetry/OpenTelemetryTracer.java | 3 +-
.../camel/opentracing/OpenTracingTracer.java | 3 +-
.../main/java/org/apache/camel/tracing/Tracer.java | 3 +-
19 files changed, 99 insertions(+), 78 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 136c1e39c65..3d4860083ff 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -20,21 +20,21 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>25</version>
- <relativePath />
- </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>25</version>
+ <relativePath />
+ </parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-dependencies</artifactId>
- <version>3.21.0-SNAPSHOT</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-dependencies</artifactId>
+ <version>3.21.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Camel :: Dependencies</name>
- <description>Camel Dependencies POM</description>
+ <packaging>pom</packaging>
+ <name>Camel :: Dependencies</name>
+ <description>Camel Dependencies POM</description>
<!-- sync properties here from parent/pom.xml -->
<properties>
@@ -397,8 +397,8 @@
<maven-wagon-version>3.5.2</maven-wagon-version>
<maven-war-plugin-version>3.3.1</maven-war-plugin-version>
<metrics-version>4.2.15</metrics-version>
- <micrometer-tracing-version>1.0.2</micrometer-tracing-version>
<micrometer-version>1.10.4</micrometer-version>
+ <micrometer-tracing-version>1.0.2</micrometer-tracing-version>
<microprofile-config-version>2.0.1</microprofile-config-version>
<microprofile-metrics-version>3.0.1</microprofile-metrics-version>
<microprofile-fault-tolerance-version>3.0</microprofile-fault-tolerance-version>
@@ -570,38 +570,38 @@
<zookeeper-version>3.5.9</zookeeper-version>
<zxing-version>3.5.0</zxing-version>
- <!-- OSGi bundles properties -->
- <camel.osgi.import.camel.version>
-
version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"
- </camel.osgi.import.camel.version>
- <camel.osgi.import.strict.version>
-
version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"
- </camel.osgi.import.strict.version>
-
<camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
- <camel.osgi.import.defaults>
- </camel.osgi.import.defaults>
- <camel.osgi.import.before.defaults />
- <camel.osgi.import.additional />
- <camel.osgi.import.pkg>
- org.apache.camel.*;${camel.osgi.import.camel.version},
- ${camel.osgi.import.before.defaults},
- ${camel.osgi.import.defaults},
- ${camel.osgi.import.additional},
- *
- </camel.osgi.import.pkg>
- <camel.osgi.activator />
- <camel.osgi.failok>false</camel.osgi.failok>
- <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
-
<camel.osgi.export.pkg>$${replace;{local-packages};;;;}</camel.osgi.export.pkg>
-
<camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
- <camel.osgi.version>version=${project.version}</camel.osgi.version>
- <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
- <camel.osgi.dynamic />
-
<camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
- <camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
- <camel.osgi.require.capability />
- <camel.osgi.provide.capability />
-
<camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
- </properties>
+ <!-- OSGi bundles properties -->
+ <camel.osgi.import.camel.version>
+
version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"
+ </camel.osgi.import.camel.version>
+ <camel.osgi.import.strict.version>
+
version="[$(version;===;${camel.osgi.version.clean}),$(version;==+;${camel.osgi.version.clean}))"
+ </camel.osgi.import.strict.version>
+
<camel.osgi.import.default.version>[$(version;==;$(@)),$(version;+;$(@)))</camel.osgi.import.default.version>
+ <camel.osgi.import.defaults>
+ </camel.osgi.import.defaults>
+ <camel.osgi.import.before.defaults />
+ <camel.osgi.import.additional />
+ <camel.osgi.import.pkg>
+ org.apache.camel.*;${camel.osgi.import.camel.version},
+ ${camel.osgi.import.before.defaults},
+ ${camel.osgi.import.defaults},
+ ${camel.osgi.import.additional},
+ *
+ </camel.osgi.import.pkg>
+ <camel.osgi.activator />
+ <camel.osgi.failok>false</camel.osgi.failok>
+ <camel.osgi.private.pkg>!*</camel.osgi.private.pkg>
+
<camel.osgi.export.pkg>$${replace;{local-packages};;;;}</camel.osgi.export.pkg>
+
<camel.osgi.export>${camel.osgi.export.pkg};-noimport:=true;${camel.osgi.version}</camel.osgi.export>
+ <camel.osgi.version>version=${project.version}</camel.osgi.version>
+ <camel.osgi.import>${camel.osgi.import.pkg}</camel.osgi.import>
+ <camel.osgi.dynamic />
+
<camel.osgi.symbolic.name>${project.groupId}.${project.artifactId}</camel.osgi.symbolic.name>
+
<camel.osgi.exclude.dependencies>false</camel.osgi.exclude.dependencies>
+ <camel.osgi.require.capability />
+ <camel.osgi.provide.capability />
+
<camel.osgi.manifest>${project.build.outputDirectory}/META-INF/MANIFEST.MF</camel.osgi.manifest>
+ </properties>
</project>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/observation.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/observation.json
index eb396f8efbc..e166365bf8a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/observation.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/observation.json
@@ -10,6 +10,6 @@
"supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-observation",
- "version": "3.20.3-SNAPSHOT"
+ "version": "3.21.0-SNAPSHOT"
}
}
diff --git
a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationSpanAdapter.java
b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationSpanAdapter.java
index 1d85ec690e0..1eb6c4237d2 100644
---
a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationSpanAdapter.java
+++
b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationSpanAdapter.java
@@ -145,6 +145,7 @@ public class MicrometerObservationSpanAdapter implements
SpanAdapter {
return DEFAULT_EVENT_NAME;
}
+
public void setCorrelationContextItem(String key, String value) {
Baggage baggage = tracer.createBaggage(key);
Span span = getTracingContext().getSpan();
diff --git
a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java
b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java
index 7085760ba6d..776e520a17f 100644
---
a/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java
+++
b/components/camel-observation/src/main/java/org/apache/camel/observation/MicrometerObservationTracer.java
@@ -62,30 +62,35 @@ public class MicrometerObservationTracer extends
org.apache.camel.tracing.Tracer
this.tracer = tracer;
}
- private Observation.Context
spanKindToContextOnExtract(org.apache.camel.tracing.SpanKind kind,
SpanDecorator sd, Exchange exchange) {
+ private Observation.Context spanKindToContextOnExtract(
+ org.apache.camel.tracing.SpanKind kind, SpanDecorator sd, Exchange
exchange) {
ExtractAdapter adapter =
sd.getExtractAdapter(exchange.getIn().getHeaders(), encoding);
switch (kind) {
- case PRODUCER:
- throw new UnsupportedOperationException("You can't extract when
sending a message");
+ case PRODUCER:
+ throw new UnsupportedOperationException("You can't extract
when sending a message");
case SPAN_KIND_SERVER:
- RequestReplyReceiverContext<Object, Message>
replyReceiverContext = new RequestReplyReceiverContext<>((carrier, key) ->
String.valueOf(adapter.get(key)));
+ RequestReplyReceiverContext<Object, Message>
replyReceiverContext
+ = new RequestReplyReceiverContext<>((carrier, key) ->
String.valueOf(adapter.get(key)));
replyReceiverContext.setResponse(exchange.getMessage());
replyReceiverContext.setCarrier(exchange.getIn());
return replyReceiverContext;
case CONSUMER:
case SPAN_KIND_CLIENT:
- ReceiverContext<Message> receiverContext = new
ReceiverContext<>((carrier, key) -> String.valueOf(adapter.get(key)));
+ ReceiverContext<Message> receiverContext
+ = new ReceiverContext<>((carrier, key) ->
String.valueOf(adapter.get(key)));
receiverContext.setCarrier(exchange.getIn());
return receiverContext;
- default:
+ default:
return new Observation.Context();
}
}
- private Observation.Context
spanKindToContextOnInject(org.apache.camel.tracing.SpanKind kind, InjectAdapter
adapter, Exchange exchange) {
+ private Observation.Context spanKindToContextOnInject(
+ org.apache.camel.tracing.SpanKind kind, InjectAdapter adapter,
Exchange exchange) {
switch (kind) {
case SPAN_KIND_CLIENT:
- RequestReplySenderContext<Object, Message> senderContext = new
RequestReplySenderContext<>((carrier, key, value) -> adapter.put(key, value));
+ RequestReplySenderContext<Object, Message> senderContext
+ = new RequestReplySenderContext<>((carrier, key,
value) -> adapter.put(key, value));
senderContext.setResponse(exchange.getMessage());
senderContext.setCarrier(exchange.getIn());
return senderContext;
@@ -125,7 +130,8 @@ public class MicrometerObservationTracer extends
org.apache.camel.tracing.Tracer
@Override
protected SpanAdapter startSendingEventSpan(
- String operationName, SpanKind kind, SpanAdapter
parentObservation, Exchange exchange, InjectAdapter injectAdapter) {
+ String operationName, SpanKind kind, SpanAdapter
parentObservation, Exchange exchange,
+ InjectAdapter injectAdapter) {
Observation.Context context = spanKindToContextOnInject(kind,
injectAdapter, exchange);
Observation observation =
Observation.createNotStarted(CAMEL_CONTEXT_NAME, () -> context,
observationRegistry);
observation.contextualName(operationName);
@@ -145,7 +151,8 @@ public class MicrometerObservationTracer extends
org.apache.camel.tracing.Tracer
Exchange exchange, SpanDecorator sd, String operationName,
org.apache.camel.tracing.SpanKind kind,
SpanAdapter parent) {
boolean parentPresent = parent != null;
- Observation.Context context = parentPresent ? new
Observation.Context() : spanKindToContextOnExtract(kind, sd, exchange);
+ Observation.Context context
+ = parentPresent ? new Observation.Context() :
spanKindToContextOnExtract(kind, sd, exchange);
context.put(SPAN_DECORATOR_INTERNAL, sd instanceof
AbstractInternalSpanDecorator);
Observation observation = Observation.createNotStarted(operationName,
() -> context, observationRegistry);
if (parentPresent) {
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/ABCRouteTest.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/ABCRouteTest.java
index 6c80d85ee6f..2ff64eea1a2 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/ABCRouteTest.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/ABCRouteTest.java
@@ -29,7 +29,8 @@ class ABCRouteTest extends
CamelMicrometerObservationTestSupport {
.setParentId(2).addLogMessage("Exchange[ExchangePattern:
InOut, BodyType: String, Body: Hello]"),
new SpanTestData().setLabel("seda:a
server").setUri("seda://a").setOperation("a")
.setParentId(3).addLogMessage("routing at
a").addLogMessage("End of routing"),
- new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start").setKind(SpanKind.SERVER)
+ new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.SERVER)
};
ABCRouteTest() {
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 b4e8b7ef50f..3cf3b4cde6e 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
@@ -32,7 +32,6 @@ import
io.micrometer.core.instrument.observation.DefaultMeterObservationHandler;
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
import io.micrometer.observation.ObservationHandler;
import io.micrometer.observation.ObservationRegistry;
-import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
import
io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandler;
import
io.micrometer.tracing.handler.PropagatingSenderTracingObservationHandler;
@@ -62,7 +61,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
class CamelMicrometerObservationTestSupport extends CamelTestSupport {
-
+
static final AttributeKey<String> CAMEL_URI_KEY =
AttributeKey.stringKey("camel-uri");
static final AttributeKey<String> COMPONENT_KEY =
AttributeKey.stringKey("component");
static final AttributeKey<String> PRE_KEY = AttributeKey.stringKey("pre");
@@ -99,7 +98,8 @@ class CamelMicrometerObservationTestSupport extends
CamelTestSupport {
observationRegistry.observationConfig().observationHandler(new
DefaultMeterObservationHandler(meterRegistry));
io.micrometer.tracing.Tracer otelTracer = otelTracer();
- OtelPropagator otelPropagator = new
OtelPropagator(ContextPropagators.create(B3Propagator.injectingSingleHeader()),
tracer);
+ OtelPropagator otelPropagator
+ = new
OtelPropagator(ContextPropagators.create(B3Propagator.injectingSingleHeader()),
tracer);
observationRegistry.observationConfig().observationHandler(
new
ObservationHandler.FirstMatchingCompositeObservationHandler(
new
PropagatingSenderTracingObservationHandler<>(otelTracer, otelPropagator),
@@ -117,7 +117,8 @@ class CamelMicrometerObservationTestSupport extends
CamelTestSupport {
private OtelTracer otelTracer() {
OtelCurrentTraceContext otelCurrentTraceContext = new
OtelCurrentTraceContext();
- OtelBaggageManager otelBaggageManager = new
OtelBaggageManager(otelCurrentTraceContext, Collections.emptyList(),
Collections.emptyList());
+ OtelBaggageManager otelBaggageManager
+ = new OtelBaggageManager(otelCurrentTraceContext,
Collections.emptyList(), Collections.emptyList());
return new OtelTracer(tracer, otelCurrentTraceContext, o -> {
}, otelBaggageManager);
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/ClientRecipientListRouteTest.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/ClientRecipientListRouteTest.java
index 9075ddbcc08..672cf40598c 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/ClientRecipientListRouteTest.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/ClientRecipientListRouteTest.java
@@ -30,7 +30,8 @@ class ClientRecipientListRouteTest extends
CamelMicrometerObservationTestSupport
.setParentId(3),
new SpanTestData().setLabel("seda:c
server").setUri("seda://c").setOperation("c")
.setParentId(3),
- new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start").setKind(SpanKind.SERVER)
+ new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.SERVER)
};
ClientRecipientListRouteTest() {
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/CurrentSpanTest.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/CurrentSpanTest.java
index fb5353bb576..04b1bed27a2 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/CurrentSpanTest.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/CurrentSpanTest.java
@@ -24,7 +24,6 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.TimeUnit;
-import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.sdk.trace.ReadableSpan;
@@ -53,7 +52,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
class CurrentSpanTest extends CamelMicrometerObservationTestSupport {
CurrentSpanTest() {
@@ -173,7 +171,8 @@ class CurrentSpanTest extends
CamelMicrometerObservationTestSupport {
.setKind(SpanKind.CLIENT),
new
SpanTestData().setLabel("syncmock:result").setUri("syncmock://result").setOperation("syncmock")
.setKind(SpanKind.CLIENT),
- new
SpanTestData().setLabel("direct:start").setUri("direct://start").setOperation("start").setKind(SpanKind.SERVER)
+ new
SpanTestData().setLabel("direct:start").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.SERVER)
};
// sync pipeline
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/CustomComponentNameRouteTest.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/CustomComponentNameRouteTest.java
index 5c5d3c0ed0c..1144883a448 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/CustomComponentNameRouteTest.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/CustomComponentNameRouteTest.java
@@ -30,7 +30,8 @@ class CustomComponentNameRouteTest extends
CamelMicrometerObservationTestSupport
.setParentId(2).addLogMessage("Exchange[ExchangePattern:
InOut, BodyType: String, Body: Hello]"),
new SpanTestData().setLabel("myseda:a
server").setUri("myseda://a").setOperation("a")
.setParentId(3).addLogMessage("routing at
a").addLogMessage("End of routing"),
- new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start").setKind(SpanKind.SERVER)
+ new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.SERVER)
};
CustomComponentNameRouteTest() {
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/MulticastParallelRouteTest.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/MulticastParallelRouteTest.java
index 96c98861c3d..b55bef9166f 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/MulticastParallelRouteTest.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/MulticastParallelRouteTest.java
@@ -30,7 +30,8 @@ class MulticastParallelRouteTest extends
CamelMicrometerObservationTestSupport {
.setParentId(2).addLogMessage("routing at c"),
new SpanTestData().setLabel("seda:a
server").setUri("seda://a").setOperation("a")
.setParentId(3).addLogMessage("routing at
a").addLogMessage("End of routing"),
- new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start").setKind(SpanKind.SERVER)
+ new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.SERVER)
};
MulticastParallelRouteTest() {
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 40433a78619..acad5fa2d65 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
@@ -30,7 +30,8 @@ class MulticastRouteTest extends
CamelMicrometerObservationTestSupport {
.setParentId(2),
new SpanTestData().setLabel("seda:a
server").setUri("seda://a").setOperation("a")
.setParentId(3),
- new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start").setKind(SpanKind.SERVER)
+ new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.SERVER)
};
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 2b345f13348..4dee0090b3e 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
@@ -35,7 +35,8 @@ class SpanProcessorsTest extends
CamelMicrometerObservationTestSupport {
.setParentId(2).addLogMessage("Exchange[ExchangePattern:
InOut, BodyType: String, Body: Hello]"),
new SpanTestData().setLabel("seda:a
server").setUri("seda://a").setOperation("a")
.setParentId(3).addLogMessage("routing at
a").addLogMessage("End of routing"),
- new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start").setKind(SpanKind.SERVER)
+ new SpanTestData().setLabel("direct:start
server").setUri("direct://start").setOperation("start")
+ .setKind(SpanKind.SERVER)
};
SpanProcessorsTest() {
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/TwoServiceTest.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/TwoServiceTest.java
index d7f2f07fb55..52baa35aa84 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/TwoServiceTest.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/TwoServiceTest.java
@@ -26,7 +26,8 @@ class TwoServiceTest extends
CamelMicrometerObservationTestSupport {
private static SpanTestData[] testdata = {
new SpanTestData().setLabel("ServiceB
server").setUri("direct://ServiceB").setOperation("service-b")
.setParentId(1),
- new SpanTestData().setLabel("ServiceA
server").setUri("direct://ServiceA").setOperation("ServiceA").setKind(SpanKind.SERVER)
+ new SpanTestData().setLabel("ServiceA
server").setUri("direct://ServiceA").setOperation("ServiceA")
+ .setKind(SpanKind.SERVER)
};
TwoServiceTest() {
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/TwoServiceWithExcludeTest.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/TwoServiceWithExcludeTest.java
index 8bf3025fc2f..b965389808c 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/TwoServiceWithExcludeTest.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/TwoServiceWithExcludeTest.java
@@ -27,7 +27,8 @@ import org.junit.jupiter.api.Test;
class TwoServiceWithExcludeTest extends CamelMicrometerObservationTestSupport {
private static SpanTestData[] testdata = {
- new SpanTestData().setLabel("ServiceA
server").setUri("direct://ServiceA").setOperation("ServiceA").setKind(SpanKind.SERVER)
+ new SpanTestData().setLabel("ServiceA
server").setUri("direct://ServiceA").setOperation("ServiceA")
+ .setKind(SpanKind.SERVER)
};
TwoServiceWithExcludeTest() {
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/otel/CamelPropagatingReceiverTracingObservationHandler.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/otel/CamelPropagatingReceiverTracingObservationHandler.java
index 30533288d07..85e3a9c236f 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/otel/CamelPropagatingReceiverTracingObservationHandler.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/otel/CamelPropagatingReceiverTracingObservationHandler.java
@@ -22,7 +22,8 @@ import io.micrometer.tracing.Tracer;
import
io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandler;
import io.micrometer.tracing.propagation.Propagator;
-public class CamelPropagatingReceiverTracingObservationHandler<T extends
ReceiverContext> extends PropagatingReceiverTracingObservationHandler<T> {
+public class CamelPropagatingReceiverTracingObservationHandler<T extends
ReceiverContext>
+ extends PropagatingReceiverTracingObservationHandler<T> {
static final String SPAN_DECORATOR_INTERNAL =
"camel.micrometer.abstract-internal";
diff --git
a/components/camel-observation/src/test/java/org/apache/camel/observation/otel/CamelPropagatingSenderTracingObservationHandler.java
b/components/camel-observation/src/test/java/org/apache/camel/observation/otel/CamelPropagatingSenderTracingObservationHandler.java
index 78d38754aa8..43f6dfec9b1 100644
---
a/components/camel-observation/src/test/java/org/apache/camel/observation/otel/CamelPropagatingSenderTracingObservationHandler.java
+++
b/components/camel-observation/src/test/java/org/apache/camel/observation/otel/CamelPropagatingSenderTracingObservationHandler.java
@@ -23,7 +23,8 @@ import
io.micrometer.tracing.handler.PropagatingReceiverTracingObservationHandle
import
io.micrometer.tracing.handler.PropagatingSenderTracingObservationHandler;
import io.micrometer.tracing.propagation.Propagator;
-public class CamelPropagatingSenderTracingObservationHandler<T extends
SenderContext> extends PropagatingSenderTracingObservationHandler<T> {
+public class CamelPropagatingSenderTracingObservationHandler<T extends
SenderContext>
+ extends PropagatingSenderTracingObservationHandler<T> {
/**
* Creates a new instance of {@link
PropagatingReceiverTracingObservationHandler}.
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java
index d90d7092f40..1a42afb89cf 100644
---
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracer.java
@@ -90,7 +90,8 @@ public class OpenTelemetryTracer extends
org.apache.camel.tracing.Tracer {
@Override
protected SpanAdapter startSendingEventSpan(
- String operationName, org.apache.camel.tracing.SpanKind kind,
SpanAdapter parent, Exchange exchange, InjectAdapter injectAdapter) {
+ String operationName, org.apache.camel.tracing.SpanKind kind,
SpanAdapter parent, Exchange exchange,
+ InjectAdapter injectAdapter) {
Baggage baggage = null;
SpanBuilder builder =
tracer.spanBuilder(operationName).setSpanKind(mapToSpanKind(kind));
if (parent != null) {
diff --git
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
index ad5aa1c7793..c16518cc6a5 100644
---
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
+++
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
@@ -97,7 +97,8 @@ public class OpenTracingTracer extends
org.apache.camel.tracing.Tracer {
}
@Override
- protected SpanAdapter startSendingEventSpan(String operationName, SpanKind
kind, SpanAdapter parent, Exchange exchange, InjectAdapter injectAdapter) {
+ protected SpanAdapter startSendingEventSpan(
+ String operationName, SpanKind kind, SpanAdapter parent, Exchange
exchange, InjectAdapter injectAdapter) {
SpanBuilder spanBuilder =
tracer.buildSpan(operationName).withTag(Tags.SPAN_KIND.getKey(),
mapToSpanKind(kind));
if (parent != null) {
io.opentracing.Span parentSpan = ((OpenTracingSpanAdapter)
parent).getOpenTracingSpan();
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 8e9774745fc..48e396c604c 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
@@ -78,7 +78,8 @@ public abstract class Tracer extends ServiceSupport
implements RoutePolicyFactor
protected abstract void initTracer();
- protected abstract SpanAdapter startSendingEventSpan(String operationName,
SpanKind kind, SpanAdapter parent, Exchange exchange, InjectAdapter
injectAdapter);
+ protected abstract SpanAdapter startSendingEventSpan(
+ String operationName, SpanKind kind, SpanAdapter parent, Exchange
exchange, InjectAdapter injectAdapter);
protected abstract SpanAdapter startExchangeBeginSpan(
Exchange exchange, SpanDecorator sd, String operationName,
SpanKind kind, SpanAdapter parent);
