move initiation and feature flag check to ConnImpl

Author: BentsiLeviav

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDriver.java

@@ -42,9 +42,9 @@ public class ClickHouseDriver implements Driver {
 
     static final java.util.logging.Logger parentLogger = java.util.logging.Logger.getLogger("com.clickhouse.jdbc");
 
-    static String frameworksDetected = null;
+    public static String frameworksDetected = null;
 
-    private static class FrameworksDetection {
+    public static class FrameworksDetection {
         private static final List<String> FRAMEWORKS_TO_DETECT = List.of("apache.spark");
         static volatile String frameworksDetected = null;
 
@@ -134,8 +134,6 @@ public static Map<ClickHouseOption, Serializable> toClientOptions(Properties pro
                 options.put(o, ClickHouseOption.fromString(e.getValue().toString(), o.getValueType()));
             }
         }
-        if (frameworksDetected != null)
-            options.put(ClickHouseClientOption.PRODUCT_NAME, frameworksDetected);
         return options;
     }
 
@@ -172,8 +170,6 @@ public ClickHouseConnection connect(String url, Properties info) throws SQLExcep
         if (!acceptsURL(url)) {
             return null;
         }
-        if (!url.toLowerCase().contains("disable-frameworks-detection"))
-            frameworksDetected = FrameworksDetection.getFrameworksDetected();
 
         log.debug("Creating connection");
         return new ClickHouseConnectionImpl(url, info);

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java

@@ -291,7 +291,11 @@ public ClickHouseConnectionImpl(String url, Properties properties) throws SQLExc
     public ClickHouseConnectionImpl(ConnectionInfo connInfo) throws SQLException {
         Properties props = connInfo.getProperties();
         jvmTimeZone = TimeZone.getDefault();
-
+        if (props.get("disable_frameworks_detection") == null || !props.get("disable_frameworks_detection").toString().equalsIgnoreCase("true")) {
+            ClickHouseDriver.frameworksDetected = ClickHouseDriver.FrameworksDetection.getFrameworksDetected();
+            if (ClickHouseDriver.frameworksDetected != null)
+                props.setProperty(ClickHouseClientOption.PRODUCT_NAME.getKey(), props.getProperty(ClickHouseClientOption.PRODUCT_NAME.getKey()) + ClickHouseDriver.frameworksDetected);
+        }
         ClickHouseClientBuilder clientBuilder = ClickHouseClient.builder()
                 .options(ClickHouseDriver.toClientOptions(props))
                 .defaultCredentials(connInfo.getDefaultCredentials());