[jdbc] Capture custom object types in prepared statement parameter instrumentation

Previously, setObject() calls with custom types (e.g. ORM-managed ID
classes) were silently dropped because the instrumentation only captured
a hardcoded whitelist of known JDBC types. Any class not in the list
produced no parameter attribute at all, indistinguishable from a
parameter that was never set.

Author: CodingFabian

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

@@ -21,13 +21,8 @@
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import java.net.URL;
-import java.sql.Date;
 import java.sql.PreparedStatement;
-import java.sql.RowId;
 import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
 import java.util.Calendar;
 import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
@@ -168,22 +163,8 @@ public static void onExit(
         return;
       }
 
-      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) {
-        JdbcData.addParameter(statement, Integer.toString(index - 1), str);
+      if (value != null) {
+        JdbcData.addParameter(statement, Integer.toString(index - 1), value.toString());
       }
     }
   }
@@ -207,22 +188,8 @@ public static void onExit(
         return;
       }
 
-      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) {
-        JdbcData.addParameter(statement, Integer.toString(index - 1), str);
+      if (value != null) {
+        JdbcData.addParameter(statement, Integer.toString(index - 1), value.toString());
       }
     }
   }
@@ -246,14 +213,8 @@ public static void onExit(
         return;
       }
 
-      String str = null;
-
-      if (value instanceof Date || value instanceof Time || value instanceof Timestamp) {
-        str = value.toString();
-      }
-
-      if (str != null) {
-        JdbcData.addParameter(statement, Integer.toString(index - 1), str);
+      if (value != null) {
+        JdbcData.addParameter(statement, Integer.toString(index - 1), value.toString());
       }
     }
   }

instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/testing/AbstractPreparedStatementParametersTest.java

@@ -26,6 +26,7 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.Date;
@@ -374,6 +375,31 @@ void testObjectPreparedStatementParameter(
         "S");
   }
 
+  @ParameterizedTest
+  @MethodSource("preparedStatementStream")
+  void testCustomObjectPreparedStatementParameter(
+      String system,
+      Connection connection,
+      String username,
+      String query,
+      String sanitizedQuery,
+      String spanName,
+      String url,
+      String table)
+      throws SQLException {
+    test(
+        system,
+        connection,
+        username,
+        query,
+        sanitizedQuery,
+        spanName,
+        url,
+        table,
+        statement -> statement.setObject(1, new IdType()),
+        "id");
+  }
+
   @ParameterizedTest
   @MethodSource("preparedStatementStream")
   void testObjectWithTypePreparedStatementParameter(
@@ -658,6 +684,13 @@ DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
                                     expectedParameterValue))));
   }
 
+  private static class IdType implements Serializable {
+    @Override
+    public String toString() {
+      return "id";
+    }
+  }
+
   private interface ThrowingConsumer<T, E extends Throwable> {
     void accept(T t) throws E;
   }