(camel-quarkus) branch 3.15.x updated: Fixes #6747 - opentelemetry - ensure that the sequence of recorded spans is correct by using bean:*

[jiriondrusek]

This is an automated email from the ASF dual-hosted git repository.

jiriondrusek pushed a commit to branch 3.15.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/3.15.x by this push:
     new 5a9f50c8f8 Fixes #6747 - opentelemetry - ensure that the sequence of 
recorded spans is correct by using bean:*
5a9f50c8f8 is described below

commit 5a9f50c8f85613cf92a3ba041400aa88df892952
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Tue Nov 5 13:19:06 2024 +0100

    Fixes #6747 - opentelemetry - ensure that the sequence of recorded spans is 
correct by using bean:*
---
 .../component/opentelemetry/it/OpenTelemetryRouteBuilder.java |  2 +-
 .../quarkus/component/opentelemetry/it/OpenTelemetryTest.java | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryRouteBuilder.java
 
b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryRouteBuilder.java
index b414a0df31..9795dffbf1 100644
--- 
a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryRouteBuilder.java
+++ 
b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryRouteBuilder.java
@@ -34,7 +34,7 @@ public class OpenTelemetryRouteBuilder extends RouteBuilder {
                 .setBody().constant("Traced direct:start");
 
         from("direct:greet")
-                .bean("greetingsBean");
+                .to("bean:greetingsBean");
 
         from("timer:filtered?repeatCount=5&delay=-1")
                 .setBody().constant("Route filtered from tracing");
diff --git 
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
 
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
index 91dd3c4fee..c27b830f83 100644
--- 
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
+++ 
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
@@ -100,13 +100,14 @@ class OpenTelemetryTest {
                 .body(equalTo("Hello " + name));
 
         // Verify the span hierarchy is JAX-RS Service -> Direct Endpoint -> 
Bean Method
-        await().atMost(30, TimeUnit.SECONDS).pollDelay(50, 
TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 4);
+        await().atMost(30, TimeUnit.SECONDS).pollDelay(50, 
TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 5);
         List<Map<String, String>> spans = getSpans();
-        assertEquals(4, spans.size());
-        assertEquals(spans.get(0).get("parentId"), 
spans.get(1).get("parentId"));
+        assertEquals(5, spans.size());
+        assertEquals(spans.get(0).get("parentId"), spans.get(1).get("spanId"));
         assertEquals(spans.get(1).get("parentId"), spans.get(2).get("spanId"));
-        assertEquals(SpanKind.CLIENT.name(), spans.get(2).get("kind"));
-        assertEquals(SpanKind.SERVER.name(), spans.get(3).get("kind"));
+        assertEquals(spans.get(2).get("parentId"), spans.get(3).get("spanId"));
+        assertEquals(SpanKind.CLIENT.name(), spans.get(3).get("kind"));
+        assertEquals(SpanKind.SERVER.name(), spans.get(4).get("kind"));
     }
 
     @Test