From b04fda482ab9f70034d33b365de8d155444e9199 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 15 Jun 2026 16:50:26 -0700 Subject: [PATCH 1/2] Assert stable connection pool metric names in stable semconv mode --- .../hikaricp/AbstractHikariInstrumentationTest.java | 12 +++++++++--- .../viburdbcp/AbstractViburInstrumentationTest.java | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/instrumentation/hikaricp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/hikaricp/AbstractHikariInstrumentationTest.java b/instrumentation/hikaricp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/hikaricp/AbstractHikariInstrumentationTest.java index 2ec66f9c9846..c2356f3c4f31 100644 --- a/instrumentation/hikaricp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/hikaricp/AbstractHikariInstrumentationTest.java +++ b/instrumentation/hikaricp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/hikaricp/AbstractHikariInstrumentationTest.java @@ -88,15 +88,21 @@ void shouldReportMetrics() throws SQLException, InterruptedException { testing() .waitAndAssertMetrics( INSTRUMENTATION_NAME, - "db.client.connections.idle.min", + emitStableDatabaseSemconv() + ? "db.client.connection.idle.min" + : "db.client.connections.idle.min", AbstractIterableAssert::isEmpty); testing() .waitAndAssertMetrics( - INSTRUMENTATION_NAME, "db.client.connections.max", AbstractIterableAssert::isEmpty); + INSTRUMENTATION_NAME, + emitStableDatabaseSemconv() ? "db.client.connection.max" : "db.client.connections.max", + AbstractIterableAssert::isEmpty); testing() .waitAndAssertMetrics( INSTRUMENTATION_NAME, - "db.client.connections.pending_requests", + emitStableDatabaseSemconv() + ? "db.client.connection.pending_requests" + : "db.client.connections.pending_requests", AbstractIterableAssert::isEmpty); } diff --git a/instrumentation/vibur-dbcp-11.0/testing/src/main/java/io/opentelemetry/instrumentation/viburdbcp/AbstractViburInstrumentationTest.java b/instrumentation/vibur-dbcp-11.0/testing/src/main/java/io/opentelemetry/instrumentation/viburdbcp/AbstractViburInstrumentationTest.java index ef91bd1e2eda..6081f2db278a 100644 --- a/instrumentation/vibur-dbcp-11.0/testing/src/main/java/io/opentelemetry/instrumentation/viburdbcp/AbstractViburInstrumentationTest.java +++ b/instrumentation/vibur-dbcp-11.0/testing/src/main/java/io/opentelemetry/instrumentation/viburdbcp/AbstractViburInstrumentationTest.java @@ -76,6 +76,8 @@ void shouldReportMetrics() throws SQLException { INSTRUMENTATION_NAME, countMetricName, AbstractIterableAssert::isEmpty); testing() .waitAndAssertMetrics( - INSTRUMENTATION_NAME, "db.client.connections.max", AbstractIterableAssert::isEmpty); + INSTRUMENTATION_NAME, + emitStableDatabaseSemconv() ? "db.client.connection.max" : "db.client.connections.max", + AbstractIterableAssert::isEmpty); } } From 642629fc510a93d1b646ad392d30effee336b9c1 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 15 Jun 2026 20:18:29 -0700 Subject: [PATCH 2/2] Assert stable connection pool metric names in tomcat-jdbc stable test --- .../jdbc/v8_5/TomcatJdbcInstrumentationTest.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/v8_5/TomcatJdbcInstrumentationTest.java b/instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/v8_5/TomcatJdbcInstrumentationTest.java index b848689b9e4e..ad140493a2f5 100644 --- a/instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/v8_5/TomcatJdbcInstrumentationTest.java +++ b/instrumentation/tomcat/tomcat-jdbc-8.5/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/v8_5/TomcatJdbcInstrumentationTest.java @@ -78,19 +78,25 @@ private static void assertNoConnectionPoolMetrics() { AbstractIterableAssert::isEmpty); testing.waitAndAssertMetrics( "io.opentelemetry.tomcat-jdbc", - "db.client.connections.idle.min", + emitStableDatabaseSemconv() + ? "db.client.connection.idle.min" + : "db.client.connections.idle.min", AbstractIterableAssert::isEmpty); testing.waitAndAssertMetrics( "io.opentelemetry.tomcat-jdbc", - "db.client.connections.idle.max", + emitStableDatabaseSemconv() + ? "db.client.connection.idle.max" + : "db.client.connections.idle.max", AbstractIterableAssert::isEmpty); testing.waitAndAssertMetrics( "io.opentelemetry.tomcat-jdbc", - "db.client.connections.max", + emitStableDatabaseSemconv() ? "db.client.connection.max" : "db.client.connections.max", AbstractIterableAssert::isEmpty); testing.waitAndAssertMetrics( "io.opentelemetry.tomcat-jdbc", - "db.client.connections.pending_requests", + emitStableDatabaseSemconv() + ? "db.client.connection.pending_requests" + : "db.client.connections.pending_requests", AbstractIterableAssert::isEmpty); } }