Add jvm metrics to TCK

TCK updates
microprofile · Jun 17, 2024 · 296c59b · 296c59b
1 parent e7c2f9a
commit 296c59b
Show file tree

Hide file tree

Showing 19 changed files with 515 additions and 83 deletions.
diff --git a/...rc/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java b/...rc/main/java/org/eclipse/microprofile/telemetry/logs/tck/application/LogAppenderTest.java
@@ -33,11 +33,8 @@
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-<<<<<<< HEAD
 import org.testng.Assert;
 
-=======
->>>>>>> 6244f76 (Update TCK (#178))
 import org.testng.annotations.Test;
 
 import io.opentelemetry.api.OpenTelemetry;

diff --git a/tck/logs/src/main/resources/logback.xml b/tck/logs/src/main/resources/logback.xml
diff --git a/tck/metrics/pom.xml b/tck/metrics/pom.xml
@@ -95,26 +95,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.coderplus.maven.plugins</groupId>
-                <artifactId>copy-rename-maven-plugin</artifactId>
-                <version>${version.plugin.copy.rename}</version>
-                <executions>
-                    <execution>
-                        <id>copy-readme</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <sourceFile>../README.adoc</sourceFile>
-                            <destinationFile>target/classes/README.adoc</destinationFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/.../main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/AsyncDoubleCounterTest.java b/.../main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/AsyncDoubleCounterTest.java
@@ -42,7 +42,7 @@
 import jakarta.inject.Inject;
 
 public class AsyncDoubleCounterTest extends Arquillian {
-    private static final String counterName = "testDoubleCounter";
+    private static final String counterName = "testDoubleAsyncCounter";
     private static final String counterDescription = "Testing double counter";
     private static final String counterUnit = "Metric Tonnes";
 
@@ -57,7 +57,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -86,10 +86,9 @@ void testAsyncDoubleCounter() throws InterruptedException {
                         .buildWithCallback(measurement -> {
                             measurement.record(1, Attributes.empty());
                         }));
+        MetricData metric = metricExporter.getMetricData(counterName).get(0);
 
-        MetricData metric = metricExporter.getMetricData((MetricDataType.DOUBLE_SUM)).get(0);
-
-        Assert.assertEquals(metric.getName(), counterName);
+        Assert.assertEquals(metric.getType(), MetricDataType.DOUBLE_SUM);
         Assert.assertEquals(metric.getDescription(), counterDescription);
         Assert.assertEquals(metric.getUnit(), counterUnit);
 

diff --git a/...rc/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/AsyncLongCounterTest.java b/...rc/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/AsyncLongCounterTest.java
@@ -43,7 +43,7 @@
 
 public class AsyncLongCounterTest extends Arquillian {
 
-    private static final String counterName = "testLongCounter";
+    private static final String counterName = "testAsyncLongCounter";
     private static final String counterDescription = "Testing long counter";
     private static final String counterUnit = "Metric Tonnes";
 
@@ -58,7 +58,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -87,9 +87,9 @@ void testAsyncLongCounter() throws InterruptedException {
                             measurement.record(1, Attributes.empty());
                         }));
 
-        MetricData metric = metricExporter.getMetricData((MetricDataType.LONG_SUM)).get(0);
+        MetricData metric = metricExporter.getMetricData((counterName)).get(0);
 
-        Assert.assertEquals(metric.getName(), counterName);
+        Assert.assertEquals(metric.getType(), MetricDataType.LONG_SUM);
         Assert.assertEquals(metric.getDescription(), counterDescription);
         Assert.assertEquals(metric.getUnit(), counterUnit);
 

diff --git a/...s/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/DoubleCounterTest.java b/...s/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/DoubleCounterTest.java
@@ -63,7 +63,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -99,10 +99,10 @@ void testDoubleCounter() throws InterruptedException {
 
         expectedResults.keySet().stream().forEach(key -> doubleCounter.add(key, expectedResults.get(key)));
 
-        List<MetricData> metrics = metricExporter.getMetricData((MetricDataType.DOUBLE_SUM));
+        List<MetricData> metrics = metricExporter.getMetricData((counterName));
         metrics.stream()
                 .peek(metricData -> {
-                    Assert.assertEquals(metricData.getName(), counterName);
+                    Assert.assertEquals(metricData.getType(), MetricDataType.DOUBLE_SUM);
                     Assert.assertEquals(metricData.getDescription(), counterDescription);
                     Assert.assertEquals(metricData.getUnit(), counterUnit);
                 })
@@ -119,4 +119,4 @@ void testDoubleCounter() throws InterruptedException {
                 });
     }
 
-}
+}
diff --git a/...ics/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/DoubleGaugeTest.java b/...ics/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/DoubleGaugeTest.java
@@ -54,7 +54,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -83,8 +83,8 @@ void testDoubleGauge() throws InterruptedException {
                             measurement.record(1, Attributes.empty());
                         }));
 
