Merge branch '1.15.x' into 1.16.x

shakuzen · shakuzen · commit aecd95d84c05 · 2026-02-09T15:37:42.000+09:00
diff --git a/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryPublishTest.java b/implementations/micrometer-registry-statsd/src/test/java/io/micrometer/statsd/StatsdMeterRegistryPublishTest.java
@@ -331,12 +331,12 @@ void receiveParallelMetricsSuccessfully(StatsdProtocol protocol) throws Interrup
 
     @Test
     void counterIncrementWorksWithSleepAfterRegistryStart() throws InterruptedException {
-        StatsdConfig config = StatsdConfig.DEFAULT;
-
         CountDownLatch serverLatch = new CountDownLatch(1);
-        DisposableChannel server = startServer(StatsdProtocol.UDP, config.port(), serverLatch);
+        DisposableChannel server = startServer(StatsdProtocol.UDP, 0, serverLatch);
+        final int port = getPort(server, StatsdProtocol.UDP);
 
-        StatsdMeterRegistry registry = new StatsdMeterRegistry(config, Clock.SYSTEM);
+        StatsdMeterRegistry registry = new StatsdMeterRegistry(getBufferedConfig(StatsdProtocol.UDP, port),
+                Clock.SYSTEM);
         Thread.sleep(1000);
 
         Counter counter = Counter.builder("my.counter").register(registry);
@@ -351,12 +351,12 @@ void counterIncrementWorksWithSleepAfterRegistryStart() throws InterruptedExcept
 
     @Test
     void counterIncrementDoesNotWorkWithoutSleepAfterRegistryStart() throws InterruptedException {
-        StatsdConfig config = StatsdConfig.DEFAULT;
-
         CountDownLatch serverLatch = new CountDownLatch(1);
-        DisposableChannel server = startServer(StatsdProtocol.UDP, config.port(), serverLatch);
+        DisposableChannel server = startServer(StatsdProtocol.UDP, 0, serverLatch);
+        final int port = getPort(server, StatsdProtocol.UDP);
 
-        StatsdMeterRegistry registry = new StatsdMeterRegistry(config, Clock.SYSTEM);
+        StatsdMeterRegistry registry = new StatsdMeterRegistry(getBufferedConfig(StatsdProtocol.UDP, port),
+                Clock.SYSTEM);
 
         Counter counter = Counter.builder("my.counter").register(registry);
         counter.increment();
