Fix java.sqlTypes and setObject tests

Author: garethedwards-tass

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

@@ -96,7 +96,7 @@ public void transform(TypeTransformer transformer) {
             .and(takesArgument(2, int.class))
             .and(takesArguments(3))
             .and(isPublic()),
-        PreparedStatementInstrumentation.class.getName() + "$SetParameter2Advice");
+        PreparedStatementInstrumentation.class.getName() + "$SetParameter3Advice");
     transformer.applyAdviceToMethod(
         named("clearParameters").and(takesNoArguments()).and(isPublic()),
         PreparedStatementInstrumentation.class.getName() + "$ClearParametersAdvice");
@@ -200,6 +200,38 @@ public static void onExit(
     }
   }
 
+  @SuppressWarnings("unused")
+  public static class SetParameter3Advice {
+    @Advice.OnMethodExit(suppress = Throwable.class)
+    public static void onExit(
+        @Advice.This PreparedStatement statement,
+        @Advice.Argument(0) int index,
+        @Advice.Argument(1) Object value,
+        @Advice.Argument(2) int targetSqlType) {
+      if (!CAPTURE_QUERY_PARAMETERS) {
+        return;
+      }
+
+      String str = null;
+
+      if (value instanceof Boolean
+          // 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);
+      }
+    }
+  }
+
   @SuppressWarnings("unused")
   public static class SetTimeParameter3Advice {
     @Advice.OnMethodExit(suppress = Throwable.class)

instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/PreparedStatementParametersTest.java

@@ -28,7 +28,7 @@
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.Date;
-import java.sql.JDBCType;
+import java.sql.Types;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -353,7 +353,7 @@ void testObjectWithTypePreparedStatementParameter(
         spanName,
         url,
         table,
-        statement -> statement.setObject(1, "S", JDBCType.CHAR),
+        statement -> statement.setObject(1, "S", Types.CHAR),
         "S");
   }