Skip to content

Commit 3c5d708

Browse files
committed
including prometheus conditionally doesn't seem to work - and it not gaining that much
1 parent 5d67753 commit 3c5d708

File tree

2 files changed

+1
-23
lines changed
  • instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent

2 files changed

+1
-23
lines changed

instrumentation/spring/spring-boot-actuator-autoconfigure-2.0/javaagent/build.gradle.kts

+1-14
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ muzzle {
1515
dependencies {
1616
library("org.springframework.boot:spring-boot-actuator-autoconfigure:2.0.0.RELEASE")
1717
library("io.micrometer:micrometer-core:1.5.0")
18+
runtimeOnly("io.micrometer:micrometer-registry-prometheus:1.0.1")
1819

1920
implementation(project(":instrumentation:micrometer:micrometer-1.5:javaagent"))
2021

@@ -48,18 +49,4 @@ if (!latestDepTest) {
4849
force("org.slf4j:slf4j-api:1.7.36")
4950
}
5051
}
51-
52-
// this dependency adds the old io.micrometer.prometheus.PrometheusMeterRegistry,
53-
// which is not supported by the latest version of spring boot
54-
tasks {
55-
val testPrometheus by registering(Test::class) {
56-
dependencies {
57-
runtimeOnly("io.micrometer:micrometer-registry-prometheus:1.0.1")
58-
}
59-
}
60-
61-
check {
62-
dependsOn(testPrometheus)
63-
}
64-
}
6552
}

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

-9
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,5 @@ void shouldInjectOtelMeterRegistry() {
6666

6767
String last = list.get(list.size() - 1).getClass().getSimpleName();
6868
assertThat(last).isEqualTo("OpenTelemetryMeterRegistry");
69-
70-
try {
71-
Class.forName("io.micrometer.prometheusmetrics.PrometheusMeterRegistry");
72-
assertThat(registries)
73-
.extracting(r -> r.getClass().getSimpleName())
74-
.contains("PrometheusMeterRegistry");
75-
} catch (ClassNotFoundException e) {
76-
// not testing prometheus
77-
}
7869
}
7970
}

0 commit comments

Comments
 (0)