From dae157014ba6f095be93eda54cc7c625e85f4204 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 15 Jun 2026 15:49:19 -0700 Subject: [PATCH] Improve Vert.x Redis stable metric test --- .../redisclient/v4_0/VertxRedisClientTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedisClientTest.java b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedisClientTest.java index c4b81286cae0..6a4f21541d40 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedisClientTest.java +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/redisclient/v4_0/VertxRedisClientTest.java @@ -6,6 +6,7 @@ package io.opentelemetry.javaagent.instrumentation.vertx.redisclient.v4_0; import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv; +import static io.opentelemetry.instrumentation.testing.junit.db.DbClientMetricsTestUtil.assertDurationMetric; import static io.opentelemetry.instrumentation.testing.junit.service.SemconvServiceStabilityUtil.maybeStablePeerService; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE; @@ -89,11 +90,16 @@ void setCommand() throws Exception { .hasKind(SpanKind.CLIENT) .hasAttributesSatisfyingExactly(redisSpanAttributes("SET", "SET foo ?")))); - if (emitStableDatabaseSemconv()) { - testing.waitAndAssertMetrics( - "io.opentelemetry.vertx-redis-client-4.0", - metric -> metric.hasName("db.client.operation.duration")); - } + assertDurationMetric( + testing, + "io.opentelemetry.vertx-redis-client-4.0", + DB_SYSTEM_NAME, + DB_OPERATION_NAME, + DB_NAMESPACE, + SERVER_ADDRESS, + SERVER_PORT, + NETWORK_PEER_ADDRESS, + NETWORK_PEER_PORT); } @Test