made micrometer optional

Author: chernser

client-v2/pom.xml

@@ -78,6 +78,8 @@
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-core</artifactId>
             <version>1.14.3</version>
+            <optional>true</optional>
+            <scope>compile</scope>
         </dependency>
 
 
@@ -141,12 +143,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-observation</artifactId>
-            <version>1.14.3</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -203,6 +199,11 @@
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                             <createSourcesJar>true</createSourcesJar>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <artifactSet>
+                                <excludes>
+                                    <exclude>io.micrometer:*</exclude>
+                                </excludes>
+                            </artifactSet>
                             <relocations>
                                 <relocation>
                                     <pattern>org.slf4j</pattern>

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

@@ -39,7 +39,6 @@
 import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseFormat;
-import io.micrometer.core.instrument.MeterRegistry;
 import org.apache.hc.core5.concurrent.DefaultThreadFactory;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.HttpHeaders;
@@ -954,19 +953,15 @@ public Builder useBearerTokenAuth(String bearerToken) {
         }
 
         /**
-         * Registers http client metrics with MeterRegistry. 
+         * Registers http client metrics with MeterRegistry.
          *
          * @param registry - metrics registry
          * @param name - name of metrics group
          * @return same instance of the builder
          */
         public Builder registerClientMetrics(Object registry, String name) {
-            if (registry instanceof MeterRegistry) {
-                this.metric = registry;
-                this.configuration.put(ClientConfigProperties.METRICS_GROUP_NAME.getKey(), name);
-            } else {
-                throw new IllegalArgumentException("Unsupported registry type." + registry.getClass());
-            }
+            this.metric = registry;
+            this.configuration.put(ClientConfigProperties.METRICS_GROUP_NAME.getKey(), name);
             return this;
         }
 

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

@@ -13,8 +13,6 @@
 import com.clickhouse.client.api.data_formats.internal.SerializerUtils;
 import com.clickhouse.client.api.enums.ProxyType;
 import com.clickhouse.client.api.http.ClickHouseHttpProto;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.binder.httpcomponents.hc5.PoolingHttpClientConnectionManagerMetricsBinder;
 import org.apache.hc.client5.http.ConnectTimeoutException;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.config.ConnectionConfig;
@@ -60,6 +58,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Method;
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.NoRouteToHostException;
@@ -97,10 +96,10 @@ public class HttpAPIClientHelper {
     private final Set<ClientFaultCause> defaultRetryCauses;
 
     private String defaultUserAgent;
-    private Object metric;
-    public HttpAPIClientHelper(Map<String, String> configuration, Object metric) {
+    private Object metricsRegistry;
+    public HttpAPIClientHelper(Map<String, String> configuration, Object metricsRegistry) {
         this.chConfiguration = configuration;
-        this.metric = metric;
+        this.metricsRegistry = metricsRegistry;
         this.httpClient = createHttpClient();
 
         RequestConfig.Builder reqConfBuilder = RequestConfig.custom();
@@ -225,9 +224,16 @@ private HttpClientConnectionManager poolConnectionManager(SSLContext sslContext,
         connMgrBuilder.setSSLSocketFactory(new SSLConnectionSocketFactory(sslContext));
         connMgrBuilder.setDefaultSocketConfig(socketConfig);
         PoolingHttpClientConnectionManager phccm = connMgrBuilder.build();
-        if (metric != null && metric instanceof MeterRegistry) {
-            String name = chConfiguration.getOrDefault(ClientConfigProperties.METRICS_GROUP_NAME.getKey(), "http-pool");
-            new PoolingHttpClientConnectionManagerMetricsBinder(phccm, name).bindTo((MeterRegistry) metric);
+        if (metricsRegistry != null ) {
+            try {
+                String mGroupName = chConfiguration.getOrDefault(ClientConfigProperties.METRICS_GROUP_NAME.getKey(),
+                        "ch-http-pool");
+                Class<?> micrometerLoader = getClass().getClassLoader().loadClass("com.clickhouse.client.api.metrics.MicrometerLoader");
+                Method applyMethod = micrometerLoader.getDeclaredMethod("applyPoolingMetricsBinder", Object.class, String.class, PoolingHttpClientConnectionManager.class);
+                applyMethod.invoke(micrometerLoader, metricsRegistry, mGroupName, phccm);
+            } catch (Exception e) {
+                LOG.error("Failed to register metrics", e);
+            }
         }
         return phccm;
     }

client-v2/src/main/java/com/clickhouse/client/api/metrics/MicrometerLoader.java

@@ -0,0 +1,17 @@
+package com.clickhouse.client.api.metrics;
+
+import com.clickhouse.client.api.ClientMisconfigurationException;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.httpcomponents.hc5.PoolingHttpClientConnectionManagerMetricsBinder;
+import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
+
+public class MicrometerLoader {
+
+    public static void applyPoolingMetricsBinder(Object registry, String metricsGroupName, PoolingHttpClientConnectionManager phccm) {
+        if (registry instanceof MeterRegistry) {
+            new PoolingHttpClientConnectionManagerMetricsBinder(phccm, metricsGroupName).bindTo((MeterRegistry) registry);
+        } else {
+            throw new ClientMisconfigurationException("Unsupported registry type." + registry.getClass());
+        }
+    }
+}

examples/client-v2/src/main/java/com/clickhouse/examples/client_v2/Stream2DbWriter.java

@@ -34,6 +34,7 @@ public Stream2DbWriter(String endpoint, String user, String password, String dat
                 .setUsername(user)
                 .setPassword(password)
                 .compressServerResponse(true)
+                .registerClientMetrics("test not a registry", "test")
                 .setDefaultDatabase(database);
 
         this.client = clientBuilder.build();