feedback

Author: trask

instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/PreparedStatementInstrumentation.java

@@ -156,7 +156,7 @@ public static void onExit(
       String str = null;
 
       if (value instanceof Boolean
-          // Short, Int, Long, Float, Double, BigDecimal
+          // Byte, Short, Int, Long, Float, Double, BigDecimal
           || value instanceof Number
           || value instanceof String
           || value instanceof Date
@@ -191,7 +191,7 @@ public static void onExit(
       String str = null;
 
       if (value instanceof Boolean
-          // Short, Int, Long, Float, Double, BigDecimal
+          // Byte, Short, Int, Long, Float, Double, BigDecimal
           || value instanceof Number
           || value instanceof String
           || value instanceof Date

instrumentation/jdbc/library/src/main/java/io/opentelemetry/instrumentation/jdbc/internal/OpenTelemetryPreparedStatement.java

@@ -71,6 +71,28 @@ private void putParameter(int index, Object value) {
     }
   }
 
+  private void putParameterIfRecognizedType(int index, Object value) {
+    if (this.captureQueryParameters && value != null) {
+      String str = null;
+
+      if (value instanceof Boolean
+          // Byte, Short, Int, Long, Float, Double, BigDecimal
+          || value instanceof Number
+          || value instanceof String
+          || value instanceof Date
+          || value instanceof Time
+          || value instanceof Timestamp
+          || value instanceof URL
+          || value instanceof RowId) {
+        str = value.toString();
+      }
+
+      if (str != null) {
+        parameters.put(Integer.toString(index - 1), str);
+      }
+    }
+  }
+
   @Override
   public ResultSet executeQuery() throws SQLException {
     return OpenTelemetryResultSet.wrap(wrapCall(query, delegate::executeQuery), this);
@@ -244,14 +266,14 @@ public void setBinaryStream(int parameterIndex, InputStream x) throws SQLExcepti
   @Override
   public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
     delegate.setObject(parameterIndex, x, targetSqlType);
-    putParameter(parameterIndex, x);
+    putParameterIfRecognizedType(parameterIndex, x);
   }
 
   @SuppressWarnings("UngroupedOverloads")
   @Override
   public void setObject(int parameterIndex, Object x) throws SQLException {
     delegate.setObject(parameterIndex, x);
-    putParameter(parameterIndex, x);
+    putParameterIfRecognizedType(parameterIndex, x);
   }
 
   @Override