diff --git a/components/proxy/pom.xml b/components/proxy/pom.xml index c0d9462f8..3992c8e39 100644 --- a/components/proxy/pom.xml +++ b/components/proxy/pom.xml @@ -179,7 +179,7 @@ io.micrometer - micrometer-registry-prometheus + micrometer-registry-prometheus-simpleclient diff --git a/components/proxy/src/main/java/com/hotels/styx/StyxServer.java b/components/proxy/src/main/java/com/hotels/styx/StyxServer.java index 5c3f917ec..c27069262 100644 --- 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 index 3a6a54fa3..f9dd6f222 100644 --- 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 index 10c8cfd05..34c7b8e17 100644 --- 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 index 9b04a4faa..c2facaa7b 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ 2.2.2 2.17.2 3.1.12 - 1.13.4 + 1.13.6 4.1.113.Final 4.12.0 4.0.2 @@ -373,7 +373,7 @@ io.micrometer - micrometer-registry-prometheus + micrometer-registry-prometheus-simpleclient ${micrometer.version}