From f20942e3683fc06025b62a85c845c45a33c80cc1 Mon Sep 17 00:00:00 2001
From: Tommy Ludwig <8924140+shakuzen@users.noreply.github.com>
Date: Fri, 9 Sep 2022 17:34:58 +0900
Subject: [PATCH] Adapt to ObservationConvention location change

See https://github.com/micrometer-metrics/micrometer/pull/3387
---
 .../core/observability/BatchJobObservationConvention.java    | 5 +++--
 .../core/observability/BatchStepObservationConvention.java   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservationConvention.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservationConvention.java
index b6e20047f..52521f43e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservationConvention.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobObservationConvention.java
@@ -17,15 +17,16 @@
 package org.springframework.batch.core.observability;
 
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 
 /**
- * {@link Observation.ObservationConvention} for {@link BatchJobContext}.
+ * {@link ObservationConvention} for {@link BatchJobContext}.
  *
  * @author Marcin Grzejszczak
  * @author Mahmoud Ben Hassine
  * @since 5.0
  */
-public interface BatchJobObservationConvention extends Observation.ObservationConvention<BatchJobContext> {
+public interface BatchJobObservationConvention extends ObservationConvention<BatchJobContext> {
 
 	@Override
 	default boolean supportsContext(Observation.Context context) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepObservationConvention.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepObservationConvention.java
index bb1f812fd..00ac6ad04 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepObservationConvention.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepObservationConvention.java
@@ -17,15 +17,16 @@
 package org.springframework.batch.core.observability;
 
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 
 /**
- * {@link Observation.ObservationConvention} for {@link BatchStepContext}.
+ * {@link ObservationConvention} for {@link BatchStepContext}.
  *
  * @author Marcin Grzejszczak
  * @author Mahmoud Ben Hassine
  * @since 5.0
  */
-public interface BatchStepObservationConvention extends Observation.ObservationConvention<BatchStepContext> {
+public interface BatchStepObservationConvention extends ObservationConvention<BatchStepContext> {
 
 	@Override
 	default boolean supportsContext(Observation.Context context) {