From f30ac7e5b3c7466325b76a4d8fac1aa5108cb0a6 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 9 Sep 2022 17:43:59 -0400 Subject: [PATCH] Updated to handle ObservationConvention migration --- .../observation/TaskDocumentedObservation.java | 3 ++- .../observation/TaskObservationConvention.java | 5 +++-- .../cloud/task/listener/TaskExecutionObservation.java | 3 ++- .../task/listener/TaskExecutionObservationConvention.java | 6 +++--- .../cloud/task/listener/TaskLifecycleListener.java | 4 ++-- .../cloud/task/listener/TaskObservations.java | 5 +++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskDocumentedObservation.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskDocumentedObservation.java index c81c9a57..7078e4fe 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskDocumentedObservation.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskDocumentedObservation.java @@ -18,6 +18,7 @@ package org.springframework.cloud.task.configuration.observation; import io.micrometer.common.docs.KeyName; import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationConvention; import io.micrometer.observation.docs.DocumentedObservation; enum TaskDocumentedObservation implements DocumentedObservation { @@ -28,7 +29,7 @@ enum TaskDocumentedObservation implements DocumentedObservation { TASK_RUNNER_OBSERVATION { @Override - public Class> getDefaultConvention() { + public Class> getDefaultConvention() { return DefaultTaskObservationConvention.class; } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskObservationConvention.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskObservationConvention.java index f826419c..2c81d231 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskObservationConvention.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskObservationConvention.java @@ -17,14 +17,15 @@ package org.springframework.cloud.task.configuration.observation; import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationConvention; /** - * {@link Observation.ObservationConvention} for Spring Cloud Task. + * {@link ObservationConvention} for Spring Cloud Task. * * @author Marcin Grzejszczak * @since 3.0.0 */ -public interface TaskObservationConvention extends Observation.ObservationConvention { +public interface TaskObservationConvention extends ObservationConvention { @Override default boolean supportsContext(Observation.Context context) { diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservation.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservation.java index fc59b1dd..a5772067 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservation.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservation.java @@ -18,6 +18,7 @@ package org.springframework.cloud.task.listener; import io.micrometer.common.docs.KeyName; import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationConvention; import io.micrometer.observation.docs.DocumentedObservation; /** @@ -34,7 +35,7 @@ public enum TaskExecutionObservation implements DocumentedObservation { TASK_ACTIVE { @Override - public Class> getDefaultConvention() { + public Class> getDefaultConvention() { return DefaultTaskExecutionObservationConvention.class; } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservationConvention.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservationConvention.java index fc4525bf..67c400c9 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservationConvention.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservationConvention.java @@ -17,15 +17,15 @@ package org.springframework.cloud.task.listener; import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationConvention; /** - * {@link Observation.ObservationConvention} for {@link TaskExecutionObservationContext}. + * {@link ObservationConvention} for {@link TaskExecutionObservationContext}. * * @author Glenn Renfro * @since 3.0.0 */ -public interface TaskExecutionObservationConvention - extends Observation.ObservationConvention { +public interface TaskExecutionObservationConvention extends ObservationConvention { @Override default boolean supportsContext(Observation.Context context) { diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java index 925b0cba..fea00dd3 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java @@ -26,7 +26,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationConvention; import io.micrometer.observation.ObservationRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -100,7 +100,7 @@ public class TaskLifecycleListener private Collection taskExecutionListenersFromContext; @Autowired(required = false) - private Observation.ObservationConvention observationConvention; + private ObservationConvention observationConvention; private List taskExecutionListeners; diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskObservations.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskObservations.java index fb28ceca..ce8699eb 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskObservations.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskObservations.java @@ -17,6 +17,7 @@ package org.springframework.cloud.task.listener; import io.micrometer.observation.Observation; +import io.micrometer.observation.ObservationConvention; import io.micrometer.observation.ObservationRegistry; import org.springframework.cloud.task.configuration.TaskObservationCloudKeyValues; @@ -49,11 +50,11 @@ public class TaskObservations { private ObservationRegistry observationRegistry; - private Observation.ObservationConvention customObservationConvention; + private ObservationConvention customObservationConvention; public TaskObservations(ObservationRegistry observationRegistry, TaskObservationCloudKeyValues taskObservationCloudKeyValues, - Observation.ObservationConvention customObservationConvention) { + ObservationConvention customObservationConvention) { this.observationRegistry = observationRegistry; this.taskObservationCloudKeyValues = taskObservationCloudKeyValues; this.customObservationConvention = customObservationConvention;