Merge branch 'renovate/semconvversion' of github.com:open-telemetry/opentelemetry-java-instrumentation into renovate/semconvversion

Author: SylvainJuge

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

@@ -6,6 +6,9 @@
 package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
+import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
+import static io.opentelemetry.semconv.DbAttributes.DB_RESPONSE_STATUS_CODE;
+import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
 import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
 
 import io.opentelemetry.api.common.AttributeKey;
@@ -23,15 +26,10 @@ abstract class DbClientCommonAttributesExtractor<
 
   // copied from DbIncubatingAttributes
   private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name");
-  static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
   static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
-  public static final AttributeKey<String> DB_SYSTEM_NAME =
-      AttributeKey.stringKey("db.system.name");
   private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user");
   private static final AttributeKey<String> DB_CONNECTION_STRING =
       AttributeKey.stringKey("db.connection_string");
-  private static final AttributeKey<String> DB_RESPONSE_STATUS_CODE =
-      AttributeKey.stringKey("db.response.status_code");
 
   final GETTER getter;
 

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

@@ -10,6 +10,7 @@
 
 import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder;
 import io.opentelemetry.api.metrics.DoubleHistogramBuilder;
+import io.opentelemetry.semconv.DbAttributes;
 import io.opentelemetry.semconv.ErrorAttributes;
 import io.opentelemetry.semconv.NetworkAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
@@ -28,11 +29,11 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) {
     ((ExtendedDoubleHistogramBuilder) builder)
         .setAttributesAdvice(
             asList(
-                DbClientCommonAttributesExtractor.DB_SYSTEM_NAME,
-                SqlClientAttributesExtractor.DB_COLLECTION_NAME,
-                DbClientCommonAttributesExtractor.DB_NAMESPACE,
-                DbClientAttributesExtractor.DB_OPERATION_NAME,
-                DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE,
+                DbAttributes.DB_SYSTEM_NAME,
+                DbAttributes.DB_COLLECTION_NAME,
+                DbAttributes.DB_NAMESPACE,
+                DbAttributes.DB_OPERATION_NAME,
+                DbAttributes.DB_RESPONSE_STATUS_CODE,
                 ErrorAttributes.ERROR_TYPE,
                 NetworkAttributes.NETWORK_PEER_ADDRESS,
                 NetworkAttributes.NETWORK_PEER_PORT,

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java

@@ -19,6 +19,7 @@
 import io.opentelemetry.instrumentation.api.instrumenter.OperationListener;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader;
+import io.opentelemetry.semconv.DbAttributes;
 import io.opentelemetry.semconv.ErrorAttributes;
 import io.opentelemetry.semconv.NetworkAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
@@ -42,17 +43,17 @@ void collectsMetrics() {
 
     Attributes operationAttributes =
         Attributes.builder()
-            .put(DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, "myDb")
-            .put(SqlClientAttributesExtractor.DB_COLLECTION_NAME, "table")
-            .put(DbClientCommonAttributesExtractor.DB_NAMESPACE, "potatoes")
-            .put(DbClientAttributesExtractor.DB_OPERATION_NAME, "SELECT")
+            .put(DbAttributes.DB_SYSTEM_NAME, "myDb")
+            .put(DbAttributes.DB_COLLECTION_NAME, "table")
+            .put(DbAttributes.DB_NAMESPACE, "potatoes")
+            .put(DbAttributes.DB_OPERATION_NAME, "SELECT")
             .put(ServerAttributes.SERVER_ADDRESS, "localhost")
             .put(ServerAttributes.SERVER_PORT, 1234)
             .build();
 
     Attributes responseAttributes =
         Attributes.builder()
-            .put(DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE, "200")
+            .put(DbAttributes.DB_RESPONSE_STATUS_CODE, "200")
             .put(ErrorAttributes.ERROR_TYPE, "400")
             .put(NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4")
             .put(NetworkAttributes.NETWORK_PEER_PORT, 8080)
@@ -88,23 +89,13 @@ void collectsMetrics() {
                                     point
                                         .hasSum(0.15 /* seconds */)
                                         .hasAttributesSatisfying(
-                                            equalTo(
-                                                DbClientCommonAttributesExtractor.DB_SYSTEM_NAME,
-                                                "myDb"),
-                                            equalTo(
-                                                DbClientCommonAttributesExtractor.DB_NAMESPACE,
-                                                "potatoes"),
-                                            equalTo(
-                                                DbClientAttributesExtractor.DB_OPERATION_NAME,
-                                                "SELECT"),
-                                            equalTo(
-                                                SqlClientAttributesExtractor.DB_COLLECTION_NAME,
-                                                "table"),
+                                            equalTo(DbAttributes.DB_SYSTEM_NAME, "myDb"),
+                                            equalTo(DbAttributes.DB_NAMESPACE, "potatoes"),
+                                            equalTo(DbAttributes.DB_OPERATION_NAME, "SELECT"),
+                                            equalTo(DbAttributes.DB_COLLECTION_NAME, "table"),
                                             equalTo(ServerAttributes.SERVER_ADDRESS, "localhost"),
                                             equalTo(ServerAttributes.SERVER_PORT, 1234),
-                                            equalTo(
-                                                DbClientAttributesExtractor.DB_RESPONSE_STATUS_CODE,
-                                                "200"),
+                                            equalTo(DbAttributes.DB_RESPONSE_STATUS_CODE, "200"),
                                             equalTo(ErrorAttributes.ERROR_TYPE, "400"),
                                             equalTo(
                                                 NetworkAttributes.NETWORK_PEER_ADDRESS, "1.2.3.4"),

instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/opentelemetry/instrumentation/lettuce/v5_1/OpenTelemetryTracing.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.instrumentation.lettuce.v5_1;
 
 import static io.opentelemetry.instrumentation.lettuce.common.LettuceArgSplitter.splitArgs;
-import static io.opentelemetry.semconv.DbAttributes.DB_NAMESPACE;
 import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_TEXT;
 import static io.opentelemetry.semconv.DbAttributes.DB_SYSTEM_NAME;
 
@@ -349,7 +348,7 @@ public synchronized Tracer.Span tag(String key, String value) {
         argsString = value;
         return this;
       }
-      if (key.equals(DB_NAMESPACE.getKey()) && SemconvStability.emitOldDatabaseSemconv()) {
+      if (key.equals("db.namespace") && SemconvStability.emitOldDatabaseSemconv()) {
         // map backwards into db.redis.database.index
         long val = Long.parseLong(value);
         if (span != null) {