Clear virtual fields from jdbc statement when the statement is closed (#13767)

Author: laurit

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

@@ -55,6 +55,9 @@ public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(
         namedOneOf("executeBatch", "executeLargeBatch").and(takesNoArguments()).and(isPublic()),
         StatementInstrumentation.class.getName() + "$ExecuteBatchAdvice");
+    transformer.applyAdviceToMethod(
+        named("close").and(isPublic()).and(takesNoArguments()),
+        StatementInstrumentation.class.getName() + "$CloseAdvice");
   }
 
   @SuppressWarnings("unused")
@@ -195,4 +198,13 @@ public static void stopSpan(
       }
     }
   }
+
+  @SuppressWarnings("unused")
+  public static class CloseAdvice {
+
+    @Advice.OnMethodEnter(suppress = Throwable.class)
+    public static void closeStatement(@Advice.This Statement statement) {
+      JdbcData.close(statement);
+    }
+  }
 }

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

@@ -95,6 +95,17 @@ public static Long getPreparedStatementBatchSize(PreparedStatement statement) {
     return batchInfo != null ? batchInfo.getBatchSize() : null;
   }
 
+  public static void close(Statement statement) {
+    // when statement is closed remove all of our virtual fields in case the JDBC driver reuses the
+    // same statement instance for a subsequent query
+    statementBatch.set(statement, null);
+    if (statement instanceof PreparedStatement) {
+      PreparedStatement prepared = (PreparedStatement) statement;
+      preparedStatement.set(prepared, null);
+      preparedStatementBatch.set(prepared, null);
+    }
+  }
+
   /**
    * This class is internal and is hence not for public use. Its APIs are unstable and can change at
    * any time.

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

@@ -116,6 +116,7 @@ public int[] executeBatch() throws SQLException {
 
   @Override
   public void close() throws SQLException {
+    JdbcData.close(this);
     delegate.close();
   }