ReApply "Adapt observability code to latest changes in Micrometer"

This reverts commit a774fac.

Author: fmbenhassine

spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchJobContext.java

@@ -20,13 +20,15 @@
 
 import org.springframework.batch.core.JobExecution;
 
+import java.util.function.Supplier;
+
 /**
  * Observation context for batch jobs.
  *
  * @author Marcin Grzejszczak
  * @since 5.0
  */
-public class BatchJobContext extends Observation.Context {
+public class BatchJobContext extends Observation.Context implements Supplier<BatchJobContext> {
 
 	private final JobExecution jobExecution;
 
@@ -38,4 +40,9 @@ public JobExecution getJobExecution() {
 		return jobExecution;
 	}
 
+	@Override
+	public BatchJobContext get() {
+		return this;
+	}
+
 }

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.common.docs.KeyName;
-import io.micrometer.observation.docs.DocumentedObservation;
+import io.micrometer.observation.docs.ObservationDocumentation;
 
 /**
  * Observation created around a Job execution.
@@ -26,7 +26,7 @@
  * @author Mahmoud Ben Hassine
  * @since 5.0
  */
-public enum BatchJobObservation implements DocumentedObservation {
+public enum BatchJobObservation implements ObservationDocumentation {
 
 	BATCH_JOB_OBSERVATION {
 		@Override

spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java

@@ -90,11 +90,27 @@ public static Timer createTimer(String name, String description, Tag... tags) {
 	 * {@code Metrics.globalRegistry.withTimerObservationHandler()} in the user code.
 	 * Otherwise you won't observe any metrics.
 	 * @param name of the observation
-	 * @param context of the observation
+	 * @param context of the batch job observation
 	 * @return a new observation instance
 	 * @since 5.0
 	 */
-	public static Observation createObservation(String name, Observation.Context context) {
+	public static Observation createObservation(String name, BatchJobContext context) {
+		return Observation.createNotStarted(name, context, observationRegistry);
+	}
+
+	/**
+	 * Create a new {@link Observation}. It's not started, you must explicitly call
+	 * {@link Observation#start()} to start it.
+	 *
+	 * Remember to register the {@link DefaultMeterObservationHandler} via the
+	 * {@code Metrics.globalRegistry.withTimerObservationHandler()} in the user code.
+	 * Otherwise you won't observe any metrics.
+	 * @param name of the observation
+	 * @param context of the observation step context
+	 * @return a new observation instance
+	 * @since 5.0
+	 */
+	public static Observation createObservation(String name, BatchStepContext context) {
 		return Observation.createNotStarted(name, context, observationRegistry);
 	}
 

spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchStepContext.java

@@ -20,13 +20,15 @@
 
 import org.springframework.batch.core.StepExecution;
 
+import java.util.function.Supplier;
+
 /**
  * Observation context for batch steps.
  *
  * @author Marcin Grzejszczak
  * @since 5.0
  */
-public class BatchStepContext extends Observation.Context {
+public class BatchStepContext extends Observation.Context implements Supplier<BatchStepContext> {
 
 	private final StepExecution stepExecution;
 
@@ -38,4 +40,9 @@ public StepExecution getStepExecution() {
 		return stepExecution;
 	}
 
+	@Override
+	public BatchStepContext get() {
+		return this;
+	}
+
 }

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.common.docs.KeyName;
-import io.micrometer.observation.docs.DocumentedObservation;
+import io.micrometer.observation.docs.ObservationDocumentation;
 
 /**
  * Observation created around a step execution.
@@ -26,7 +26,7 @@
  * @author Mahmoud Ben Hassine
  * @since 5.0
  */
-public enum BatchStepObservation implements DocumentedObservation {
+public enum BatchStepObservation implements ObservationDocumentation {
 
 	BATCH_STEP_OBSERVATION {
 		@Override