Fix tests

Author: heyams

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

@@ -45,7 +45,7 @@ public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST
       internalSet(attributes, DB_NAME, getter.getDbNamespace(request));
       internalSet(attributes, DB_CONNECTION_STRING, getter.getConnectionString(request));
     }
-    internalSet(attributes, DB_SYSTEM, getter.getSystem(request));
+    internalSet(attributes, DB_SYSTEM, getter.getDbSystem(request));
   }
 
   @Override

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

@@ -65,28 +65,24 @@ public static <REQUEST, RESPONSE> SqlClientAttributesExtractorBuilder<REQUEST, R
     this.statementSanitizationEnabled = statementSanitizationEnabled;
   }
 
-  @SuppressWarnings("deprecation") // until old semconv are dropped
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
     super.onStart(attributes, parentContext, request);
 
-    String rawStatement =
-        SemconvStability.emitStableDatabaseSemconv()
-            ? getter.getRawQueryText(request)
-            : getter.getRawStatement(request);
-    SqlStatementInfo sanitizedStatement = sanitizer.sanitize(rawStatement);
+    String rawQueryText = getter.getRawQueryText(request);
+    SqlStatementInfo sanitizedStatement = sanitizer.sanitize(rawQueryText);
     String operation = sanitizedStatement.getOperation();
     if (SemconvStability.emitStableDatabaseSemconv()) {
       internalSet(
           attributes,
           DB_QUERY_TEXT,
-          statementSanitizationEnabled ? sanitizedStatement.getFullStatement() : rawStatement);
+          statementSanitizationEnabled ? sanitizedStatement.getFullStatement() : rawQueryText);
       internalSet(attributes, DB_OPERATION_NAME, operation);
     } else if (SemconvStability.emitOldDatabaseSemconv()) {
       internalSet(
           attributes,
           DB_STATEMENT,
-          statementSanitizationEnabled ? sanitizedStatement.getFullStatement() : rawStatement);
+          statementSanitizationEnabled ? sanitizedStatement.getFullStatement() : rawQueryText);
       internalSet(attributes, DB_OPERATION, operation);
     }
     if (!SQL_CALL.equals(operation)) {

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

@@ -8,6 +8,7 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
@@ -37,16 +38,11 @@ public String getUser(Map<String, String> map) {
       return map.get("db.user");
     }
 
-    @Deprecated
-    @Override
-    public String getName(Map<String, String> map) {
-      return map.get("db.name");
-    }
-
     @Nullable
     @Override
     public String getDbNamespace(Map<String, String> map) {
-      return map.get("db.namespace");
+      return map.get(
+          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.name")).getKey());
     }
 
     @Deprecated
@@ -55,28 +51,18 @@ public String getConnectionString(Map<String, String> map) {
       return map.get("db.connection_string");
     }
 
-    @Deprecated
-    @Override
-    public String getStatement(Map<String, String> map) {
-      return map.get("db.statement");
-    }
-
     @Nullable
     @Override
     public String getDbQueryText(Map<String, String> map) {
-      return map.get("db.query.text");
-    }
-
-    @Deprecated
-    @Override
-    public String getOperation(Map<String, String> map) {
-      return map.get("db.operation");
+      return map.get(
+          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.statement")).getKey());
     }
 
     @Nullable
     @Override
     public String getDbOperationName(Map<String, String> map) {
-      return map.get("db.operation.name");
+      return map.get(
+          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.operation")).getKey());
     }
   }
 

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

@@ -8,6 +8,7 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
@@ -26,21 +27,10 @@ class SqlClientAttributesExtractorTest {
   static final class TestAttributesGetter
       implements SqlClientAttributesGetter<Map<String, String>> {
 
-    @Deprecated
-    @Override
-    public String getRawStatement(Map<String, String> map) {
-      return map.get("db.statement");
-    }
-
     @Override
     public String getRawQueryText(Map<String, String> map) {
-      return map.get("db.query.text");
-    }
-
-    @Deprecated
-    @Override
-    public String getSystem(Map<String, String> map) {
-      return map.get("db.system");
+      return map.get(
+          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.statement")).getKey());
     }
 
     @Nullable
@@ -55,17 +45,11 @@ public String getUser(Map<String, String> map) {
       return map.get("db.user");
     }
 
-    @Deprecated
-    @Nullable
-    @Override
-    public String getName(Map<String, String> map) {
-      return map.get("db.name");
-    }
-
     @Nullable
     @Override
     public String getDbNamespace(Map<String, String> map) {
-      return map.get("db.namespace");
+      return map.get(
+          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.name")).getKey());
     }
 
     @Deprecated