Skip to content

Commit 35c406c

Browse files
committed
attempt
1 parent c8d4381 commit 35c406c

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

agent/instrumentation/micrometer-1.0/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ dependencies {
3131
exclude("io.micrometer", "micrometer-core")
3232
}
3333

34-
testImplementation("io.micrometer:micrometer-core:1.1.0")
34+
// there's a bug in earlier micrometer versions that
35+
testImplementation("io.micrometer:micrometer-core:1.13.6")
3536

3637
// TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin
3738
add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion")
@@ -42,6 +43,6 @@ dependencies {
4243

4344
tasks {
4445
withType<Test>().configureEach {
45-
jvmArgs("-Dapplicationinsights.internal.micrometer.step.millis=1000")
46+
jvmArgs("-Dapplicationinsights.internal.micrometer.step.millis=100")
4647
}
4748
}

agent/instrumentation/micrometer-1.0/src/test/java/MicrometerTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,15 @@ void shouldCaptureLongTaskTimer() {
206206
assertThat(activeMeasurement.max).isNull();
207207
assertThat(activeMeasurement.namespace).isNull();
208208

209+
await()
210+
.untilAsserted(
211+
() -> {
212+
AgentTestingMicrometerDelegate.Measurement durationMeasurement =
213+
getLastMeasurement("test-long-task-timer_duration");
214+
assertThat(durationMeasurement).isNotNull();
215+
assertThat(durationMeasurement.value).isGreaterThan(50);
216+
});
217+
209218
AgentTestingMicrometerDelegate.Measurement durationMeasurement =
210219
getLastMeasurement("test-long-task-timer_duration");
211220
assertThat(durationMeasurement.value).isGreaterThan(50);

0 commit comments

Comments
 (0)