Add JDBC_JAR_NAME to client environment (#1547)

* Add JDBC_JAR_NAME to client environment * formatting issues
snowflakedb · Oct 27, 2023 · a9784a9 · a9784a9
1 parent 9fbaa7a
commit a9784a9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/net/snowflake/client/core/SessionUtil.java b/src/main/java/net/snowflake/client/core/SessionUtil.java
@@ -555,6 +555,8 @@ private static SFLoginOutput newSession(
         clientEnv.put(SFSessionProperty.TRACING.getPropertyKey(), tracingLevel);
       }
 
+      clientEnv.put("JDBC_JAR_NAME", SnowflakeDriver.getJdbcJarname());
+
       data.put(ClientAuthnParameter.CLIENT_ENVIRONMENT.name(), clientEnv);
 
       // Initialize the session parameters

diff --git a/src/main/java/net/snowflake/client/jdbc/DefaultSFConnectionHandler.java b/src/main/java/net/snowflake/client/jdbc/DefaultSFConnectionHandler.java
@@ -107,9 +107,7 @@ protected void initialize(SnowflakeConnectString conStr, String appID, String ap
       setClientConfig();
       initLogger();
       logger.debug(
-          "Trying to establish session, JDBC driver version: {} : {}",
-          SnowflakeDriver.getImplementationTitle(),
-          SnowflakeDriver.implementVersion);
+          "Trying to establish session, JDBC driver: {}", SnowflakeDriver.getJdbcJarname());
       if (!skipOpen) {
         sfSession.open();
       }

diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
@@ -155,6 +155,15 @@ public static String getImplementationTitle() {
     return pkg.getImplementationTitle();
   }
 
+  /**
+   * Utility method to get the complete jar name with version.
+   *
+   * @return
+   */
+  public static String getJdbcJarname() {
+    return String.format("%s-%s", getImplementationTitle(), implementVersion);
+  }
+
   /**
    * Checks whether a given url is in a valid format.
    *