Fixes for diagnostics tests (#2016)

microsoft · Dec 23, 2022 · 0780337 · 0780337
1 parent 8f5f9da
commit 0780337
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 22 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerCallableStatement.java
@@ -73,12 +73,6 @@ public class SQLServerCallableStatement extends SQLServerPreparedStatement imple
     /** Currently active Stream Note only one stream can be active at a time */
     private transient Closeable activeStream;
 
-    // Internal function used in tracing
-    @Override
-    String getClassNameInternal() {
-        return "SQLServerCallableStatement";
-    }
-
     /** map */
     private Map<String, Integer> map = new ConcurrentHashMap<>();
 

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerPreparedStatement.java
@@ -60,11 +60,6 @@ public class SQLServerPreparedStatement extends SQLServerStatement implements IS
     private static final String EXECUTE_BATCH_STRING = "executeBatch";
     private static final String ACTIVITY_ID = " ActivityId: ";
 
-    /**
-     * internal class name used in tracing
-     */
-    private static final String INTERNAL_CLASSNAME = "SQLServerPreparedStatement";
-
     /** batch statement delimiter */
     final int nBatchStatementDelimiter = BATCH_STATEMENT_DELIMITER_TDS_72;
 
@@ -206,11 +201,6 @@ private boolean resetPrepStmtHandle(boolean discardCurrentCacheItem) {
      */
     private Vector<CryptoMetadata> cryptoMetaBatch = new Vector<>();
 
-    // Internal function used in tracing
-    String getClassNameInternal() {
-        return INTERNAL_CLASSNAME;
-    }
-
     /**
      * Constructs a SQLServerPreparedStatement.
      * 

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerStatement.java
@@ -329,11 +329,6 @@ void decrResultSetCount() {
     static final int EXECUTE_BATCH = 4;
     static final int EXECUTE_QUERY_INTERNAL = 5;
 
-    /**
-     * internal class name used in tracing
-     */
-    private static final String INTERNAL_CLASSNAME = "SQLServerStatement";
-
     /** execute method */
     int executeMethod = EXECUTE_NOT_SET;
 
@@ -555,7 +550,7 @@ private static int nextStatementID() {
         // (e.g. "SQLServerStatement" or "SQLServerPreparedStatement"),
         // its unique ID, and its parent connection.
         int statementID = nextStatementID();
-        String classN = INTERNAL_CLASSNAME;
+        String classN = getClass().getSimpleName();
         traceID = classN + ":" + statementID;
 
         /** logging classname */