Refactored client metrics (#139)

* Refactored client metrics * Fixed descriptions * Fixed integration tests * Fixed imports * spotless * Fixed metric name in integration test
streamnative · May 2, 2024 · d03623c · d03623c
1 parent 10e5ca8
commit d03623c
Show file tree

Hide file tree

Showing 54 changed files with 1,257 additions and 1,717 deletions.
diff --git a/client-it/pom.xml b/client-it/pom.xml
@@ -60,12 +60,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.streamnative.oxia</groupId>
-            <artifactId>oxia-client-metrics-opentelemetry</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.streamnative.oxia</groupId>
             <artifactId>oxia-testcontainers</artifactId>

diff --git a/client-it/src/test/java/io/streamnative/oxia/client/it/OxiaClientIT.java b/client-it/src/test/java/io/streamnative/oxia/client/it/OxiaClientIT.java
@@ -43,7 +43,6 @@
 import io.streamnative.oxia.client.api.Notification.KeyModified;
 import io.streamnative.oxia.client.api.PutOption;
 import io.streamnative.oxia.client.api.UnexpectedVersionIdException;
-import io.streamnative.oxia.client.metrics.opentelemetry.OpenTelemetryMetrics;
 import io.streamnative.oxia.testcontainers.OxiaContainer;
 import java.util.ArrayList;
 import java.util.List;
@@ -84,11 +83,11 @@ static void beforeAll() {
                 SdkMeterProvider.builder().registerMetricReader(metricReader).setResource(resource).build();
 
         OpenTelemetry openTelemetry =
-                OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProvider).buildAndRegisterGlobal();
+                OpenTelemetrySdk.builder().setMeterProvider(sdkMeterProvider).build();
 
         client =
                 new OxiaClientBuilder(oxia.getServiceAddress())
-                        .metrics(OpenTelemetryMetrics.create(openTelemetry))
+                        .openTelemetry(openTelemetry)
                         .asyncClient()
                         .join();
         client.notifications(notifications::add);
@@ -204,15 +203,12 @@ void test() throws Exception {
         var metrics = metricReader.collectAllMetrics();
         var metricsByName = metrics.stream().collect(Collectors.toMap(MetricData::getName, identity()));
 
+        System.out.println(metricsByName);
+
         assertThat(
-                        metricsByName.get("oxia_client_operation_size").getHistogramData().getPoints().stream()
-                                .map(HistogramPointData::getCount)
-                                .reduce(0L, Long::sum))
-                .isEqualTo(18);
-        assertThat(
-                        metricsByName.get("oxia_client_cache_hits").getHistogramData().getPoints().stream()
+                        metricsByName.get("oxia.client.ops").getHistogramData().getPoints().stream()
                                 .map(HistogramPointData::getCount)
                                 .reduce(0L, Long::sum))
-                .isEqualTo(11);
+                .isEqualTo(24);
     }
 }
diff --git a/client-metrics-api/pom.xml b/client-metrics-api/pom.xml
diff --git a/client-metrics-api/src/main/java/io/streamnative/oxia/client/metrics/api/Metrics.java b/client-metrics-api/src/main/java/io/streamnative/oxia/client/metrics/api/Metrics.java
diff --git a/client-metrics-opentelemetry/pom.xml b/client-metrics-opentelemetry/pom.xml
diff --git a/...src/main/java/io/streamnative/oxia/client/metrics/opentelemetry/OpenTelemetryMetrics.java b/...src/main/java/io/streamnative/oxia/client/metrics/opentelemetry/OpenTelemetryMetrics.java
diff --git a/...test/java/io/streamnative/oxia/client/metrics/opentelemetry/OpenTelemetryMetricsTest.java b/...test/java/io/streamnative/oxia/client/metrics/opentelemetry/OpenTelemetryMetricsTest.java
diff --git a/client/pom.xml b/client/pom.xml
@@ -66,16 +66,15 @@
             <groupId>io.grpc</groupId>
             <artifactId>grpc-stub</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.projectreactor</groupId>
             <artifactId>reactor-core</artifactId>
             <version>${reactor.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.streamnative.oxia</groupId>
-            <artifactId>oxia-client-metrics-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>