Move JDBC sqlcommenter flat fallback into DbConfig

Author: trask

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

@@ -7,6 +7,7 @@
 
 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;
@@ -51,6 +52,7 @@ 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 =
@@ -59,6 +61,16 @@ 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

@@ -26,7 +26,6 @@
 import io.opentelemetry.instrumentation.api.incubator.config.internal.DbConfig;
 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;
@@ -65,14 +64,7 @@ public final class OpenTelemetryDriver implements Driver {
   private static final List<Driver> DRIVER_CANDIDATES = new CopyOnWriteArrayList<>();
 
   private static SqlCommenter getSqlCommenter(OpenTelemetry openTelemetry) {
-    boolean enabled =
-        DbConfig.isSqlCommenterEnabled(
-            openTelemetry,
-            "jdbc",
-            ConfigPropertiesUtil.getBoolean(
-                "otel.instrumentation.jdbc.experimental.db-sqlcommenter.enabled",
-                ConfigPropertiesUtil.getBoolean(
-                    "otel.instrumentation.common.experimental.sqlcommenter.enabled", false)));
+    boolean enabled = DbConfig.isSqlCommenterEnabled(openTelemetry, "jdbc", false);
     return SqlCommenter.builder().setEnabled(enabled).build();
   }