Keep JDBC sqlcommenter fallback local

Author: trask

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/DbConfig.java

@@ -7,7 +7,6 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
-import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import java.util.function.Function;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
@@ -52,7 +51,6 @@ public static boolean isSqlCommenterEnabled(
     return isSqlCommenterEnabled(openTelemetry, instrumentationName, false);
   }
 
-  @SuppressWarnings("deprecation") // libraries still support flat config properties until 3.0
   public static boolean isSqlCommenterEnabled(
       OpenTelemetry openTelemetry, String instrumentationName, boolean defaultValue) {
     Boolean sqlCommenterEnabled =
@@ -61,16 +59,6 @@ public static boolean isSqlCommenterEnabled(
     if (sqlCommenterEnabled != null) {
       return sqlCommenterEnabled;
     }
-
-    sqlCommenterEnabled =
-        ConfigPropertiesUtil.getBoolean(
-            "otel.instrumentation."
-                + instrumentationName.replace('_', '-')
-                + ".experimental.sqlcommenter.enabled");
-    if (sqlCommenterEnabled != null) {
-      return sqlCommenterEnabled;
-    }
-
     return isCommonSqlCommenterEnabled(openTelemetry, defaultValue);
   }
 

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/OpenTelemetryDriver.java

@@ -24,8 +24,10 @@
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.DbConfig;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.instrumentation.api.incubator.semconv.db.internal.SqlCommenter;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
+import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
 import io.opentelemetry.instrumentation.jdbc.internal.DbRequest;
 import io.opentelemetry.instrumentation.jdbc.internal.JdbcConnectionUrlParser;
@@ -63,8 +65,24 @@ public final class OpenTelemetryDriver implements Driver {
   private static final AtomicBoolean REGISTERED = new AtomicBoolean();
   private static final List<Driver> DRIVER_CANDIDATES = new CopyOnWriteArrayList<>();
 
+  @SuppressWarnings("deprecation") // library flat config fallback remains supported until 3.0
   private static SqlCommenter getSqlCommenter(OpenTelemetry openTelemetry) {
-    boolean enabled = DbConfig.isSqlCommenterEnabled(openTelemetry, "jdbc", false);
+    Boolean enabled =
+        DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "jdbc")
+            .get("sqlcommenter/development")
+            .getBoolean("enabled");
+    if (enabled == null) {
+      enabled =
+          ConfigPropertiesUtil.getBoolean(
+              "otel.instrumentation.jdbc.experimental.sqlcommenter.enabled");
+    }
+    if (enabled == null) {
+      enabled =
+          DbConfig.isCommonSqlCommenterEnabled(
+              openTelemetry,
+              ConfigPropertiesUtil.getBoolean(
+                  "otel.instrumentation.common.experimental.db-sqlcommenter.enabled", false));
+    }
     return SqlCommenter.builder().setEnabled(enabled).build();
   }