fix(micrometer): incompatibility between micrometer and prometheus ja…

…va client
ExpediaGroup · Oct 15, 2024 · 8d9a326 · 8d9a326
1 parent 304b8f6
commit 8d9a326
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/components/proxy/pom.xml b/components/proxy/pom.xml
@@ -179,7 +179,7 @@
 
     <dependency>
       <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-registry-prometheus</artifactId>
+      <artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
     </dependency>
 
     <dependency>

diff --git a/components/proxy/src/main/java/com/hotels/styx/StyxServer.java b/components/proxy/src/main/java/com/hotels/styx/StyxServer.java
@@ -36,8 +36,8 @@
 import com.hotels.styx.server.netty.ServerConnector;
 import com.hotels.styx.startup.StyxServerComponents;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.micrometer.prometheusmetrics.PrometheusConfig;
-import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
+import io.micrometer.prometheus.PrometheusConfig;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
 import io.netty.util.ResourceLeakDetector;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/AdminServerBuilder.java b/components/proxy/src/main/java/com/hotels/styx/admin/AdminServerBuilder.java
@@ -65,7 +65,7 @@
 import com.hotels.styx.server.netty.WebServerConnectorFactory;
 import com.hotels.styx.server.track.CurrentRequestTracker;
 import com.hotels.styx.startup.StyxServerComponents;
-import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
 import org.slf4j.Logger;
 
 import java.time.Duration;

diff --git a/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PrometheusHandler.java b/components/proxy/src/main/java/com/hotels/styx/admin/handlers/PrometheusHandler.java
@@ -20,7 +20,7 @@
 import com.hotels.styx.api.HttpRequest;
 import com.hotels.styx.api.HttpResponse;
 import com.hotels.styx.api.WebServiceHandler;
-import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
+import io.micrometer.prometheus.PrometheusMeterRegistry;
 import org.slf4j.Logger;
 
 import static com.hotels.styx.api.HttpHeaderNames.CONTENT_TYPE;

diff --git a/pom.xml b/pom.xml
@@ -108,7 +108,7 @@
     <hdrhistogram.version>2.2.2</hdrhistogram.version>
     <jackson.version>2.17.2</jackson.version>
     <janino.version>3.1.12</janino.version>
-    <micrometer.version>1.13.4</micrometer.version>
+    <micrometer.version>1.13.6</micrometer.version>
     <netty.version>4.1.113.Final</netty.version>
     <okhttp.version>4.12.0</okhttp.version>
     <pcollections.version>4.0.2</pcollections.version>
@@ -373,7 +373,7 @@
 
       <dependency>
         <groupId>io.micrometer</groupId>
-        <artifactId>micrometer-registry-prometheus</artifactId>
+        <artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
         <version>${micrometer.version}</version>
       </dependency>