Skip to content

Commit a5b122b

Browse files
committed
improve test
1 parent e1da70e commit a5b122b

File tree

1 file changed

+17
-4
lines changed
  • instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0

1 file changed

+17
-4
lines changed

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/actuator/v2_0/ActuatorTest.java

+17-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1616
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1717
import io.opentelemetry.javaagent.instrumentation.spring.actuator.v2_0.SpringApp.TestBean;
18+
import java.util.Collection;
19+
import org.assertj.core.api.AbstractCollectionAssert;
20+
import org.assertj.core.api.ObjectAssert;
1821
import org.junit.jupiter.api.Test;
1922
import org.junit.jupiter.api.extension.RegisterExtension;
2023
import org.springframework.boot.SpringApplication;
@@ -57,9 +60,19 @@ void shouldInjectOtelMeterRegistry() {
5760
"value"))))));
5861

5962
MeterRegistry meterRegistry = context.getBean(MeterRegistry.class);
60-
assertThat(meterRegistry).isNotNull().isInstanceOf(CompositeMeterRegistry.class);
61-
assertThat(((CompositeMeterRegistry) meterRegistry).getRegistries())
62-
.anyMatch(r -> r.getClass().getSimpleName().equals("OpenTelemetryMeterRegistry"))
63-
.anyMatch(r -> r.getClass().getSimpleName().equals("SimpleMeterRegistry"));
63+
assertThat(meterRegistry).isInstanceOf(CompositeMeterRegistry.class);
64+
AbstractCollectionAssert<
65+
?, Collection<? extends MeterRegistry>, MeterRegistry, ObjectAssert<MeterRegistry>>
66+
match =
67+
assertThat(((CompositeMeterRegistry) meterRegistry).getRegistries())
68+
.anyMatch(r -> r.getClass().getSimpleName().equals("OpenTelemetryMeterRegistry"))
69+
.anyMatch(r -> r.getClass().getSimpleName().equals("SimpleMeterRegistry"));
70+
71+
try {
72+
Class.forName("io.micrometer.prometheusmetrics.PrometheusMeterRegistry");
73+
match.anyMatch(r -> r.getClass().getSimpleName().equals("PrometheusMeterRegistry"));
74+
} catch (ClassNotFoundException e) {
75+
// not testing prometheus
76+
}
6477
}
6578
}

0 commit comments

Comments
 (0)