Delete SemconvStability.getAttributeKey

Author: heyams

instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/SemconvStability.java

@@ -7,7 +7,6 @@
 
 import static java.util.Arrays.asList;
 
-import io.opentelemetry.api.common.AttributeKey;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -52,14 +51,5 @@ public static boolean emitStableDatabaseSemconv() {
     return emitStableDatabaseSemconv;
   }
 
-  public static AttributeKey<String> getAttributeKey(String oldKey) {
-    if (emitStableDatabaseSemconv()) {
-      if ("db.cassandra.table".equals(oldKey)) {
-        return AttributeKey.stringKey("db.collection.name");
-      }
-    }
-    return AttributeKey.stringKey(oldKey);
-  }
-
   private SemconvStability() {}
 }

instrumentation/cassandra/cassandra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v3_0/CassandraSingletons.java

@@ -7,14 +7,14 @@
 
 import com.datastax.driver.core.ExecutionInfo;
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
-import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 
 public final class CassandraSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-3.0";
@@ -33,8 +33,9 @@ public final class CassandraSingletons {
             .addAttributesExtractor(
                 SqlClientAttributesExtractor.builder(attributesGetter)
                     .setTableAttribute(
-                        SemconvStability.getAttributeKey(
-                            DbIncubatingAttributes.DB_CASSANDRA_TABLE.getKey()))
+                        SemconvStability.emitStableDatabaseSemconv()
+                            ? AttributeKey.stringKey("db.collection.name")
+                            : AttributeKey.stringKey("db.cassandra.table"))
                     .setStatementSanitizationEnabled(
                         AgentCommonConfig.get().isStatementSanitizationEnabled())
                     .build())

instrumentation/cassandra/cassandra-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraSingletons.java

@@ -7,14 +7,14 @@
 
 import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
 import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.SqlClientAttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
 import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
 import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
-import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 
 public final class CassandraSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.cassandra-4.0";
@@ -32,8 +32,9 @@ public final class CassandraSingletons {
             .addAttributesExtractor(
                 SqlClientAttributesExtractor.builder(attributesGetter)
                     .setTableAttribute(
-                        SemconvStability.getAttributeKey(
-                            DbIncubatingAttributes.DB_CASSANDRA_TABLE.getKey()))
+                        SemconvStability.emitStableDatabaseSemconv()
+                            ? AttributeKey.stringKey("db.collection.name")
+                            : AttributeKey.stringKey("db.cassandra.table"))
                     .setStatementSanitizationEnabled(
                         AgentCommonConfig.get().isStatementSanitizationEnabled())
                     .build())

instrumentation/cassandra/cassandra-4.4/library/src/main/java/io/opentelemetry/instrumentation/cassandra/v4_4/CassandraTelemetryBuilder.java

@@ -59,7 +59,10 @@ protected Instrumenter<CassandraRequest, ExecutionInfo> createInstrumenter(
             openTelemetry, INSTRUMENTATION_NAME, DbClientSpanNameExtractor.create(attributesGetter))
         .addAttributesExtractor(
             SqlClientAttributesExtractor.builder(attributesGetter)
-                .setTableAttribute(SemconvStability.getAttributeKey(DB_CASSANDRA_TABLE.getKey()))
+                .setTableAttribute(
+                    SemconvStability.emitStableDatabaseSemconv()
+                        ? AttributeKey.stringKey("db.collection.name")
+                        : AttributeKey.stringKey("db.cassandra.table"))
                 .setStatementSanitizationEnabled(statementSanitizationEnabled)
                 .build())
         .addAttributesExtractor(