renamed client name prefix

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -26,6 +26,7 @@
 import com.clickhouse.client.api.internal.ClickHouseLZ4OutputStream;
 import com.clickhouse.client.api.internal.ClientStatisticsHolder;
 import com.clickhouse.client.api.internal.ClientV1AdaptorHelper;
+import com.clickhouse.client.api.internal.EnvUtils;
 import com.clickhouse.client.api.internal.HttpAPIClientHelper;
 import com.clickhouse.client.api.internal.MapUtils;
 import com.clickhouse.client.api.internal.SettingsConverter;
@@ -901,7 +902,7 @@ public Builder useHTTPBasicAuth(boolean useBasicAuth) {
          * @return same instance of the builder
          */
         public Builder setClientName(String clientName) {
-            this.configuration.put(ClientSettings.CLIENT_NAME, clientName);
+            this.configuration.put(ClientConfigProperties.CLIENT_NAME.getKey(), clientName);
             return this;
         }
 
@@ -1044,8 +1045,8 @@ private void setDefaults() {
                 useHTTPBasicAuth(true);
             }
 
-            String userAgent = configuration.getOrDefault(ClientSettings.HTTP_HEADER_PREFIX + HttpHeaders.USER_AGENT.toUpperCase(Locale.US), "");
-            String clientName = configuration.getOrDefault(ClientSettings.CLIENT_NAME, "");
+            String userAgent = configuration.getOrDefault(ClientConfigProperties.HTTP_HEADER_PREFIX + HttpHeaders.USER_AGENT.toUpperCase(Locale.US), "");
+            String clientName = configuration.getOrDefault(ClientConfigProperties.CLIENT_NAME.getKey(), "");
             httpHeader(HttpHeaders.USER_AGENT, buildUserAgent(userAgent.isEmpty() ? clientName : userAgent));
         }
 
@@ -1077,7 +1078,7 @@ private static String buildUserAgent(String customUserAgent) {
         }
 
         public static final String LATEST_ARTIFACT_VERSION = "0.7.1-patch1";
-        public static final String CLIENT_USER_AGENT = "ch-j-v2/";
+        public static final String CLIENT_USER_AGENT = "clickhouse-java-v2/";
     }
 
     private ClickHouseNode getServerNode() {

client-v2/src/main/java/com/clickhouse/client/api/ClientConfigProperties.java

@@ -112,7 +112,9 @@ public enum ClientConfigProperties {
 
     CONNECTION_REQUEST_TIMEOUT("connection_request_timeout"),
 
-    CLIENT_RETRY_ON_FAILURE("client_retry_on_failures");
+    CLIENT_RETRY_ON_FAILURE("client_retry_on_failures"),
+
+    CLIENT_NAME("client_name");
 
     private String key;
 

client-v2/src/main/java/com/clickhouse/client/api/internal/EnvUtils.java

@@ -0,0 +1,34 @@
+package com.clickhouse.client.api.internal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.NetworkInterface;
+
+/**
+ * Environment utility class.
+ */
+public class EnvUtils {
+
+    private static final Logger LOG = LoggerFactory.getLogger(EnvUtils.class);
+
+    /**
+     * Returns the local host name or address.
+     * @param returnAddress if true, return address; otherwise, return name
+     * @return string representing the local host name or address
+     */
+    public static String getLocalhostNameOrAddress(final boolean returnAddress) {
+        try {
+
+            return NetworkInterface.networkInterfaces()
+                    .flatMap(NetworkInterface::inetAddresses)
+                    .filter(ia -> !ia.isLoopbackAddress())
+                    .findFirst()
+                    .map(ia -> returnAddress ? ia.getHostAddress() : ia.getCanonicalHostName())
+                    .orElse("");
+        } catch (Exception e) {
+            LOG.error("Failed to get local host name or address", e);
+        }
+        return "";
+    }
+}

client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java

@@ -790,8 +790,8 @@ public void testUserAgentHasCompleteProductName(String clientName, Pattern userA
     @DataProvider(name = "testUserAgentHasCompleteProductName_dataProvider")
     public static Object[][] testUserAgentHasCompleteProductName_dataProvider() {
         return new Object[][] {
-                { "", Pattern.compile("ch-j-v2\\/.+ \\(.+\\) Apache HttpClient\\/[\\d\\.]+$") },
-                { "test-client/1.0", Pattern.compile("test-client/1.0 ch-j-v2\\/.+ \\(.+\\) Apache HttpClient\\/[\\d\\.]+$")},
-                { "test-client/", Pattern.compile("test-client/ ch-j-v2\\/.+ \\(.+\\) Apache HttpClient\\/[\\d\\.]+$")}};
+                { "", Pattern.compile("clickhouse-java-v2\\/.+ \\(.+\\) Apache HttpClient\\/[\\d\\.]+$") },
+                { "test-client/1.0", Pattern.compile("test-client/1.0 clickhouse-java-v2\\/.+ \\(.+\\) Apache HttpClient\\/[\\d\\.]+$")},
+                { "test-client/", Pattern.compile("test-client/ clickhouse-java-v2\\/.+ \\(.+\\) Apache HttpClient\\/[\\d\\.]+$")}};
     }
 }