Merge branch '1.13.x' into 1.14.x

shakuzen · shakuzen · commit e387558fccb0 · 2025-02-10T11:07:19.000+09:00
diff --git a/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryTest.java b/implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryTest.java
@@ -943,7 +943,7 @@ void openMetricsScrapeWithExemplars() throws InterruptedException {
     }
 
     private static void sleepToAvoidRateLimiting() throws InterruptedException {
-        Thread.sleep(10); // sleeping since the sample interval limit is 1ms
+        Thread.sleep(100); // sleeping since the sample interval limit is 1ms
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ void openMetricsScrapeWithExemplars() throws InterruptedException {`
`943`	`943`	`}`
`944`	`944`
`945`	`945`	`private static void sleepToAvoidRateLimiting() throws InterruptedException {`
`946`		`- Thread.sleep(10); // sleeping since the sample interval limit is 1ms`
	`946`	`+ Thread.sleep(100); // sleeping since the sample interval limit is 1ms`
`947`	`947`	`}`
`948`	`948`
`949`	`949`	`@Test`