move logic to jdbc + structure a singleton

Author: BentsiLeviav

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java

@@ -53,7 +53,6 @@ public abstract class ClickHouseHttpConnection implements AutoCloseable {
     private static final byte[] SUFFIX_FORMAT = "_format\"\r\n\r\n".getBytes(StandardCharsets.US_ASCII);
     private static final byte[] SUFFIX_STRUCTURE = "_structure\"\r\n\r\n".getBytes(StandardCharsets.US_ASCII);
     private static final byte[] SUFFIX_FILENAME = "\"; filename=\"".getBytes(StandardCharsets.US_ASCII);
-    private static final List<String> FRAMEWORKS_TO_INFER = List.of("apache.spark");
 
     private static StringBuilder appendQueryParameter(StringBuilder builder, String key, String value) {
         return builder.append(urlEncode(key, StandardCharsets.UTF_8)).append('=')
@@ -411,22 +410,10 @@ protected String getDefaultUserAgent() {
         return config.getClientName();
     }
 
-    protected String getAdditionalFrameworkUserAgent() {
-        Set<String> inferredFrameworks = new LinkedHashSet<>();
-        for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
-            for (String framework : FRAMEWORKS_TO_INFER) {
-                if (ste.toString().contains(framework)) {
-                    inferredFrameworks.add(String.format("(%s)", framework));
-                }
-            }
-        }
-        return String.join("; ", inferredFrameworks);
-    }
-
     protected final String getUserAgent() {
         final ClickHouseConfig c = config;
         String name = c.getClientName();
-        String userAgent = getDefaultUserAgent() + getAdditionalFrameworkUserAgent();
+        String userAgent = getDefaultUserAgent();
 
         if (!ClickHouseClientOption.CLIENT_NAME.getDefaultValue().equals(name)) {
             return name + " " + userAgent;

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

@@ -6,14 +6,7 @@
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.ServiceLoader;
+import java.util.*;
 import java.util.Map.Entry;
 
 import com.clickhouse.client.ClickHouseClient;
@@ -49,6 +42,32 @@ public class ClickHouseDriver implements Driver {
 
     static final java.util.logging.Logger parentLogger = java.util.logging.Logger.getLogger("com.clickhouse.jdbc");
 
+    static String frameworksDetected = null;
+
+    private static class FrameworksDetection {
+        private static final List<String> FRAMEWORKS_TO_DETECT = List.of("apache.spark");
+        static volatile String frameworksDetected = null;
+
+        private FrameworksDetection() {
+        }
+        public static String getFrameworksDetected() {
+            if (frameworksDetected == null) {
+                Set<String> inferredFrameworks = new LinkedHashSet<>();
+                for (StackTraceElement ste : Thread.currentThread().getStackTrace()) {
+                    for (String framework : FRAMEWORKS_TO_DETECT) {
+                        if (ste.toString().contains(framework)) {
+                            inferredFrameworks.add(String.format("(%s)", framework));
+                        }
+                    }
+                }
+
+                frameworksDetected = String.join("; ", inferredFrameworks);
+            }
+            return frameworksDetected;
+        }
+
+    }
+
     static {
         String str = ClickHouseDriver.class.getPackage().getImplementationVersion();
         if (str != null && !str.isEmpty()) {
@@ -115,7 +134,8 @@ 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;
     }
 
@@ -128,7 +148,7 @@ private DriverPropertyInfo create(ClickHouseOption option, Properties props) {
 
         Class<?> clazz = option.getValueType();
         if (Boolean.class == clazz || boolean.class == clazz) {
-            propInfo.choices = new String[] { "true", "false" };
+            propInfo.choices = new String[]{"true", "false"};
         } else if (clazz.isEnum()) {
             Object[] values = clazz.getEnumConstants();
             String[] names = new String[values.length];
@@ -152,6 +172,8 @@ 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);