Merge branch '1.13.x' into 1.14.x

Author: shakuzen

gradle/libs.versions.toml

@@ -63,7 +63,7 @@ maven-resolver = "1.9.22"
 mockito4 = "4.11.0"
 mockito5 = "5.11.0"
 mongo = "4.11.4"
-netty = "4.1.114.Final"
+netty = "4.1.115.Final"
 newrelic-api = "5.14.0"
 # Kotlin 1.7 sample will fail from OkHttp 4.12.0 due to okio dependency being a Kotlin 1.9 module
 okhttp = "4.11.0"

implementations/micrometer-registry-prometheus/build.gradle

@@ -18,3 +18,7 @@ dependencies {
     testImplementation 'org.testcontainers:junit-jupiter'
     testImplementation 'org.awaitility:awaitility'
 }
+
+dockerTest {
+    systemProperty 'prometheus.version', 'v2.55.1'
+}

implementations/micrometer-registry-prometheus/src/test/java/io/micrometer/prometheusmetrics/PrometheusMeterRegistryIntegrationTest.java

@@ -57,7 +57,8 @@
 class PrometheusMeterRegistryIntegrationTest {
 
     @Container
-    static GenericContainer<?> prometheus = new GenericContainer<>(DockerImageName.parse("prom/prometheus:latest"))
+    static GenericContainer<?> prometheus = new GenericContainer<>(
+            DockerImageName.parse("prom/prometheus:" + getPrometheusImageVersion()))
         .withCommand("--config.file=/etc/prometheus/prometheus.yml")
         .withClasspathResourceMapping("prometheus.yml", "/etc/prometheus/prometheus.yml", READ_ONLY)
         .waitingFor(Wait.forLogMessage(".*Server is ready to receive web requests.*", 1))
@@ -72,6 +73,15 @@ class PrometheusMeterRegistryIntegrationTest {
     @Nullable
     private HttpServer prometheusTextServer;
 
+    private static String getPrometheusImageVersion() {
+        String version = System.getProperty("prometheus.version");
+        if (version == null) {
+            throw new IllegalStateException(
+                    "System property 'prometheus.version' is not set. This should be set in the build configuration for running from the command line. If you are running PrometheusMeterRegistryIntegrationTest from an IDE, set the system property to the desired prom/prometheus image version.");
+        }
+        return version;
+    }
+
     @BeforeEach
     void setUp() {
         org.testcontainers.Testcontainers.exposeHostPorts(12345, 12346);