Merge pull request #146 from DataDog/tyler/null-handling

Better null handling for JDBC instrumentation

Author: tylerbenson

dd-java-agent/src/main/java/com/datadoghq/agent/TracingAgent.java

@@ -109,7 +109,7 @@ public void onError(
         final JavaModule module,
         final boolean loaded,
         final Throwable throwable) {
-      log.warn("Failed to handle " + typeName + " for transformation", throwable);
+      log.debug("Failed to handle " + typeName + " for transformation: " + throwable.getMessage());
     }
 
     @Override

dd-java-agent/src/main/java/com/datadoghq/agent/instrumentation/jdbc/DriverInstrumentation.java

@@ -38,16 +38,19 @@ public static void addDBInfo(
         @Advice.Argument(0) final String url,
         @Advice.Argument(1) final Properties info,
         @Advice.Return final Connection connection) {
-      // Remove end of url to prevent passwords from leaking:
-      final String sanitizedURL = url.replaceAll("[?;].*", "");
-      final String type = url.split(":")[1];
-      final String dbUser = info == null ? null : info.getProperty("user");
-      connectionInfo.put(connection, new DBInfo(sanitizedURL, type, dbUser));
+      if (url != null) {
+        // Remove end of url to prevent passwords from leaking:
+        final String sanitizedURL = url.replaceAll("[?;].*", "");
+        final String type = url.split(":")[1];
+        final String dbUser = info == null ? null : info.getProperty("user");
+        connectionInfo.put(connection, new DBInfo(sanitizedURL, type, dbUser));
+      }
     }
   }
 
   @Data
   public static class DBInfo {
+    public static DBInfo UNKNOWN = new DBInfo("null", "unknown", null);
     private final String url;
     private final String type;
     private final String user;

dd-java-agent/src/main/java/com/datadoghq/agent/instrumentation/jdbc/PreparedStatementInstrumentation.java

@@ -49,8 +49,10 @@ public static ActiveSpan startSpan(@Advice.This final PreparedStatement statemen
         return NoopActiveSpanSource.NoopActiveSpan.INSTANCE;
       }
 
-      final DriverInstrumentation.DBInfo dbInfo =
-          DriverInstrumentation.connectionInfo.get(connection);
+      DriverInstrumentation.DBInfo dbInfo = DriverInstrumentation.connectionInfo.get(connection);
+      if (dbInfo == null) {
+        dbInfo = DriverInstrumentation.DBInfo.UNKNOWN;
+      }
 
       final ActiveSpan span =
           GlobalTracer.get().buildSpan(dbInfo.getType() + ".query").startActive();

dd-java-agent/src/main/java/com/datadoghq/agent/instrumentation/jdbc/StatementInstrumentation.java

@@ -49,8 +49,10 @@ public static ActiveSpan startSpan(
         return NoopActiveSpanSource.NoopActiveSpan.INSTANCE;
       }
 
-      final DriverInstrumentation.DBInfo dbInfo =
-          DriverInstrumentation.connectionInfo.get(connection);
+      DriverInstrumentation.DBInfo dbInfo = DriverInstrumentation.connectionInfo.get(connection);
+      if (dbInfo == null) {
+        dbInfo = DriverInstrumentation.DBInfo.UNKNOWN;
+      }
 
       final ActiveSpan span =
           GlobalTracer.get().buildSpan(dbInfo.getType() + ".query").startActive();