From 6fef82eff75cf25235b70cf4509c4dc5d8978ea2 Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@vmware.com>
Date: Wed, 30 Mar 2022 10:25:01 +0200
Subject: [PATCH] Fix breaking changes introduced in micrometer-commons

---
 spring-batch-core/pom.xml                                    | 5 +++++
 .../batch/core/observability/BatchJobObservation.java        | 2 +-
 .../batch/core/observability/BatchStepObservation.java       | 2 +-
 .../core/observability/DefaultBatchJobTagsProvider.java      | 3 ++-
 .../core/observability/DefaultBatchStepTagsProvider.java     | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index d7e292766..98818c215 100644
--- 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/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservation.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservation.java
index 9948dcf3b..66621c2ca 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservation.java
+++ b/spring-batch-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/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepObservation.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepObservation.java
index 236a122f0..51b9e963d 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepObservation.java
+++ b/spring-batch-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/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobTagsProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobTagsProvider.java
index a0b186b96..15754faa4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobTagsProvider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobTagsProvider.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.observability;
 
-import io.micrometer.observation.Tags;
+import io.micrometer.common.Tags;
 
 import org.springframework.batch.core.JobExecution;
 
@@ -23,6 +23,7 @@ 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/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java
index ac3af0f7d..4f6e83600 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepTagsProvider.java
@@ -15,7 +15,7 @@
  */
 package org.springframework.batch.core.observability;
 
-import io.micrometer.observation.Tags;
+import io.micrometer.common.Tags;
 
 import org.springframework.batch.core.StepExecution;
 
@@ -23,6 +23,7 @@ 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 {