Revert Micrometer Upgrade to M2

Resolves #2126 This reverts commit f51ddd4.
spring-projects · Feb 22, 2022 · b198c5b · b198c5b
1 parent 10e310c
commit b198c5b
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,7 +66,7 @@ ext {
 	junitJupiterVersion = '5.8.2'
 	kafkaVersion = '3.1.0'
 	log4jVersion = '2.17.1'
-	micrometerVersion = '2.0.0-M2'
+	micrometerVersion = '2.0.0-M1'
 	mockitoVersion = '4.0.0'
 	reactorVersion = '2020.0.16'
 	scalaVersion = '2.13'

diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerConsumerListener.java b/spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerConsumerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
 
 import org.apache.kafka.clients.consumer.Consumer;
 
-import io.micrometer.api.instrument.ImmutableTag;
-import io.micrometer.api.instrument.MeterRegistry;
-import io.micrometer.api.instrument.Tag;
+import io.micrometer.core.instrument.ImmutableTag;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 
 /**

diff --git a/spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerProducerListener.java b/spring-kafka/src/main/java/org/springframework/kafka/core/MicrometerProducerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
 
 import org.apache.kafka.clients.producer.Producer;
 
-import io.micrometer.api.instrument.ImmutableTag;
-import io.micrometer.api.instrument.MeterRegistry;
-import io.micrometer.api.instrument.Tag;
+import io.micrometer.core.instrument.ImmutableTag;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
 
 /**

diff --git a/...kafka/src/main/java/org/springframework/kafka/streams/KafkaStreamsMicrometerListener.java b/...kafka/src/main/java/org/springframework/kafka/streams/KafkaStreamsMicrometerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@
 
 import org.springframework.kafka.config.StreamsBuilderFactoryBean;
 
-import io.micrometer.api.instrument.ImmutableTag;
-import io.micrometer.api.instrument.MeterRegistry;
-import io.micrometer.api.instrument.Tag;
+import io.micrometer.core.instrument.ImmutableTag;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.binder.kafka.KafkaStreamsMetrics;
 
 /**

diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/KafkaUtils.java b/spring-kafka/src/main/java/org/springframework/kafka/support/KafkaUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ public final class KafkaUtils {
 	 * True if micrometer is on the class path.
 	 */
 	public static final boolean MICROMETER_PRESENT = ClassUtils.isPresent(
-			"io.micrometer.api.instrument.MeterRegistry", KafkaUtils.class.getClassLoader());
+			"io.micrometer.core.instrument.MeterRegistry", KafkaUtils.class.getClassLoader());
 
 	private static final ThreadLocal<String> GROUP_IDS = new ThreadLocal<>();
 

diff --git a/...ng-kafka/src/main/java/org/springframework/kafka/support/micrometer/MicrometerHolder.java b/...ng-kafka/src/main/java/org/springframework/kafka/support/micrometer/MicrometerHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,10 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.lang.Nullable;
 
-import io.micrometer.api.instrument.MeterRegistry;
-import io.micrometer.api.instrument.Timer;
-import io.micrometer.api.instrument.Timer.Builder;
-import io.micrometer.api.instrument.Timer.Sample;
-
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.Timer.Builder;
+import io.micrometer.core.instrument.Timer.Sample;
 
 /**
  * A wrapper for micrometer timers when available on the class path.

diff --git a/...kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java b/...kafka/src/test/java/org/springframework/kafka/annotation/EnableKafkaIntegrationTests.java
@@ -156,9 +156,9 @@
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 
-import io.micrometer.api.instrument.ImmutableTag;
-import io.micrometer.api.instrument.MeterRegistry;
-import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.core.instrument.ImmutableTag;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 
 /**
  * @author Gary Russell

diff --git a/spring-kafka/src/test/java/org/springframework/kafka/config/KafkaStreamsCustomizerTests.java b/spring-kafka/src/test/java/org/springframework/kafka/config/KafkaStreamsCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 the original author or authors.
+ * Copyright 2018-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,9 +51,9 @@
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
-import io.micrometer.api.instrument.ImmutableTag;
-import io.micrometer.api.instrument.MeterRegistry;
-import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.core.instrument.ImmutableTag;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 
 /**
  * @author Nurettin Yilmaz

diff --git a/...fka/src/test/java/org/springframework/kafka/support/micrometer/MicrometerHolderTests.java b/...fka/src/test/java/org/springframework/kafka/support/micrometer/MicrometerHolderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,9 +33,9 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import io.micrometer.api.instrument.MeterRegistry;
-import io.micrometer.api.instrument.Timer;
-import io.micrometer.api.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 
 /**
  * @author Vasyl Sarzhynskyi