added more test assertions. fixed tests for CI

Author: chernser

client-v2/pom.xml

@@ -141,7 +141,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-observation -->
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-observation</artifactId>

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

@@ -40,13 +40,10 @@
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseFormat;
 import io.micrometer.core.instrument.MeterRegistry;
-import org.apache.hc.client5.http.ConnectTimeoutException;
 import org.apache.hc.core5.concurrent.DefaultThreadFactory;
 import org.apache.hc.core5.http.ClassicHttpResponse;
-import org.apache.hc.core5.http.ConnectionRequestTimeoutException;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpStatus;
-import org.apache.hc.core5.http.NoHttpResponseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,8 +52,6 @@
 import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -957,12 +952,20 @@ public Builder useBearerTokenAuth(String bearerToken) {
             this.httpHeader(HttpHeaders.AUTHORIZATION, "Bearer " + bearerToken);
             return this;
         }
-        public Builder addMetric(Object metric, String name) {
-            if (metric instanceof MeterRegistry) {
-                this.metric = metric;
-                this.configuration.put(ClientConfigProperties.METRICS_NAME.getKey(), name);
+
+        /**
+         * 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 metric type. Only MeterRegistry is supported");
+                throw new IllegalArgumentException("Unsupported registry type." + registry.getClass());
             }
             return this;
         }

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

@@ -130,7 +130,7 @@ public enum ClientConfigProperties {
     /**
      *
      */
-    METRICS_NAME("metrics_name"),
+    METRICS_GROUP_NAME("metrics_name"),
     ;
 
     private String key;

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

@@ -226,7 +226,7 @@ private HttpClientConnectionManager poolConnectionManager(SSLContext sslContext,
         connMgrBuilder.setDefaultSocketConfig(socketConfig);
         PoolingHttpClientConnectionManager phccm = connMgrBuilder.build();
         if (metric != null && metric instanceof MeterRegistry) {
-            String name = chConfiguration.getOrDefault(ClientConfigProperties.METRICS_NAME.getKey(), "http-pool");
+            String name = chConfiguration.getOrDefault(ClientConfigProperties.METRICS_GROUP_NAME.getKey(), "http-pool");
             new PoolingHttpClientConnectionManagerMetricsBinder(phccm, name).bindTo((MeterRegistry) metric);
         }
         return phccm;

client-v2/src/test/java/com/clickhouse/client/metrics/MetricsTest.java

@@ -5,11 +5,15 @@
 import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.ClickHouseServerForTest;
 import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.internal.ServerSettings;
+import com.clickhouse.client.api.query.QueryResponse;
+import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -18,32 +22,50 @@
 
 public class MetricsTest extends BaseIntegrationTest {
     private MeterRegistry meterRegistry;
-    @BeforeMethod
+    @BeforeMethod(groups = {"integration"})
     void setUp() {
         meterRegistry = new SimpleMeterRegistry();
         Metrics.globalRegistry.add(meterRegistry);
     }
 
-    @AfterMethod
+    @AfterMethod(groups = {"integration"})
     void tearDown() {
         meterRegistry.clear();
         Metrics.globalRegistry.clear();
     }
 
     @Test(groups = { "integration" }, enabled = true)
-    public void testRegisterMetrics() {
+    public void testRegisterMetrics() throws Exception {
         ClickHouseNode node = getServer(ClickHouseProtocol.HTTP);
         boolean isSecure = isCloud();
-        Client client = new Client.Builder()
+
+        try (Client client = new Client.Builder()
                 .addEndpoint(Protocol.HTTP, node.getHost(), node.getPort(), isSecure)
                 .setUsername("default")
                 .setPassword(ClickHouseServerForTest.getPassword())
                 .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
                 .serverSetting(ServerSettings.ASYNC_INSERT, "0")
                 .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1")
-                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "true").equals("true"))
-                .addMetric(meterRegistry, "pool-test")
-                .build();
+                .registerClientMetrics(meterRegistry, "pool-test")
+                .build()) {
+
+            Gauge totalMax = meterRegistry.get("httpcomponents.httpclient.pool.total.max").gauge();
+            Gauge available = meterRegistry.get("httpcomponents.httpclient.pool.total.connections").tags("state", "available").gauge();
+            Gauge leased = meterRegistry.get("httpcomponents.httpclient.pool.total.connections").tags("state", "leased").gauge();
+
+            System.out.println("totalMax:" + totalMax.value() + ", available: " + available.value() + ", leased: " + leased.value());
+            Assert.assertEquals((int)totalMax.value(), Integer.parseInt(ClientConfigProperties.HTTP_MAX_OPEN_CONNECTIONS.getDefaultValue()));
+            Assert.assertEquals((int)available.value(), 1);
+            Assert.assertEquals((int)leased.value(), 0);
+
+            try (QueryResponse response = client.query("SELECT 1").get()) {
+                Assert.assertEquals((int)available.value(), 0);
+                Assert.assertEquals((int)leased.value(), 1);
+            }
+
+            Assert.assertEquals((int)available.value(), 1);
+            Assert.assertEquals((int)leased.value(), 0);
+        }
         // currently there are  only 5 metrics that are monitored by micrometer (out of the box)
         assertEquals(meterRegistry.getMeters().size(), 5);
     }