SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated to handle ObservationConvention migration

Browse Source
This commit is contained in:
Glenn Renfro
2022-09-09 17:43:59 -04:00
parent 87632b3487
commit f30ac7e5b3
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskDocumentedObservation.java
View File

@@ -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<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
return DefaultTaskObservationConvention.class;
}

5
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskObservationConvention.java
View File

@@ -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<TaskObservationContext> {
public interface TaskObservationConvention extends ObservationConvention<TaskObservationContext> {
@Override
default boolean supportsContext(Observation.Context context) {

3
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservation.java
View File

@@ -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<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
return DefaultTaskExecutionObservationConvention.class;
}

6
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservationConvention.java
View File

@@ -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<TaskExecutionObservationContext> {
public interface TaskExecutionObservationConvention extends ObservationConvention<TaskExecutionObservationContext> {
@Override
default boolean supportsContext(Observation.Context context) {

4
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java
View File

@@ -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<TaskExecutionListener> taskExecutionListenersFromContext;
@Autowired(required = false)
private Observation.ObservationConvention observationConvention;
private ObservationConvention observationConvention;
private List<TaskExecutionListener> taskExecutionListeners;

5
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskObservations.java
View File

@@ -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;