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 7792737ec508e3b5af9765f25d271eb4ddfe3816
Author: JiriOndrusek <ondrusek.j...@gmail.com>
AuthorDate: Tue Mar 28 13:49:52 2023 +0200
Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193
---
.../component/micrometer/it/MicrometerTest.java | 13 +++----
.../opentelemetry/it/SpanExporterResource.java | 1 +
.../opentelemetry/it/OpenTelemetryTest.java | 41 ++++++++++++----------
3 files changed, 31 insertions(+), 24 deletions(-)
diff --git
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
index e15cfa4b5e..8501ca7e06 100644
---
a/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
+++
b/integration-tests/micrometer/src/test/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerTest.java
@@ -56,8 +56,9 @@ class MicrometerTest {
RestAssured.get("/micrometer/timer")
.then()
.statusCode(200);
- assertTrue(getMetricValue(Integer.class, "counter",
"CamelExchangesSucceeded", "routeId=micrometer-metrics-timer") > 0);
- assertEquals(0, getMetricValue(Integer.class, "counter",
"CamelExchangesFailed", "routeId=micrometer-metrics-timer"));
+ assertTrue(
+ getMetricValue(Integer.class, "counter",
"camel.exchanges.succeeded", "routeId=micrometer-metrics-timer") > 0);
+ assertEquals(0, getMetricValue(Integer.class, "counter",
"camel.exchanges.failed", "routeId=micrometer-metrics-timer"));
}
@Test
@@ -66,13 +67,13 @@ class MicrometerTest {
.then()
.statusCode(200);
String tags = "nodeId=log1,routeId=log";
- assertTrue(getMetricValue(Double.class, "timer",
"CamelMessageHistory", tags) > 0.0);
+ assertTrue(getMetricValue(Double.class, "timer",
"camel.message.history", tags) > 0.0);
}
@Test
public void testMicrometerRouteEventNotifier() {
- assertTrue(getMetricValue(Integer.class, "gauge", "CamelRoutesAdded")
>= 4);
- assertTrue(getMetricValue(Integer.class, "gauge",
"CamelRoutesRunning") >= 4);
+ assertTrue(getMetricValue(Integer.class, "gauge",
"camel.routes.added") >= 4);
+ assertTrue(getMetricValue(Integer.class, "gauge",
"camel.routes.running") >= 4);
}
@Test
@@ -81,7 +82,7 @@ class MicrometerTest {
.then()
.statusCode(200);
String tags = "endpointName=direct://log,eventType=ExchangeSentEvent";
- assertTrue(getMetricValue(Double.class, "timer",
"CamelExchangeEventNotifier", tags) >= 0.0);
+ assertTrue(getMetricValue(Double.class, "timer",
"camel.exchange.event.notifier", tags) >= 0.0);
}
@Test
diff --git
a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterResource.java
b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterResource.java
index 928fe42119..923331d370 100644
---
a/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterResource.java
+++
b/integration-tests/opentelemetry/src/main/java/org/apache/camel/quarkus/component/opentelemetry/it/SpanExporterResource.java
@@ -55,6 +55,7 @@ public class SpanExporterResource {
objectBuilder.add("spanId", span.getSpanId());
objectBuilder.add("traceId", span.getTraceId());
objectBuilder.add("parentId", span.getParentSpanId());
+ objectBuilder.add("kind", span.getKind().name());
attributes.forEach((k, v) -> objectBuilder.add(String.valueOf(k),
v.toString()));
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 f2af02ec30..d09bda01c5 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
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import io.opentelemetry.api.trace.SpanKind;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.junit.jupiter.api.AfterEach;
@@ -79,14 +80,16 @@ class OpenTelemetryTest {
.body(equalTo("Traced direct:start"));
// Verify the span hierarchy is JAX-RS Service -> Direct Endpoint
- await().atMost(30, TimeUnit.SECONDS).pollDelay(50,
TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 2);
+ await().atMost(30, TimeUnit.SECONDS).pollDelay(50,
TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 3);
List<Map<String, String>> spans = getSpans();
- assertEquals(2, spans.size());
- assertEquals(spans.get(1).get("spanId"), spans.get(0).get("parentId"));
+ assertEquals(3, spans.size());
+ assertEquals(spans.get(0).get("parentId"), spans.get(1).get("spanId"));
+ assertEquals(spans.get(1).get("kind"), SpanKind.CLIENT.name());
+ assertEquals(spans.get(2).get("kind"), SpanKind.SERVER.name());
}
@Test
- public void testTracedBean() {
+ public void testTracedBean() throws InterruptedException {
String name = "Camel Quarkus OpenTelemetry";
RestAssured.get("/opentelemetry/greet/" + name)
.then()
@@ -94,11 +97,13 @@ 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() == 3);
+ await().atMost(30, TimeUnit.SECONDS).pollDelay(50,
TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 4);
List<Map<String, String>> spans = getSpans();
- assertEquals(3, spans.size());
- assertEquals(spans.get(1).get("parentId"),
spans.get(0).get("parentId"));
- assertEquals(spans.get(2).get("spanId"), spans.get(1).get("parentId"));
+ assertEquals(4, 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(2).get("kind"), SpanKind.CLIENT.name());
+ assertEquals(spans.get(3).get("kind"), SpanKind.SERVER.name());
}
@Test
@@ -116,20 +121,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(1).get("parentId"),
spans.get(0).get("parentId"));
- assertEquals("getConnection", spans.get(0).get("code.function"));
+ assertEquals(spans.get(0).get("parentId"),
spans.get(1).get("parentId"));
+ assertEquals(spans.get(0).get("code.function"), "getConnection");
- assertEquals(spans.get(2).get("spanId"), spans.get(1).get("parentId"));
- assertEquals("SELECT", spans.get(1).get("db.operation"));
+ assertEquals(spans.get(1).get("parentId"), spans.get(2).get("spanId"));
+ assertEquals(spans.get(1).get("db.operation"), "SELECT");
- assertEquals(spans.get(3).get("spanId"), spans.get(2).get("parentId"));
- assertEquals("bean://jdbcQueryBean", spans.get(2).get("camel.uri"));
+ assertEquals(spans.get(2).get("parentId"), spans.get(3).get("spanId"));
+ assertEquals(spans.get(2).get("camel.uri"), "bean://jdbcQueryBean");
- assertEquals(spans.get(4).get("spanId"), spans.get(3).get("parentId"));
- assertEquals("direct://jdbcQuery", spans.get(3).get("camel.uri"));
+ assertEquals(spans.get(3).get("parentId"), spans.get(4).get("spanId"));
+ assertEquals(spans.get(3).get("camel.uri"), "direct://jdbcQuery");
- assertEquals("0000000000000000", spans.get(4).get("parentId"));
- assertEquals("jdbcQuery", spans.get(4).get("code.function"));
+ assertEquals(spans.get(4).get("parentId"), "0000000000000000");
+ assertEquals(spans.get(4).get("code.function"), "jdbcQuery");
}
private List<Map<String, String>> getSpans() {