-        MetricData metric = metricExporter.getMetricData(MetricDataType.DOUBLE_GAUGE).get(0);
-        Assert.assertEquals(metric.getName(), gaugeName);
+        MetricData metric = metricExporter.getMetricData(gaugeName).get(0);
+        Assert.assertEquals(metric.getType(), MetricDataType.DOUBLE_GAUGE);
         Assert.assertEquals(metric.getDescription(), gaugeDescription);
         Assert.assertEquals(metric.getUnit(), gaugeUnit);
 

diff --git a/...src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/DoubleHistogramTest.java b/...src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/DoubleHistogramTest.java
@@ -64,7 +64,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -98,10 +98,10 @@ void testDoubleHistogram() throws InterruptedException {
 
         expectedResults.keySet().stream().forEach(key -> doubleHistogram.record(key, expectedResults.get(key)));
 
-        List<MetricData> metrics = metricExporter.getMetricData((MetricDataType.HISTOGRAM));
+        List<MetricData> metrics = metricExporter.getMetricData((histogramName));
         metrics.stream()
                 .peek(metricData -> {
-                    Assert.assertEquals(metricData.getName(), histogramName);
+                    Assert.assertEquals(metricData.getType(), MetricDataType.HISTOGRAM);
                     Assert.assertEquals(metricData.getDescription(), histogramDescription);
                     Assert.assertEquals(metricData.getUnit(), histogramUnit);
                 })

diff --git a/...main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/DoubleUpDownCounterTest.java b/...main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/DoubleUpDownCounterTest.java
@@ -64,7 +64,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -99,10 +99,10 @@ void testDoubleUpDownCounter() throws InterruptedException {
 
         expectedResults.keySet().stream().forEach(key -> doubleUpDownCounter.add(key, expectedResults.get(key)));
 
-        List<MetricData> metrics = metricExporter.getMetricData((MetricDataType.DOUBLE_SUM));
+        List<MetricData> metrics = metricExporter.getMetricData((counterName));
         metrics.stream()
                 .peek(metricData -> {
-                    Assert.assertEquals(metricData.getName(), counterName);
+                    Assert.assertEquals(metricData.getType(), MetricDataType.DOUBLE_SUM);
                     Assert.assertEquals(metricData.getDescription(), counterDescription);
                     Assert.assertEquals(metricData.getUnit(), counterUnit);
                 })

diff --git a/...ics/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/LongCounterTest.java b/...ics/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/LongCounterTest.java
@@ -65,7 +65,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -100,10 +100,10 @@ void testLongCounter() throws InterruptedException {
 
         expectedResults.keySet().stream().forEach(key -> longCounter.add(key, expectedResults.get(key)));
 
-        List<MetricData> metrics = metricExporter.getMetricData((MetricDataType.LONG_SUM));
+        List<MetricData> metrics = metricExporter.getMetricData((counterName));
         metrics.stream()
                 .peek(metricData -> {
-                    Assert.assertEquals(metricData.getName(), counterName);
+                    Assert.assertEquals(metricData.getType(), MetricDataType.LONG_SUM);
                     Assert.assertEquals(metricData.getDescription(), counterDescription);
                     Assert.assertEquals(metricData.getUnit(), counterUnit);
                 })
@@ -119,4 +119,4 @@ void testLongCounter() throws InterruptedException {
                                     + TestUtils.mapToString(expectedResults.get(point.getValue()).asMap()));
                 });
     }
-}
+}
diff --git a/...trics/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/LongGaugeTest.java b/...trics/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/LongGaugeTest.java
@@ -54,7 +54,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -84,8 +84,8 @@ void testLongGauge() throws InterruptedException {
                             measurement.record(1, Attributes.empty());
                         }));
 
-        MetricData metric = metricExporter.getMetricData((MetricDataType.LONG_GAUGE)).get(0);
-        Assert.assertEquals(metric.getName(), gaugeName);
+        MetricData metric = metricExporter.getMetricData((gaugeName)).get(0);
+        Assert.assertEquals(metric.getType(), MetricDataType.LONG_GAUGE);
         Assert.assertEquals(metric.getDescription(), gaugeDescription);
         Assert.assertEquals(metric.getUnit(), gaugeUnit);
 

