improve test

open-telemetry · Jan 28, 2025 · 0f347b6 · 0f347b6
1 parent b592d63
commit 0f347b6
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/...st/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/ActuatorTest.java b/...st/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/ActuatorTest.java
@@ -15,6 +15,9 @@
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.javaagent.instrumentation.spring.actuator.v2_0.SpringApp.TestBean;
+import java.util.Collection;
+import org.assertj.core.api.AbstractCollectionAssert;
+import org.assertj.core.api.ObjectAssert;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.boot.SpringApplication;
@@ -57,9 +60,19 @@ void shouldInjectOtelMeterRegistry() {
                                                         "value"))))));
 
     MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
-    assertThat(meterRegistry).isNotNull().isInstanceOf(CompositeMeterRegistry.class);
-    assertThat(((CompositeMeterRegistry) meterRegistry).getRegistries())
-        .anyMatch(r -> r.getClass().getSimpleName().equals("OpenTelemetryMeterRegistry"))
-        .anyMatch(r -> r.getClass().getSimpleName().equals("SimpleMeterRegistry"));
+    assertThat(meterRegistry).isInstanceOf(CompositeMeterRegistry.class);
+    AbstractCollectionAssert<
+            ?, Collection<? extends MeterRegistry>, MeterRegistry, ObjectAssert<MeterRegistry>>
+        match =
+            assertThat(((CompositeMeterRegistry) meterRegistry).getRegistries())
+                .anyMatch(r -> r.getClass().getSimpleName().equals("OpenTelemetryMeterRegistry"))
+                .anyMatch(r -> r.getClass().getSimpleName().equals("SimpleMeterRegistry"));
+
+    try {
+      Class.forName("io.micrometer.prometheusmetrics.PrometheusMeterRegistry");
+      match.anyMatch(r -> r.getClass().getSimpleName().equals("PrometheusMeterRegistry"));
+    } catch (ClassNotFoundException e) {
+      // not testing prometheus
+    }
   }
 }