You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2023/04/21 08:54:55 UTC
[camel-quarkus] 30/31: Fix of Opentelemetry test
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a23d7f7dd71aee0a9358f0b2ffee6bf27a3b9185
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Wed Apr 19 09:57:59 2023 +0200
Fix of Opentelemetry test
---
.../component/opentelemetry/it/OpenTelemetryTest.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 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 d09bda01c5..b354857771 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
@@ -89,7 +89,7 @@ class OpenTelemetryTest {
}
@Test
- public void testTracedBean() throws InterruptedException {
+ public void testTracedBean() {
String name = "Camel Quarkus OpenTelemetry";
RestAssured.get("/opentelemetry/greet/" + name)
.then()
@@ -118,9 +118,9 @@ class OpenTelemetryTest {
assertTrue(Long.parseLong(timestamp) > 0);
// Verify the span hierarchy is JAX-RS Service -> Direct Endpoint -> Bean Endpoint -> Bean method -> JDBC query
- await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 5);
+ await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 6);
List<Map<String, String>> spans = getSpans();
- assertEquals(5, spans.size());
+ assertEquals(6, spans.size());
assertEquals(spans.get(0).get("parentId"), spans.get(1).get("parentId"));
assertEquals(spans.get(0).get("code.function"), "getConnection");
@@ -133,8 +133,11 @@ class OpenTelemetryTest {
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("parentId"), "0000000000000000");
- assertEquals(spans.get(4).get("code.function"), "jdbcQuery");
+ assertEquals(spans.get(4).get("parentId"), spans.get(5).get("spanId"));
+ assertEquals(spans.get(4).get("camel.uri"), "direct://jdbcQuery");
+
+ assertEquals(spans.get(5).get("parentId"), "0000000000000000");
+ assertEquals(spans.get(5).get("code.function"), "jdbcQuery");
}
private List<Map<String, String>> getSpans() {