more

Author: trask

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

@@ -130,7 +130,7 @@ public static void addDbInfo(
       }
 
       String originalSql = prepareContext.get();
-      JdbcData.preparedStatement.set(statement, originalSql);
+      JdbcData.PREPARED_STATEMENT.set(statement, originalSql);
     }
   }
 

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

@@ -58,7 +58,7 @@ public static void addDbInfo(
         return;
       }
       DbInfo dbInfo = JdbcConnectionUrlParser.parse(url, props);
-      JdbcData.connectionInfo.set(connection, JdbcData.intern(dbInfo));
+      JdbcData.CONNECTION_INFO.set(connection, JdbcData.intern(dbInfo));
     }
   }
 }

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

@@ -76,7 +76,7 @@ private static JdbcAdviceScope start(CallDepth callDepth, Supplier<DbRequest> re
 
   private static DbRequest createBatchRequest(Statement statement) {
     if (statement instanceof PreparedStatement) {
-      String sql = JdbcData.preparedStatement.get((PreparedStatement) statement);
+      String sql = JdbcData.PREPARED_STATEMENT.get((PreparedStatement) statement);
       if (sql == null) {
         return null;
       }

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

@@ -106,7 +106,7 @@ public static class PreparedStatementAdvice {
     public static JdbcAdviceScope onEnter(@Advice.This PreparedStatement statement) {
       // skip prepared statements without attached sql, probably a wrapper around the actual
       // prepared statement
-      if (JdbcData.preparedStatement.get(statement) == null) {
+      if (JdbcData.PREPARED_STATEMENT.get(statement) == null) {
         return null;
       }
       if (JdbcSingletons.isWrapper(statement, PreparedStatement.class)) {

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

@@ -32,7 +32,7 @@ public static DbRequest create(
       PreparedStatement statement, Map<String, String> preparedStatementParameters) {
     return create(
         statement,
-        JdbcData.preparedStatement.get(statement),
+        JdbcData.PREPARED_STATEMENT.get(statement),
         null,
         preparedStatementParameters,
         true);

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

@@ -29,9 +29,9 @@
 public final class JdbcData {
 
   private static final Map<DbInfo, WeakReference<DbInfo>> dbInfos = new WeakHashMap<>();
-  public static final VirtualField<Connection, DbInfo> connectionInfo =
+  public static final VirtualField<Connection, DbInfo> CONNECTION_INFO =
       VirtualField.find(Connection.class, DbInfo.class);
-  public static final VirtualField<PreparedStatement, String> preparedStatement =
+  public static final VirtualField<PreparedStatement, String> PREPARED_STATEMENT =
       VirtualField.find(PreparedStatement.class, String.class);
   private static final VirtualField<Statement, StatementBatchInfo> statementBatch =
       VirtualField.find(Statement.class, StatementBatchInfo.class);
@@ -106,7 +106,7 @@ public static void close(Statement statement) {
     statementBatch.set(statement, null);
     if (statement instanceof PreparedStatement) {
       PreparedStatement prepared = (PreparedStatement) statement;
-      preparedStatement.set(prepared, null);
+      PREPARED_STATEMENT.set(prepared, null);
       preparedStatementBatch.set(prepared, null);
       parameters.set(prepared, null);
     }

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

@@ -84,10 +84,10 @@ public static DbInfo extractDbInfo(Connection connection) {
     // lock, and computeDbInfo() calls back to the application code via Connection.getMetaData()
     // which could then result in a deadlock
     // (e.g. https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/4188)
-    DbInfo dbInfo = JdbcData.connectionInfo.get(connection);
+    DbInfo dbInfo = JdbcData.CONNECTION_INFO.get(connection);
     if (dbInfo == null) {
       dbInfo = computeDbInfo(connection);
-      JdbcData.connectionInfo.set(connection, JdbcData.intern(dbInfo));
+      JdbcData.CONNECTION_INFO.set(connection, JdbcData.intern(dbInfo));
     }
     return dbInfo;
   }