diff --git a/...s/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/LongHistogramTest.java b/...s/src/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/LongHistogramTest.java
@@ -64,7 +64,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -99,11 +99,10 @@ void testLongHistogram() throws InterruptedException {
 
         expectedResults.keySet().stream().forEach(key -> longHistogram.record(key, expectedResults.get(key)));
 
-        List<MetricData> metrics = metricExporter.getMetricData((MetricDataType.HISTOGRAM));
-        System.out.println("Expected results :" + expectedResults);
+        List<MetricData> metrics = metricExporter.getMetricData((histogramName));
         metrics.stream()
                 .peek(metricData -> {
-                    Assert.assertEquals(metricData.getName(), histogramName);
+                    Assert.assertEquals(metricData.getType(), MetricDataType.HISTOGRAM);
                     Assert.assertEquals(metricData.getDescription(), histogramDescription);
                     Assert.assertEquals(metricData.getUnit(), histogramUnit);
                 })

diff --git a/...c/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/LongUpDownCounterTest.java b/...c/main/java/org/eclipse/microprofile/telemetry/metrics/tck/cdi/LongUpDownCounterTest.java
@@ -64,7 +64,7 @@ public static WebArchive createTestArchive() {
                 .addAsLibrary(TestLibraries.AWAITILITY_LIB)
                 .addAsServiceProvider(ConfigurableMetricExporterProvider.class, InMemoryMetricExporterProvider.class)
                 .addAsResource(new StringAsset(
-                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.traces.exporter=none\notel.metric.export.interval=3000"),
+                        "otel.sdk.disabled=false\notel.metrics.exporter=in-memory\notel.logs.exporter=none\notel.traces.exporter=none\notel.metric.export.interval=3000"),
                         "META-INF/microprofile-config.properties")
                 .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
     }
@@ -98,10 +98,10 @@ void testLongUpDownCounter() throws InterruptedException {
 
         expectedResults.keySet().stream().forEach(key -> longUpDownCounter.add(key, expectedResults.get(key)));
 
-        List<MetricData> metrics = metricExporter.getMetricData((MetricDataType.LONG_SUM));
+        List<MetricData> metrics = metricExporter.getMetricData((counterName));
         metrics.stream()
                 .peek(metricData -> {
-                    Assert.assertEquals(metricData.getName(), counterName);
+                    Assert.assertEquals(metricData.getType(), MetricDataType.LONG_SUM);
                     Assert.assertEquals(metricData.getDescription(), counterDescription);
                     Assert.assertEquals(metricData.getUnit(), counterUnit);
                 })

diff --git a/.../java/org/eclipse/microprofile/telemetry/metrics/tck/exporter/InMemoryMetricExporter.java b/.../java/org/eclipse/microprofile/telemetry/metrics/tck/exporter/InMemoryMetricExporter.java
@@ -35,7 +35,6 @@
 import io.opentelemetry.sdk.metrics.InstrumentType;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
-import io.opentelemetry.sdk.metrics.data.MetricDataType;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import jakarta.enterprise.context.ApplicationScoped;
 
@@ -55,22 +54,23 @@ public InMemoryMetricExporter() {
      *
      * @return a {@code List} of the finished {@code Metric}s.
      */
-    public List<MetricData> getFinishedMetricItems(int itemCount) {
-        assertItemCount(itemCount);
+    public List<MetricData> getFinishedMetricItems() {
         return finishedMetricItems.stream()
                 .collect(Collectors.toList());
     }
 
-    public void assertItemCount(int itemCount) {
-        Awaitility.await().pollDelay(3, SECONDS).atMost(10, SECONDS)
-                .untilAsserted(() -> Assert.assertEquals(finishedMetricItems.size(), itemCount));
-    }
-
-    public List<MetricData> getMetricData(MetricDataType dataType) {
-        return getFinishedMetricItems(1).stream().filter(metric -> metric.getType() == dataType)
+    public List<MetricData> getMetricData(String metricName) {
+        assertMetricNameFound(metricName);
+        return getFinishedMetricItems().stream().filter(metric -> metric.getName() == metricName)
                 .collect(Collectors.toList());
         // .orElseThrow(() -> new IllegalStateException("No metric found with type " + dataType));
     }
+    public void assertMetricNameFound(String metricName) {
+        Awaitility.await().pollDelay(5, SECONDS).atMost(10, SECONDS)
+                .untilAsserted(() -> Assert.assertTrue(
+                        getFinishedMetricItems().stream().filter(metric -> metric.getName() == metricName)
+                                .collect(Collectors.toList()).size() > 0));
+    }
 
     /**
      * Clears the internal {@code List} of finished {@code Metric}s.
@@ -98,7 +98,6 @@ public CompletableResultCode export(Collection<MetricData> metrics) {
         if (isStopped) {
             return CompletableResultCode.ofFailure();
         }
-        System.out.println("Exporting metrics :" + metrics);
         finishedMetricItems.addAll(metrics);
         return CompletableResultCode.ofSuccess();
     }