Reduce diffs

Author: trask

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

@@ -8,12 +8,10 @@
 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;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import java.util.Collections;
@@ -37,8 +35,7 @@ public String getUser(Map<String, String> map) {
 
     @Override
     public String getDbNamespace(Map<String, String> map) {
-      return map.get(
-          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.name")).getKey());
+      return map.get("db.name");
     }
 
     @Deprecated
@@ -49,14 +46,12 @@ public String getConnectionString(Map<String, String> map) {
 
     @Override
     public String getDbQueryText(Map<String, String> map) {
-      return map.get(
-          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.statement")).getKey());
+      return map.get("db.statement");
     }
 
     @Override
     public String getDbOperationName(Map<String, String> map) {
-      return map.get(
-          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.operation")).getKey());
+      return map.get("db.operation");
     }
   }
 
@@ -66,18 +61,11 @@ void shouldExtractAllAvailableAttributes() {
     // given
     Map<String, String> request = new HashMap<>();
     request.put("db.system", "myDb");
-    if (SemconvStability.emitOldDatabaseSemconv()) {
-      request.put("db.user", "username");
-      request.put("db.connection_string", "mydb:///potatoes");
-    }
-    request.put(
-        SemconvStabilityUtil.getAttributeKey(DbIncubatingAttributes.DB_NAME).getKey(), "potatoes");
-    request.put(
-        SemconvStabilityUtil.getAttributeKey(DbIncubatingAttributes.DB_STATEMENT).getKey(),
-        "SELECT * FROM potato");
-    request.put(
-        SemconvStabilityUtil.getAttributeKey(DbIncubatingAttributes.DB_OPERATION).getKey(),
-        "SELECT");
+    request.put("db.user", "username");
+    request.put("db.name", "potatoes");
+    request.put("db.connection_string", "mydb:///potatoes");
+    request.put("db.statement", "SELECT * FROM potato");
+    request.put("db.operation", "SELECT");
 
     Context context = Context.root();
 

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

@@ -8,7 +8,6 @@
 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;
@@ -28,8 +27,7 @@ static final class TestAttributesGetter
 
     @Override
     public String getRawQueryText(Map<String, String> map) {
-      return map.get(
-          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.statement")).getKey());
+      return map.get("db.statement");
     }
 
     @Override
@@ -45,8 +43,7 @@ public String getUser(Map<String, String> map) {
 
     @Override
     public String getDbNamespace(Map<String, String> map) {
-      return map.get(
-          SemconvStabilityUtil.getAttributeKey(AttributeKey.stringKey("db.name")).getKey());
+      return map.get("db.name");
     }
 
     @Deprecated
@@ -62,15 +59,10 @@ void shouldExtractAllAttributes() {
     // given
     Map<String, String> request = new HashMap<>();
     request.put("db.system", "myDb");
-    if (SemconvStability.emitOldDatabaseSemconv()) {
-      request.put("db.user", "username");
-      request.put("db.connection_string", "mydb:///potatoes");
-      request.put("db.name", "potatoes");
-      request.put("db.statement", "SELECT * FROM potato WHERE id=12345");
-    } else if (SemconvStability.emitStableDatabaseSemconv()) {
-      request.put("db.namespace", "potatoes");
-      request.put("db.query.text", "SELECT * FROM potato WHERE id=12345");
-    }
+    request.put("db.user", "username");
+    request.put("db.name", "potatoes");
+    request.put("db.connection_string", "mydb:///potatoes");
+    request.put("db.statement", "SELECT * FROM potato WHERE id=12345");
 
     Context context = Context.root();
 
@@ -119,11 +111,7 @@ void shouldExtractAllAttributes() {
   void shouldNotExtractTableIfAttributeIsNotSet() {
     // given
     Map<String, String> request = new HashMap<>();
-    if (SemconvStability.emitOldDatabaseSemconv()) {
-      request.put("db.statement", "SELECT *");
-    } else {
-      request.put("db.query.text", "SELECT *");
-    }
+    request.put("db.statement", "SELECT *");
 
     Context context = Context.root();
 
@@ -149,13 +137,7 @@ void shouldNotExtractTableIfAttributeIsNotSet() {
   void shouldExtractTableToSpecifiedKey() {
     // given
     Map<String, String> request = new HashMap<>();
-    if (SemconvStability.emitOldDatabaseSemconv()) {
-      request.put("db.statement", "SELECT * FROM table");
-    }
-
-    if (SemconvStability.emitStableDatabaseSemconv()) {
-      request.put("db.query.text", "SELECT * FROM table");
-    }
+    request.put("db.statement", "SELECT * FROM table");
 
     Context context = Context.root();