This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new e22968fc55 Test micrometer-observability tracing alongside
quarkus-observation @Observed beans
e22968fc55 is described below
commit e22968fc55de585c6292e9dad7911eb5728df63c
Author: James Netherton <[email protected]>
AuthorDate: Fri Oct 23 07:33:18 2026 +0100
Test micrometer-observability tracing alongside quarkus-observation
@Observed beans
Co-authored-by: Claude Opus 5.5 <[email protected]>
---
integration-tests/micrometer-observability/pom.xml | 4 ++
.../it/MicrometerObservabilityResource.java | 7 ++++
.../it/MicrometerObservabilityRoutes.java | 12 ++++++
.../observability/it/ObservedService.java | 29 ++++++++++++++
.../src/main/resources/application.properties | 2 +-
.../it/MicrometerObservabilityTest.java | 45 +++++++++++++++++++++-
6 files changed, 97 insertions(+), 2 deletions(-)
diff --git a/integration-tests/micrometer-observability/pom.xml
b/integration-tests/micrometer-observability/pom.xml
index f5b3809dab..3902eed9ac 100644
--- a/integration-tests/micrometer-observability/pom.xml
+++ b/integration-tests/micrometer-observability/pom.xml
@@ -51,6 +51,10 @@
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-observation</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git
a/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityResource.java
b/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityResource.java
index 9f1e2af08b..99a4d63392 100644
---
a/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityResource.java
+++
b/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityResource.java
@@ -65,6 +65,13 @@ public class MicrometerObservabilityResource {
return producerTemplate.requestBody("direct:noCustomId", "test",
String.class);
}
+ @Path("/trace-observed")
+ @GET
+ @Produces(MediaType.TEXT_PLAIN)
+ public String traceObserved() {
+ return producerTemplate.requestBody("direct:observed", "Camel",
String.class);
+ }
+
@Path("/trace-upstream")
@GET
@Produces(MediaType.TEXT_PLAIN)
diff --git
a/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityRoutes.java
b/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityRoutes.java
index 36204ee552..159a389fed 100644
---
a/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityRoutes.java
+++
b/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityRoutes.java
@@ -17,11 +17,15 @@
package org.apache.camel.quarkus.component.micrometer.observability.it;
import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
import org.apache.camel.builder.RouteBuilder;
@ApplicationScoped
public class MicrometerObservabilityRoutes extends RouteBuilder {
+ @Inject
+ ObservedService observedService;
+
@Override
public void configure() throws Exception {
from("direct:traced")
@@ -38,6 +42,14 @@ public class MicrometerObservabilityRoutes extends
RouteBuilder {
.routeId("custom-id-route")
.setBody(constant("custom-id-response")).id("custom-id-set-body");
+ // Calls an @Observed bean, whose quarkus-observation span should be a
child of the Camel span
+ from("direct:observed")
+ .routeId("observed-route")
+ .process(exchange -> {
+ String name = exchange.getMessage().getBody(String.class);
+ exchange.getMessage().setBody(observedService.greet(name));
+ });
+
// No custom route id, so nothing is traced when trace-custom-id-only
is enabled
from("direct:noCustomId")
.setBody(constant("no-custom-id-response"));
diff --git
a/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/ObservedService.java
b/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/ObservedService.java
new file mode 100644
index 0000000000..1d45811b31
--- /dev/null
+++
b/integration-tests/micrometer-observability/src/main/java/org/apache/camel/quarkus/component/micrometer/observability/it/ObservedService.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.micrometer.observability.it;
+
+import io.micrometer.observation.annotation.Observed;
+import jakarta.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class ObservedService {
+
+ @Observed(name = "observed.greeting", contextualName = "observed-greeting")
+ public String greet(String name) {
+ return "Hello " + name;
+ }
+}
diff --git
a/integration-tests/micrometer-observability/src/main/resources/application.properties
b/integration-tests/micrometer-observability/src/main/resources/application.properties
index 054d665292..3000261c14 100644
---
a/integration-tests/micrometer-observability/src/main/resources/application.properties
+++
b/integration-tests/micrometer-observability/src/main/resources/application.properties
@@ -20,7 +20,7 @@ quarkus.banner.enabled = false
# Configuration properties wired by MicrometerObservabilityTracerProducer —
verified by testConfigPropertiesAreWired
quarkus.camel.micrometer-observability.exclude-patterns = direct:excluded
-quarkus.camel.micrometer-observability.include-patterns = direct:traced
+quarkus.camel.micrometer-observability.include-patterns =
direct:traced,direct:observed
quarkus.camel.micrometer-observability.trace-processors = true
quarkus.camel.micrometer-observability.disable-core-processors = true
quarkus.camel.micrometer-observability.trace-headers-inclusion = true
diff --git
a/integration-tests/micrometer-observability/src/test/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityTest.java
b/integration-tests/micrometer-observability/src/test/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityTest.java
index fa390bce8b..bf1ff79f48 100644
---
a/integration-tests/micrometer-observability/src/test/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityTest.java
+++
b/integration-tests/micrometer-observability/src/test/java/org/apache/camel/quarkus/component/micrometer/observability/it/MicrometerObservabilityTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.quarkus.component.micrometer.observability.it;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.TimeUnit;
import io.quarkus.test.junit.QuarkusTest;
@@ -113,7 +114,7 @@ class MicrometerObservabilityTest {
assertEquals("direct:excluded", config.getString("excludePatterns"),
"exclude-patterns must be wired to the tracer");
- assertEquals("direct:traced", config.getString("includePatterns"),
+ assertEquals("direct:traced,direct:observed",
config.getString("includePatterns"),
"include-patterns must be wired to the tracer");
assertTrue(config.getBoolean("traceProcessors"),
"trace-processors=true must be wired to the tracer");
@@ -123,6 +124,39 @@ class MicrometerObservabilityTest {
"trace-headers-inclusion=true must be wired to the tracer");
}
+ /**
+ * Verifies that Camel tracing coexists with quarkus-observation. A route
calls an {@code @Observed} bean,
+ * whose span is created by the Quarkus OTel observation handlers. That
span must be created exactly once and
+ * be a child of the Camel span that is active while the route processes
the exchange.
+ */
+ @Test
+ void testObservedBeanSpanIsChildOfCamelSpan() {
+ RestAssured.get("/micrometer-observability/trace-observed")
+ .then()
+ .statusCode(200)
+ .body(equalTo("Hello Camel"));
+
+ await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
+ List<Map<String, String>> spans = getSpans();
+
+ List<Map<String, String>> observedSpans = spans.stream()
+ .filter(span ->
"observed-greeting".equals(span.get("name")))
+ .toList();
+ assertEquals(1, observedSpans.size(), "Expected exactly one
@Observed span, got: " + spans);
+
+ List<Map<String, String>> camelSpans = spans.stream()
+ .filter(span ->
"observed-route".equals(span.get("camel.route.id")))
+ .toList();
+ assertFalse(camelSpans.isEmpty(), "Expected Camel spans for
observed-route, got: " + spans);
+
+ Map<String, String> observedSpan = observedSpans.get(0);
+ assertTrue(camelSpans.stream()
+ .anyMatch(span ->
span.get("spanId").equals(observedSpan.get("parentSpanId"))
+ &&
span.get("traceId").equals(observedSpan.get("traceId"))),
+ "Expected the @Observed span to be a child of a Camel
span, got: " + spans);
+ });
+ }
+
/**
* Verifies that W3C traceparent propagation works end-to-end.
* A request carrying a {@code traceparent} header must cause all Camel
spans to be
@@ -154,4 +188,13 @@ class MicrometerObservabilityTest {
}
});
}
+
+ private static List<Map<String, String>> getSpans() {
+ return RestAssured.get("/micrometer-observability/exporter/spans")
+ .then()
+ .statusCode(200)
+ .extract()
+ .jsonPath()
+ .getList("$");
+ }
}
