add config flags but in the wrong place

Author: vandonr

dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java

@@ -8,6 +8,7 @@
 import datadog.trace.api.Config;
 import datadog.trace.api.DDSpanId;
 import datadog.trace.api.DDTraceId;
+import datadog.trace.api.InstrumenterConfig;
 import datadog.trace.api.naming.SpanNaming;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -28,6 +29,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.HashSet;
+import java.util.Properties;
 import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -181,7 +183,7 @@ public static DBInfo parseDBInfo(
         } catch (Throwable ignore) {
         }
         if (dbInfo == null) {
-          // couldn't find DBInfo anywhere, so fall back to default
+          // couldn't find DBInfo from a previous call anywhere, so we try to fetch it from the DB
           dbInfo = parseDBInfoFromConnection(connection);
         }
         // store the DBInfo on the outermost connection instance to avoid future searches
@@ -200,7 +202,7 @@ public String getDbService(final DBInfo dbInfo) {
   }
 
   public static DBInfo parseDBInfoFromConnection(final Connection connection) {
-    if (connection == null) {
+    if (connection == null || !InstrumenterConfig.get().isJdbcMetadataFetchingEnabled()) {
       // we can log here, but it risks to be too verbose
       return DBInfo.DEFAULT;
     }
@@ -209,12 +211,15 @@ public static DBInfo parseDBInfoFromConnection(final Connection connection) {
       final DatabaseMetaData metaData = connection.getMetaData();
       final String url = metaData.getURL();
       if (url != null) {
-        try {
-          dbInfo = JDBCConnectionUrlParser.extractDBInfo(url, connection.getClientInfo());
-        } catch (final Throwable ex) {
-          // getClientInfo is likely not allowed.
-          dbInfo = JDBCConnectionUrlParser.extractDBInfo(url, null);
+        Properties clientInfo = null;
+        if (InstrumenterConfig.get().isJdbcClientInfoFetchingEnabled()) {
+          try {
+            clientInfo = connection.getClientInfo();
+          } catch (final Throwable ex) {
+            // getClientInfo is likely not allowed, we can still extract info from the url alone
+          }
         }
+        dbInfo = JDBCConnectionUrlParser.extractDBInfo(url, clientInfo);
       } else {
         dbInfo = DBInfo.DEFAULT;
       }

dd-trace-api/src/main/java/datadog/trace/api/config/TraceInstrumentationConfig.java

@@ -75,6 +75,11 @@ public final class TraceInstrumentationConfig {
   public static final String JDBC_POOL_WAITING_ENABLED =
       "trace.experimental.jdbc.pool.waiting.enabled";
 
+  public static final String JDBC_METADATA_FETCHING_ENABLED =
+      "trace.jdbc.metadata.fetching.enabled";
+  public static final String JDBC_CLIENT_INFO_FETCHING_ENABLED =
+      "trace.jdbc.client.info.fetching.enabled";
+
   public static final String AKKA_FORK_JOIN_TASK_NAME = "trace.akka.fork.join.task.name";
   public static final String AKKA_FORK_JOIN_EXECUTOR_TASK_NAME =
       "trace.akka.fork.join.executor.task.name";

internal-api/src/main/java/datadog/trace/api/InstrumenterConfig.java

@@ -44,7 +44,9 @@
 import static datadog.trace.api.config.TraceInstrumentationConfig.INSTRUMENTATION_CONFIG_ID;
 import static datadog.trace.api.config.TraceInstrumentationConfig.INTEGRATIONS_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.JAX_RS_ADDITIONAL_ANNOTATIONS;
+import static datadog.trace.api.config.TraceInstrumentationConfig.JDBC_CLIENT_INFO_FETCHING_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.JDBC_CONNECTION_CLASS_NAME;
+import static datadog.trace.api.config.TraceInstrumentationConfig.JDBC_METADATA_FETCHING_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.JDBC_POOL_WAITING_ENABLED;
 import static datadog.trace.api.config.TraceInstrumentationConfig.JDBC_PREPARED_STATEMENT_CLASS_NAME;
 import static datadog.trace.api.config.TraceInstrumentationConfig.MEASURE_METHODS;
@@ -132,6 +134,8 @@ public class InstrumenterConfig {
   private final String jdbcPreparedStatementClassName;
   private final String jdbcConnectionClassName;
   private final boolean jdbcPoolWaitingEnabled;
+  private final boolean jdbcMetadataFetchingEnabled;
+  private final boolean jdbcClientInfoFetchingEnabled;
 
   private final String httpURLConnectionClassName;
   private final String axisTransportClassName;
@@ -245,6 +249,9 @@ private InstrumenterConfig() {
         configProvider.getString(JDBC_PREPARED_STATEMENT_CLASS_NAME, "");
     jdbcConnectionClassName = configProvider.getString(JDBC_CONNECTION_CLASS_NAME, "");
     jdbcPoolWaitingEnabled = configProvider.getBoolean(JDBC_POOL_WAITING_ENABLED, false);
+    jdbcMetadataFetchingEnabled = configProvider.getBoolean(JDBC_METADATA_FETCHING_ENABLED, true);
+    jdbcClientInfoFetchingEnabled =
+        configProvider.getBoolean(JDBC_CLIENT_INFO_FETCHING_ENABLED, true);
 
     httpURLConnectionClassName = configProvider.getString(HTTP_URL_CONNECTION_CLASS_NAME, "");
     axisTransportClassName = configProvider.getString(AXIS_TRANSPORT_CLASS_NAME, "");
@@ -425,6 +432,14 @@ public boolean isJdbcPoolWaitingEnabled() {
     return jdbcPoolWaitingEnabled;
   }
 
+  public boolean isJdbcMetadataFetchingEnabled() {
+    return jdbcMetadataFetchingEnabled;
+  }
+
+  public boolean isJdbcClientInfoFetchingEnabled() {
+    return jdbcClientInfoFetchingEnabled;
+  }
+
   public String getHttpURLConnectionClassName() {
     return httpURLConnectionClassName;
   }
@@ -636,6 +651,10 @@ public String toString() {
         + '\''
         + ", jdbcPoolWaitingEnabled="
         + jdbcPoolWaitingEnabled
+        + ", jdbcMetadataFetchingEnabled="
+        + jdbcMetadataFetchingEnabled
+        + ", jdbcClientInfoFetchingEnabled="
+        + jdbcClientInfoFetchingEnabled
         + ", httpURLConnectionClassName='"
         + httpURLConnectionClassName
         + '\''