Updated prometheus version (#1930)

* Specifying PrometheusMeterRegistry bean type

* Specifying PrometheusConfig bean type

* Updated prometheus metrics

build.gradle

@@ -57,7 +57,7 @@ allprojects {
             jetty             : '12.0.8',
             curator           : '5.4.0',
             dropwizard_metrics: '4.2.25',
-            micrometer_metrics: '1.12.5',
+            micrometer_metrics: '1.13.0',
             wiremock          : '3.9.0',
             spock             : '2.4-M4-groovy-4.0',
             groovy            : '4.0.21',

hermes-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/PrometheusMeterRegistryFactory.java

@@ -7,8 +7,8 @@
 import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import java.util.concurrent.TimeUnit;
 import pl.allegro.tech.hermes.common.metric.counter.CounterStorage;
 import pl.allegro.tech.hermes.common.metric.counter.zookeeper.ZookeeperCounterReporter;

hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java

@@ -6,8 +6,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import jakarta.inject.Named;
 import java.time.Clock;
 import java.util.Arrays;

hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/PrometheusConfigAdapter.java

@@ -1,6 +1,6 @@
 package pl.allegro.tech.hermes.consumers.config;
 
-import io.micrometer.prometheus.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
 import java.time.Duration;
 
 public class PrometheusConfigAdapter implements PrometheusConfig {

hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/ServerConfiguration.java

@@ -1,7 +1,7 @@
 package pl.allegro.tech.hermes.consumers.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import java.io.IOException;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;

hermes-consumers/src/main/java/pl/allegro/tech/hermes/consumers/server/ConsumerHttpServer.java

@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpServer;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;

hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java

@@ -5,8 +5,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import java.time.Clock;
 import java.util.List;
 import org.apache.curator.framework.CuratorFramework;

hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/FrontendServerConfiguration.java

@@ -1,6 +1,6 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.undertow.server.HttpHandler;
 import java.util.Optional;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/PrometheusConfigAdapter.java

@@ -1,6 +1,6 @@
 package pl.allegro.tech.hermes.frontend.config;
 
-import io.micrometer.prometheus.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
 import java.time.Duration;
 
 public class PrometheusConfigAdapter implements PrometheusConfig {

hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/HermesServer.java

@@ -11,7 +11,7 @@
 import static org.xnio.Options.READ_TIMEOUT;
 import static org.xnio.Options.SSL_CLIENT_AUTH_MODE;
 
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.undertow.Undertow;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.RoutingHandler;

hermes-frontend/src/main/java/pl/allegro/tech/hermes/frontend/server/PrometheusMetricsHandler.java

@@ -2,7 +2,7 @@
 
 import static io.undertow.util.StatusCodes.OK;
 
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 

hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfigAdapter.java

@@ -1,6 +1,6 @@
 package pl.allegro.tech.hermes.management.config;
 
-import io.micrometer.prometheus.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
 import java.time.Duration;
 
 public class PrometheusConfigAdapter implements PrometheusConfig {

hermes-management/src/main/java/pl/allegro/tech/hermes/management/config/PrometheusConfiguration.java

@@ -3,8 +3,8 @@
 import io.micrometer.core.instrument.Meter;
 import io.micrometer.core.instrument.config.MeterFilter;
 import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -15,15 +15,15 @@
 public class PrometheusConfiguration {
 
   @Bean
-  @ConditionalOnMissingBean
+  @ConditionalOnMissingBean(PrometheusMeterRegistry.class)
   public PrometheusMeterRegistry micrometerRegistry(
       MicrometerRegistryProperties properties, PrometheusConfig prometheusConfig) {
     return new PrometheusMeterRegistryFactory(properties, prometheusConfig, "hermes-management")
         .provide();
   }
 
   @Bean
-  @ConditionalOnMissingBean
+  @ConditionalOnMissingBean(PrometheusConfig.class)
   public PrometheusConfig prometheusConfig(PrometheusProperties properties) {
     return new PrometheusConfigAdapter(properties);
   }