rename "db.client.connections.usage" to "db.client.connection.count"

Author: breedx-splk

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbConnectionPoolMetrics.java

@@ -57,7 +57,7 @@ public static DbConnectionPoolMetrics create(
 
   public ObservableLongMeasurement connections() {
     return meter
-        .upDownCounterBuilder("db.client.connections.usage")
+        .upDownCounterBuilder("db.client.connection.count")
         .setUnit("{connections}")
         .setDescription(
             "The number of connections that are currently in state described by the state attribute.")

instrumentation/alibaba-druid-1.0/testing/src/main/java/io/opentelemetry/instrumentation/alibabadruid/AbstractDruidInstrumentationTest.java

@@ -73,7 +73,7 @@ void shouldReportMetrics() throws Exception {
     Set<String> metricNames =
         new HashSet<>(
             Arrays.asList(
-                "db.client.connections.usage",
+                "db.client.connection.count",
                 "db.client.connections.idle.min",
                 "db.client.connections.idle.max",
                 "db.client.connections.max",

instrumentation/apache-dbcp-2.0/testing/src/main/java/io/opentelemetry/instrumentation/apachedbcp/AbstractApacheDbcpInstrumentationTest.java

@@ -75,7 +75,7 @@ void shouldReportMetrics() throws Exception {
     Set<String> metricNames =
         new HashSet<>(
             Arrays.asList(
-                "db.client.connections.usage",
+                "db.client.connection.count",
                 "db.client.connections.idle.min",
                 "db.client.connections.idle.max",
                 "db.client.connections.max"));

instrumentation/c3p0-0.9/testing/src/main/java/io/opentelemetry/instrumentation/c3p0/AbstractC3p0InstrumentationTest.java

@@ -66,7 +66,7 @@ void shouldReportMetrics() throws Exception {
     // then
     Set<String> metricNames =
         new HashSet<>(
-            Arrays.asList("db.client.connections.usage", "db.client.connections.pending_requests"));
+            Arrays.asList("db.client.connection.count", "db.client.connections.pending_requests"));
     assertThat(testing().metrics())
         .filteredOn(
             metricData ->

instrumentation/hikaricp-3.0/testing/src/main/java/io/opentelemetry/instrumentation/hikaricp/AbstractHikariInstrumentationTest.java

@@ -81,7 +81,7 @@ void shouldReportMetrics() throws SQLException, InterruptedException {
     testing()
         .waitAndAssertMetrics(
             "io.opentelemetry.hikaricp-3.0",
-            "db.client.connections.usage",
+            "db.client.connection.count",
             AbstractIterableAssert::isEmpty);
     testing()
         .waitAndAssertMetrics(

instrumentation/oracle-ucp-11.2/testing/src/main/java/io/opentelemetry/instrumentation/oracleucp/AbstractOracleUcpInstrumentationTest.java

@@ -117,7 +117,7 @@ void shouldReportMetrics(boolean setExplicitPoolName) throws Exception {
     Set<String> metricNames =
         new HashSet<>(
             Arrays.asList(
-                "db.client.connections.usage",
+                "db.client.connection.count",
                 "db.client.connections.max",
                 "db.client.connections.pending_requests"));
     assertThat(testing().metrics())

instrumentation/tomcat/tomcat-jdbc/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java

@@ -77,7 +77,7 @@ private static void assertConnectionPoolMetrics(String poolName) {
   private static void assertNoConnectionPoolMetrics() {
     testing.waitAndAssertMetrics(
         "io.opentelemetry.tomcat-jdbc",
-        "db.client.connections.usage",
+        "db.client.connection.count",
         AbstractIterableAssert::isEmpty);
     testing.waitAndAssertMetrics(
         "io.opentelemetry.tomcat-jdbc",

instrumentation/vibur-dbcp-11.0/testing/src/main/java/io/opentelemetry/instrumentation/viburdbcp/AbstractViburInstrumentationTest.java

@@ -74,7 +74,7 @@ void shouldReportMetrics() throws SQLException, InterruptedException {
     // then
     testing()
         .waitAndAssertMetrics(
-            INSTRUMENTATION_NAME, "db.client.connections.usage", AbstractIterableAssert::isEmpty);
+            INSTRUMENTATION_NAME, "db.client.connection.count", AbstractIterableAssert::isEmpty);
     testing()
         .waitAndAssertMetrics(
             INSTRUMENTATION_NAME, "db.client.connections.max", AbstractIterableAssert::isEmpty);

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/DbConnectionPoolMetricsAssertions.java

@@ -126,7 +126,7 @@ public void assertConnectionPoolEmitsMetrics() {
   private void verifyConnectionUsage() {
     testing.waitAndAssertMetrics(
         instrumentationName,
-        "db.client.connections.usage",
+        "db.client.connection.count",
         metrics -> metrics.anySatisfy(this::verifyUsageMetric));
   }