pr review

Author: zeitlinger

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbResponseStatusUtil.java renamed to instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/internal/DbResponseStatusUtil.java

@@ -3,11 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.incubator.semconv.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db.internal;
 
 import javax.annotation.Nullable;
 
-public class DbResponseStatusUtil {
+/**
+ * This class is internal and experimental. Its APIs are unstable and can change at any time. Its
+ * APIs (or a version of them) may be promoted to the public stable API in the future, but no
+ * guarantees are made.
+ */
+public final class DbResponseStatusUtil {
   private DbResponseStatusUtil() {}
 
   @Nullable

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

@@ -18,8 +18,8 @@
  */
 public final class SemconvStability {
 
-  private static boolean emitOldDatabaseSemconv;
-  private static boolean emitStableDatabaseSemconv;
+  private static final boolean emitOldDatabaseSemconv;
+  private static final boolean emitStableDatabaseSemconv;
 
   static {
     boolean oldDatabase = true;
@@ -78,10 +78,4 @@ public static String stableDbSystemName(String oldDbSystem) {
   }
 
   private SemconvStability() {}
-
-  public static void setForTesting(
-      boolean emitOldDatabaseSemconv, boolean emitStableDatabaseSemconv) {
-    SemconvStability.emitOldDatabaseSemconv = emitOldDatabaseSemconv;
-    SemconvStability.emitStableDatabaseSemconv = emitStableDatabaseSemconv;
-  }
 }

instrumentation/elasticsearch/elasticsearch-rest-common-5.0/library/src/main/java/io/opentelemetry/instrumentation/elasticsearch/rest/common/v5_0/internal/ElasticsearchDbAttributesGetter.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;
 
-import static io.opentelemetry.instrumentation.api.incubator.semconv.db.DbResponseStatusUtil.dbResponseStatusCode;
+import static io.opentelemetry.instrumentation.api.incubator.semconv.db.internal.DbResponseStatusUtil.dbResponseStatusCode;
 import static java.util.logging.Level.FINE;
 
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;

instrumentation/opensearch/opensearch-rest-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/OpenSearchRestAttributesGetter.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.opensearch.rest;
 
-import static io.opentelemetry.instrumentation.api.incubator.semconv.db.DbResponseStatusUtil.dbResponseStatusCode;
+import static io.opentelemetry.instrumentation.api.incubator.semconv.db.internal.DbResponseStatusUtil.dbResponseStatusCode;
 
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;

instrumentation/vertx/vertx-sql-client-4.0/javaagent/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
 
 testing {
   suites {
-    val testVertx5 by registering(JvmTestSuite::class) {
+    val testVertx4_5 by registering(JvmTestSuite::class) {
       val version = "4.5.13"
       dependencies {
         implementation(project())
@@ -35,6 +35,14 @@ testing {
 
         implementation(project(":instrumentation:netty:netty-4.1:javaagent"))
       }
+
+      targets {
+        all {
+          testTask.configure {
+            jvmArgs("-Dotel.semconv-stability.opt-in=database")
+          }
+        }
+      }
     }
   }
 }

instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/testVertx5/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java renamed to instrumentation/vertx/vertx-sql-client-4.0/javaagent/src/testVertx4_5/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/sql/VertxSqlClientTest.java

@@ -18,7 +18,6 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_RESPONSE_STATUS_CODE;
 
 import io.opentelemetry.api.trace.SpanKind;
-import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -62,7 +61,6 @@ class VertxSqlClientTest {
 
   @BeforeAll
   static void setUp() throws Exception {
-    SemconvStability.setForTesting(false, true);
     container =
         new GenericContainer<>("postgres:9.6.8")
             .withEnv("POSTGRES_USER", USER_DB)