Bump micrometer.version from 1.12.5 to 1.13.0 (slackhq#934)

* Bump micrometer.version from 1.12.5 to 1.13.0 Bumps `micrometer.version` from 1.12.5 to 1.13.0. Updates `io.micrometer:micrometer-core` from 1.12.5 to 1.13.0 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.12.5...v1.13.0) Updates `io.micrometer:micrometer-registry-prometheus` from 1.12.5 to 1.13.0 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](micrometer-metrics/micrometer@v1.12.5...v1.13.0) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micrometer:micrometer-registry-prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Required updates to migrate to new breaking prometheus micrometer update --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Bryan Burkholder <[email protected]>
autata · May 23, 2024 · b0dfa39 · b0dfa39
1 parent b7e692c
commit b0dfa39
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 19 deletions.
diff --git a/astra/pom.xml b/astra/pom.xml
@@ -19,7 +19,7 @@
         <http.core.version>4.4.16</http.core.version>
         <protobuf.version>3.25.3</protobuf.version>
         <grpc.version>1.64.0</grpc.version>
-        <micrometer.version>1.12.5</micrometer.version>
+        <micrometer.version>1.13.0</micrometer.version>
         <armeria.version>1.27.3</armeria.version>
         <kafka.version>3.5.0</kafka.version>
         <jackson.version>2.17.0</jackson.version>

diff --git a/astra/src/main/java/com/slack/astra/bulkIngestApi/BulkIngestKafkaProducer.java b/astra/src/main/java/com/slack/astra/bulkIngestApi/BulkIngestKafkaProducer.java
@@ -17,7 +17,6 @@
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -85,7 +84,7 @@ public class BulkIngestKafkaProducer extends AbstractExecutionThreadService {
   public BulkIngestKafkaProducer(
       final DatasetMetadataStore datasetMetadataStore,
       final AstraConfigs.PreprocessorConfig preprocessorConfig,
-      final PrometheusMeterRegistry meterRegistry) {
+      final MeterRegistry meterRegistry) {
     this.kafkaConfig = preprocessorConfig.getKafkaConfig();
 
     checkArgument(

diff --git a/astra/src/main/java/com/slack/astra/bulkIngestApi/DatasetRateLimitingService.java b/astra/src/main/java/com/slack/astra/bulkIngestApi/DatasetRateLimitingService.java
@@ -7,8 +7,8 @@
 import com.slack.astra.preprocessor.PreprocessorRateLimiter;
 import com.slack.astra.proto.config.AstraConfigs;
 import com.slack.service.murron.trace.Trace;
+import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
 import java.util.List;
 import java.util.function.BiPredicate;
 
@@ -24,15 +24,15 @@ public class DatasetRateLimitingService extends AbstractIdleService {
   private final PreprocessorRateLimiter rateLimiter;
   private BiPredicate<String, List<Trace.Span>> rateLimiterPredicate;
 
-  private final PrometheusMeterRegistry meterRegistry;
+  private final MeterRegistry meterRegistry;
   public static final String RATE_LIMIT_RELOAD_TIMER =
       "preprocessor_dataset_rate_limit_reload_timer";
   private final Timer rateLimitReloadtimer;
 
   public DatasetRateLimitingService(
       DatasetMetadataStore datasetMetadataStore,
       AstraConfigs.PreprocessorConfig preprocessorConfig,
-      PrometheusMeterRegistry meterRegistry) {
+      MeterRegistry meterRegistry) {
     this.datasetMetadataStore = datasetMetadataStore;
     this.meterRegistry = meterRegistry;
 

diff --git a/astra/src/main/java/com/slack/astra/server/ArmeriaService.java b/astra/src/main/java/com/slack/astra/server/ArmeriaService.java
@@ -27,7 +27,7 @@
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptor;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import io.netty.handler.codec.http.DefaultHttpHeaders;
 import java.time.Duration;
 import java.util.ArrayList;

diff --git a/astra/src/main/java/com/slack/astra/server/Astra.java b/astra/src/main/java/com/slack/astra/server/Astra.java
@@ -48,8 +48,8 @@
 import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics;
 import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics;
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.util.HashSet;

diff --git a/astra/src/test/java/com/slack/astra/bulkIngestApi/BulkIngestKafkaProducerTest.java b/astra/src/test/java/com/slack/astra/bulkIngestApi/BulkIngestKafkaProducerTest.java
@@ -17,8 +17,8 @@
 import com.slack.astra.testlib.MetricsUtil;
 import com.slack.astra.testlib.TestKafkaServer;
 import com.slack.service.murron.trace.Trace;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
@@ -40,7 +40,7 @@
 
 class BulkIngestKafkaProducerTest {
   private static final Logger LOG = LoggerFactory.getLogger(BulkIngestKafkaProducerTest.class);
-  private static PrometheusMeterRegistry meterRegistry;
+  private static MeterRegistry meterRegistry;
   private static AsyncCuratorFramework curatorFramework;
   private static AstraConfigs.PreprocessorConfig preprocessorConfig;
   private static DatasetMetadataStore datasetMetadataStore;
@@ -56,7 +56,7 @@ class BulkIngestKafkaProducerTest {
   @BeforeEach
   public void bootstrapCluster() throws Exception {
     Tracing.newBuilder().build();
-    meterRegistry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
+    meterRegistry = new SimpleMeterRegistry();
 
     zkServer = new TestingServer();
     AstraConfigs.ZookeeperConfig zkConfig =

diff --git a/astra/src/test/java/com/slack/astra/server/AstraTest.java b/astra/src/test/java/com/slack/astra/server/AstraTest.java
@@ -25,8 +25,8 @@
 import com.slack.astra.testlib.AstraConfigUtil;
 import com.slack.astra.testlib.MessageUtil;
 import com.slack.astra.testlib.TestKafkaServer;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

diff --git a/astra/src/test/java/com/slack/astra/server/BulkIngestApiTest.java b/astra/src/test/java/com/slack/astra/server/BulkIngestApiTest.java
@@ -28,8 +28,8 @@
 import com.slack.astra.util.JsonUtil;
 import com.slack.astra.util.TestingZKServer;
 import com.slack.service.murron.trace.Trace;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
@@ -51,7 +51,7 @@
 
 public class BulkIngestApiTest {
   private static final Logger LOG = LoggerFactory.getLogger(BulkIngestApi.class);
-  private static PrometheusMeterRegistry meterRegistry;
+  private static MeterRegistry meterRegistry;
   private static AsyncCuratorFramework curatorFramework;
   private static AstraConfigs.PreprocessorConfig preprocessorConfig;
   private static DatasetMetadataStore datasetMetadataStore;
@@ -69,7 +69,7 @@ public class BulkIngestApiTest {
   @BeforeEach
   public void bootstrapCluster() throws Exception {
     Tracing.newBuilder().build();
-    meterRegistry = new PrometheusMeterRegistry(PrometheusConfig.DEFAULT);
+    meterRegistry = new SimpleMeterRegistry();
 
     zkServer = TestingZKServer.createTestingServer();
     AstraConfigs.ZookeeperConfig zkConfig =