You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/04/18 10:27:23 UTC

[camel-quarkus] branch main updated: Fix OpenTelemetry test assertions argument order

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 c785d60db9 Fix OpenTelemetry test assertions argument order
c785d60db9 is described below

commit c785d60db96659f9499851fdb864fe229f925bcb
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Apr 18 08:47:54 2023 +0100

    Fix OpenTelemetry test assertions argument order
---
 .../opentelemetry/it/OpenTelemetryTest.java        | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

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 ce36394475..f2af02ec30 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
@@ -82,7 +82,7 @@ class OpenTelemetryTest {
         await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 2);
         List<Map<String, String>> spans = getSpans();
         assertEquals(2, spans.size());
-        assertEquals(spans.get(0).get("parentId"), spans.get(1).get("spanId"));
+        assertEquals(spans.get(1).get("spanId"), spans.get(0).get("parentId"));
     }
 
     @Test
@@ -97,8 +97,8 @@ class OpenTelemetryTest {
         await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 3);
         List<Map<String, String>> spans = getSpans();
         assertEquals(3, spans.size());
-        assertEquals(spans.get(0).get("parentId"), spans.get(1).get("parentId"));
-        assertEquals(spans.get(1).get("parentId"), spans.get(2).get("spanId"));
+        assertEquals(spans.get(1).get("parentId"), spans.get(0).get("parentId"));
+        assertEquals(spans.get(2).get("spanId"), spans.get(1).get("parentId"));
     }
 
     @Test
@@ -116,20 +116,20 @@ class OpenTelemetryTest {
         await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 5);
         List<Map<String, String>> spans = getSpans();
         assertEquals(5, spans.size());
-        assertEquals(spans.get(0).get("parentId"), spans.get(1).get("parentId"));
-        assertEquals(spans.get(0).get("code.function"), "getConnection");
+        assertEquals(spans.get(1).get("parentId"), spans.get(0).get("parentId"));
+        assertEquals("getConnection", spans.get(0).get("code.function"));
 
-        assertEquals(spans.get(1).get("parentId"), spans.get(2).get("spanId"));
-        assertEquals(spans.get(1).get("db.operation"), "SELECT");
+        assertEquals(spans.get(2).get("spanId"), spans.get(1).get("parentId"));
+        assertEquals("SELECT", spans.get(1).get("db.operation"));
 
-        assertEquals(spans.get(2).get("parentId"), spans.get(3).get("spanId"));
-        assertEquals(spans.get(2).get("camel.uri"), "bean://jdbcQueryBean");
+        assertEquals(spans.get(3).get("spanId"), spans.get(2).get("parentId"));
+        assertEquals("bean://jdbcQueryBean", spans.get(2).get("camel.uri"));
 
-        assertEquals(spans.get(3).get("parentId"), spans.get(4).get("spanId"));
-        assertEquals(spans.get(3).get("camel.uri"), "direct://jdbcQuery");
+        assertEquals(spans.get(4).get("spanId"), spans.get(3).get("parentId"));
+        assertEquals("direct://jdbcQuery", spans.get(3).get("camel.uri"));
 
-        assertEquals(spans.get(4).get("parentId"), "0000000000000000");
-        assertEquals(spans.get(4).get("code.function"), "jdbcQuery");
+        assertEquals("0000000000000000", spans.get(4).get("parentId"));
+        assertEquals("jdbcQuery", spans.get(4).get("code.function"));
     }
 
     private List<Map<String, String>> getSpans() {