From a115865771e967eced49cefd0897ae392efb21a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Vav=C5=99=C3=ADk?= Date: Fri, 3 Mar 2023 13:42:35 +0100 Subject: [PATCH] Fix OpenTelemetry traces operation names as they changed with OT v1.23.1 --- .../ts/http/graphql/telemetry/GraphQLTelemetryIT.java | 2 +- .../ts/http/vertx/webclient/VertxWebClientIT.java | 9 +++++---- .../io/quarkus/ts/opentelemetry/OpentelemetryIT.java | 4 ++-- .../io/quarkus/ts/transactions/TransactionCommons.java | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java index 92fb0d068..d0c0e900c 100644 --- a/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java +++ b/http/graphql-telemetry/src/test/java/io/quarkus/ts/http/graphql/telemetry/GraphQLTelemetryIT.java @@ -38,7 +38,7 @@ void verifyTelemetry() { Assertions.assertEquals("Plato", reactive.jsonPath().getString("data.friend_r.name")); await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(10)).untilAsserted(() -> { - String operation = "/graphql"; + String operation = "POST /graphql"; Response traces = given().when() .queryParam("operation", operation) .queryParam("lookback", "1h") diff --git a/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/VertxWebClientIT.java b/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/VertxWebClientIT.java index a49f9bdab..a82193bad 100644 --- a/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/VertxWebClientIT.java +++ b/http/vertx-web-client/src/test/java/io/quarkus/ts/http/vertx/webclient/VertxWebClientIT.java @@ -49,6 +49,7 @@ public class VertxWebClientIT { static final String EXPECTED_VALUE = "Chuck Norris has already been to mars; that why there's no signs of life"; static final int DELAY = 3500; // must be greater than vertx.webclient.timeout-sec private static final String TRACE_PING_PATH = "/trace/ping"; + private static final String TRACE_PING_OPERATION_NAME = "GET " + TRACE_PING_PATH; private Response resp; @@ -106,13 +107,13 @@ public void endpointShouldTrace() { final int pageLimit = 50; await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(1)).untilAsserted(() -> { whenIMakePingRequest(); - thenRetrieveTraces(pageLimit, "1h", getServiceName(), TRACE_PING_PATH); + thenRetrieveTraces(pageLimit, "1h", getServiceName(), TRACE_PING_OPERATION_NAME); thenStatusCodeMustBe(HttpStatus.SC_OK); thenTraceDataSizeMustBe(greaterThan(0)); thenTraceSpanSizeMustBe(greaterThan(0)); thenTraceSpanTagsSizeMustBe(greaterThan(0)); thenTraceSpansOperationNameMustBe(not(empty())); - thenCheckOperationNamesIsEqualTo(TRACE_PING_PATH); + thenCheckOperationNamesIsEqualTo(TRACE_PING_OPERATION_NAME); }); } @@ -121,13 +122,13 @@ public void httpClientShouldHaveHisOwnSpan() { final int pageLimit = 50; await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(1)).untilAsserted(() -> { whenIMakePingRequest(); - thenRetrieveTraces(pageLimit, "1h", getServiceName(), TRACE_PING_PATH); + thenRetrieveTraces(pageLimit, "1h", getServiceName(), TRACE_PING_OPERATION_NAME); thenStatusCodeMustBe(HttpStatus.SC_OK); thenTraceDataSizeMustBe(greaterThan(0)); thenTraceSpanSizeMustBe(greaterThan(1)); thenTraceSpanTagsSizeMustBe(greaterThan(0)); thenTraceSpansOperationNameMustBe(not(empty())); - thenCheckOperationNamesIsEqualTo(TRACE_PING_PATH); + thenCheckOperationNamesIsEqualTo(TRACE_PING_OPERATION_NAME); }); } diff --git a/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpentelemetryIT.java b/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpentelemetryIT.java index 91212a269..16e4e7878 100644 --- a/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpentelemetryIT.java +++ b/monitoring/opentelemetry/src/test/java/io/quarkus/ts/opentelemetry/OpentelemetryIT.java @@ -47,8 +47,8 @@ public class OpentelemetryIT { @Test public void testContextPropagation() { int pageLimit = 10; - String operationName = "/ping/pong"; - String[] operations = new String[] { "/ping/pong", "HTTP GET", "/hello" }; + String operationName = "GET /ping/pong"; + String[] operations = new String[] { "GET /ping/pong", "GET", "GET /hello" }; await().atMost(1, TimeUnit.MINUTES).pollInterval(Duration.ofSeconds(1)).untilAsserted(() -> { whenDoPingPongRequest(); diff --git a/sql-db/narayana-transactions/src/test/java/io/quarkus/ts/transactions/TransactionCommons.java b/sql-db/narayana-transactions/src/test/java/io/quarkus/ts/transactions/TransactionCommons.java index 19e249d21..c443f8425 100644 --- a/sql-db/narayana-transactions/src/test/java/io/quarkus/ts/transactions/TransactionCommons.java +++ b/sql-db/narayana-transactions/src/test/java/io/quarkus/ts/transactions/TransactionCommons.java @@ -122,7 +122,7 @@ public void verifyRollbackForNarayanaProgrammaticApproach() { @Tag("QUARKUS-2492") @Test public void smokeTestNarayanaProgrammaticTransactionTrace() { - String operationName = "/transfer/accounts/{account_id}"; + String operationName = "GET /transfer/accounts/{account_id}"; given().get("/transfer/accounts/" + ACCOUNT_NUMBER_LUIS).then().statusCode(HttpStatus.SC_OK); verifyRestRequestTraces(operationName); }