Skip to content

fix: stabilize flaky timer and thread count tests #1973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zeitlinger wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −12
Open

fix: stabilize flaky timer and thread count tests #1973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/GaugeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ public void testTimer() throws InterruptedException {
try (Timer ignored = noLabels.startTimer()) {
Thread.sleep(12);
}
assertThat(getValue(noLabels))
.isCloseTo(0.012, offset(0.005)); // 5ms delta should be enough so this isn't flaky
assertThat(getValue(noLabels)).isGreaterThan(0.01);
}

@Test
Expand Down
17 changes: 7 additions & 10 deletions ...on-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmThreadsMetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,8 @@ void testInvalidThreadIds() {
// Number of threads to create with invalid thread ids
int numberOfInvalidThreadIds = 2;

Map<String, Double> expected = getCountByState(registry.scrape());
expected.compute(
"UNKNOWN",
(key, oldValue) ->
oldValue == null ? numberOfInvalidThreadIds : oldValue + numberOfInvalidThreadIds);
Map<String, Double> before = getCountByState(registry.scrape());
double unknownBefore = before.getOrDefault("UNKNOWN", 0.0);

final CountDownLatch countDownLatch = new CountDownLatch(numberOfInvalidThreadIds);

Expand All @@ -132,12 +129,12 @@ void testInvalidThreadIds() {
new ThreadWithInvalidId(-i, new TestRunnable(countDownLatch)).start();
}

Map<String, Double> actual = getCountByState(registry.scrape());
Map<String, Double> after = getCountByState(registry.scrape());
double unknownAfter = after.getOrDefault("UNKNOWN", 0.0);

assertThat(actual).hasSameSizeAs(expected);
for (String threadState : expected.keySet()) {
assertThat(actual.get(threadState)).isEqualTo(expected.get(threadState));
}
// The UNKNOWN count should increase by exactly the number of invalid thread ids.
// Other states may change due to background threads, so we only assert on UNKNOWN.
assertThat(unknownAfter - unknownBefore).isEqualTo((double) numberOfInvalidThreadIds);
} finally {
for (int i = 0; i < numberOfInvalidThreadIds; i++) {
countDownLatch.countDown();
Expand Down
Loading