test more metrics

Author: zeitlinger

smoke-tests-otel-starter/spring-boot-2/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

@@ -16,6 +16,7 @@
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
     properties = {
       // The headers are simply set here to make sure that headers can be parsed
-      "otel.exporter.otlp.headers.c=3"
+      "otel.exporter.otlp.headers.c=3",
+      "otel.instrumentation.runtime-telemetry.emit-experimental-telemetry=true",
     })
 class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {}

smoke-tests-otel-starter/spring-boot-3/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.spring.smoketest;
 
+import java.util.List;
 import org.assertj.core.api.AbstractIterableAssert;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -18,16 +19,30 @@
     properties = {
       // The headers are simply set here to make sure that headers can be parsed
       "otel.exporter.otlp.headers.c=3",
-      "otel.instrumentation.runtime-telemetry-java17.enabled=true",
+      "otel.instrumentation.runtime-telemetry.emit-experimental-telemetry=true",
+      "otel.instrumentation.runtime-telemetry-java17.enable-all=true",
     })
 class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {
 
   @Override
   protected void assertAdditionalMetrics() {
     // JFR based metrics
-    testing.waitAndAssertMetrics(
-        "io.opentelemetry.runtime-telemetry-java17",
-        "jvm.cpu.limit",
-        AbstractIterableAssert::isNotEmpty);
+    for (String metric :
+        List.of(
+            "jvm.cpu.limit",
+            "jvm.buffer.count",
+            "jvm.class.count",
+            "jvm.cpu.context_switch",
+            "jvm.cpu.longlock",
+            "jvm.system.cpu.utilization",
+            "jvm.gc.duration",
+            "jvm.memory.init",
+            "jvm.memory.used",
+            "jvm.memory.allocation",
+            "jvm.network.io            ",
+            "jvm.thread.count")) {
+      testing.waitAndAssertMetrics(
+          "io.opentelemetry.runtime-telemetry-java17", metric, AbstractIterableAssert::isNotEmpty);
+    }
   }
 }

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java

@@ -29,6 +29,7 @@
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
 import java.net.URI;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.assertj.core.api.AbstractCharSequenceAssert;
@@ -217,11 +218,20 @@ void shouldSendTelemetry() {
         "io.opentelemetry.runtime-telemetry-java8",
         "jvm.thread.count",
         AbstractIterableAssert::isNotEmpty);
+
     // JMX based metrics
-    testing.waitAndAssertMetrics(
-        "io.opentelemetry.runtime-telemetry-java8",
-        "jvm.memory.used",
-        AbstractIterableAssert::isNotEmpty);
+    Arrays.asList(
+            "jvm.memory.used",
+            "jvm.system.cpu.load_1m",
+            "jvm.buffer.memory.usage",
+            "jvm.memory.init")
+        .forEach(
+            metricName ->
+                testing.waitAndAssertMetrics(
+                    "io.opentelemetry.runtime-telemetry-java8",
+                    metricName,
+                    AbstractIterableAssert::isNotEmpty));
+
     assertAdditionalMetrics();
 
     // Log