This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new e98949a60b feat(extensions): use otel2 in observability services
e98949a60b is described below
commit e98949a60bbe78448c3bbd5c269f8168a13861ed
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Mon Mar 24 11:26:17 2025 +0100
feat(extensions): use otel2 in observability services
---
.../extensions/observability-services.adoc | 2 +-
.../observability-services/deployment/pom.xml | 2 +-
extensions/observability-services/runtime/pom.xml | 2 +-
.../runtime/src/main/doc/usage.adoc | 2 +-
.../it/ObservabilityServicesTest.java | 23 ++++++++++------------
5 files changed, 14 insertions(+), 17 deletions(-)
diff --git
a/docs/modules/ROOT/pages/reference/extensions/observability-services.adoc
b/docs/modules/ROOT/pages/reference/extensions/observability-services.adoc
index 264aad6a8b..84d4c63736 100644
--- a/docs/modules/ROOT/pages/reference/extensions/observability-services.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/observability-services.adoc
@@ -64,7 +64,7 @@ This extension automatically provides the following Camel
Quarkus component exte
* xref:reference/extensions/microprofile-health.adoc[Camel Quarkus
MicroProfile Health] - for health checks
* xref:reference/extensions/management.adoc[Camel Quarkus Management] - for JMX
* xref:reference/extensions/micrometer.adoc[Camel Quarkus Micrometer] - for
Camel Micrometer metrics
-* xref:reference/extensions/opentelemetry.adoc[Camel Quarkus OpenTelemetry] -
for tracing Camel messages (events/spans)
+* xref:reference/extensions/opentelemetry2.adoc[Camel Quarkus OpenTelemetry2]
- for tracing Camel messages (events/spans)
*
https://quarkus.io/guides/telemetry-micrometer#micrometer-and-monitoring-system-extensions[Quarkus
Micrometer Registry Prometheus] - for exporting metrics in Prometheus format
[id="extensions-observability-services-usage-list-of-known-endpoints"]
diff --git a/extensions/observability-services/deployment/pom.xml
b/extensions/observability-services/deployment/pom.xml
index a00d13dd33..ca82b5fbb1 100644
--- a/extensions/observability-services/deployment/pom.xml
+++ b/extensions/observability-services/deployment/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-opentelemetry-deployment</artifactId>
+ <artifactId>camel-quarkus-opentelemetry2-deployment</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/observability-services/runtime/pom.xml
b/extensions/observability-services/runtime/pom.xml
index 2cb3e44b6f..1913d275e8 100644
--- a/extensions/observability-services/runtime/pom.xml
+++ b/extensions/observability-services/runtime/pom.xml
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-opentelemetry</artifactId>
+ <artifactId>camel-quarkus-opentelemetry2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions/observability-services/runtime/src/main/doc/usage.adoc
b/extensions/observability-services/runtime/src/main/doc/usage.adoc
index 525140bfec..72170253c1 100644
--- a/extensions/observability-services/runtime/src/main/doc/usage.adoc
+++ b/extensions/observability-services/runtime/src/main/doc/usage.adoc
@@ -15,7 +15,7 @@ This extension automatically provides the following Camel
Quarkus component exte
* xref:reference/extensions/microprofile-health.adoc[Camel Quarkus
MicroProfile Health] - for health checks
* xref:reference/extensions/management.adoc[Camel Quarkus Management] - for JMX
* xref:reference/extensions/micrometer.adoc[Camel Quarkus Micrometer] - for
Camel Micrometer metrics
-* xref:reference/extensions/opentelemetry.adoc[Camel Quarkus OpenTelemetry] -
for tracing Camel messages (events/spans)
+* xref:reference/extensions/opentelemetry2.adoc[Camel Quarkus OpenTelemetry2]
- for tracing Camel messages (events/spans)
*
https://quarkus.io/guides/telemetry-micrometer#micrometer-and-monitoring-system-extensions[Quarkus
Micrometer Registry Prometheus] - for exporting metrics in Prometheus format
=== List of known endpoints
diff --git
a/integration-tests/observability-services/src/test/java/org/apache/camel/quarkus/component/observabilityservices/it/ObservabilityServicesTest.java
b/integration-tests/observability-services/src/test/java/org/apache/camel/quarkus/component/observabilityservices/it/ObservabilityServicesTest.java
index 7c7cf5b495..895ab8f5f1 100644
---
a/integration-tests/observability-services/src/test/java/org/apache/camel/quarkus/component/observabilityservices/it/ObservabilityServicesTest.java
+++
b/integration-tests/observability-services/src/test/java/org/apache/camel/quarkus/component/observabilityservices/it/ObservabilityServicesTest.java
@@ -97,25 +97,22 @@ class ObservabilityServicesTest {
await().atMost(30, TimeUnit.SECONDS).pollDelay(50,
TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 5);
List<Map<String, String>> spans = getSpans();
+
assertEquals(spans.get(0).get("parentId"),
spans.get(1).get("spanId"));
- assertEquals(spans.get(0).get("camel.uri"), "seda://next");
- assertEquals(spans.get(0).get("kind"), "INTERNAL");
+ assertEquals("seda://next", spans.get(0).get("camel.uri"));
+ assertEquals("INTERNAL", spans.get(0).get("kind"));
assertEquals(spans.get(1).get("parentId"),
spans.get(2).get("spanId"));
- assertEquals(spans.get(1).get("camel.uri"), "seda://next");
- assertEquals(spans.get(1).get("kind"), "CLIENT");
+ assertEquals("seda://next", spans.get(1).get("camel.uri"));
+ assertEquals("INTERNAL", spans.get(1).get("kind"));
assertEquals(spans.get(2).get("parentId"),
spans.get(3).get("spanId"));
- assertEquals(spans.get(2).get("camel.uri"), "direct://start");
- assertEquals(spans.get(2).get("kind"), "INTERNAL");
-
- assertEquals(spans.get(3).get("parentId"),
spans.get(4).get("spanId"));
- assertEquals(spans.get(3).get("camel.uri"), "direct://start");
- assertEquals(spans.get(3).get("kind"), "CLIENT");
+ assertEquals("direct://start", spans.get(2).get("camel.uri"));
+ assertEquals("INTERNAL", spans.get(2).get("kind"));
- assertEquals(spans.get(4).get("parentId"), "0000000000000000");
- assertEquals(spans.get(4).get("code.function"), "trace");
- assertEquals(spans.get(4).get("url.path"),
"/observability-services/trace");
+ assertEquals("0000000000000000", spans.get(3).get("parentId"));
+ assertEquals("direct://start", spans.get(3).get("camel.uri"));
+ assertEquals("INTERNAL", spans.get(3).get("kind"));
} finally {
RestAssured.given()
.post("/spans/reset")
