test more metric types

Author: zeitlinger

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 org.assertj.core.api.AbstractIterableAssert;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest(
@@ -16,6 +17,17 @@
     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-java17.enabled=true",
     })
-class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {}
+class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {
+
+  @Override
+  protected void assertAdditionalMetrics() {
+    // JFR based metrics
+    testing.waitAndAssertMetrics(
+        "io.opentelemetry.runtime-telemetry-java17",
+        "jvm.cpu.limit",
+        AbstractIterableAssert::isNotEmpty);
+  }
+}

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

@@ -209,11 +209,20 @@ void shouldSendTelemetry() {
         OtelSpringStarterSmokeTestController.METER_SCOPE_NAME,
         OtelSpringStarterSmokeTestController.TEST_HISTOGRAM,
         AbstractIterableAssert::isNotEmpty);
+
     // runtime metrics
+    // from special logic for threads that is automatically detected in GraalVM native image
+    // see io.opentelemetry.instrumentation.runtimemetrics.java8.Threads
     testing.waitAndAssertMetrics(
         "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);
+    assertAdditionalMetrics();
 
     // Log
     List<LogRecordData> exportedLogRecords = testing.getExportedLogRecords();
@@ -233,6 +242,8 @@ void shouldSendTelemetry() {
     }
   }
 
+  protected void assertAdditionalMetrics() {}
+
   @Test
   void databaseQuery() {
     testing.clearAllExportedData();