Fix breaking changes introduced in micrometer-commons

spring-projects · Mar 30, 2022 · 6fef82e · 6fef82e
1 parent 8191262
commit 6fef82e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
@@ -65,6 +65,11 @@
 			<artifactId>micrometer-observation</artifactId>
 			<version>${micrometer.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-commons</artifactId>
+			<version>${micrometer.version}</version>
+		</dependency>
 
 		<!-- optional production dependencies -->
 		<dependency>

diff --git a/...-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservation.java b/...-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservation.java
@@ -17,7 +17,7 @@
 package org.springframework.batch.core.observability;
 
 import io.micrometer.observation.docs.DocumentedObservation;
-import io.micrometer.observation.docs.TagKey;
+import io.micrometer.common.docs.TagKey;
 
 /**
  * Observation created around a Job execution.

diff --git a/...core/src/main/java/org/springframework/batch/core/observability/BatchStepObservation.java b/...core/src/main/java/org/springframework/batch/core/observability/BatchStepObservation.java
@@ -17,7 +17,7 @@
 package org.springframework.batch.core.observability;
 
 import io.micrometer.observation.docs.DocumentedObservation;
-import io.micrometer.observation.docs.TagKey;
+import io.micrometer.common.docs.TagKey;
 
 /**
  * Observation created around a step execution.

diff --git a/...c/main/java/org/springframework/batch/core/observability/DefaultBatchJobTagsProvider.java b/...c/main/java/org/springframework/batch/core/observability/DefaultBatchJobTagsProvider.java
@@ -15,14 +15,15 @@
  */
 package org.springframework.batch.core.observability;
 
-import io.micrometer.observation.Tags;
+import io.micrometer.common.Tags;
 
 import org.springframework.batch.core.JobExecution;
 
 /**
  * Default {@link BatchJobTagsProvider} implementation.
  *
  * @author Marcin Grzejszczak
+ * @author Mahmoud Ben Hassine
  * @since 5.0
  */
 public class DefaultBatchJobTagsProvider implements BatchJobTagsProvider {

diff --git a/.../main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java b/.../main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java
@@ -15,14 +15,15 @@
  */
 package org.springframework.batch.core.observability;
 
-import io.micrometer.observation.Tags;
+import io.micrometer.common.Tags;
 
 import org.springframework.batch.core.StepExecution;
 
 /**
  * Default {@link BatchStepTagsProvider} implementation.
  *
  * @author Marcin Grzejszczak
+ * @author Mahmoud Ben Hassine
  * @since 5.0
  */
 public class DefaultBatchStepTagsProvider implements BatchStepTagsProvider {