Updated Task to the latests snapshot of Micrometer

Updated to handle the batch changes

Removing aot execution from sample apps

Remove snapshot version and rely on bom

Signed-off-by: Glenn Renfro <grenfro@vmware.com>
This commit is contained in:
Glenn Renfro
2022-10-03 10:55:37 -04:00
parent b7b7de5337
commit 2ef93291fc
22 changed files with 57 additions and 147 deletions

View File

@@ -19,9 +19,9 @@ 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;
import io.micrometer.observation.docs.ObservationDocumentation;
enum TaskDocumentedObservation implements DocumentedObservation {
enum TaskDocumentedObservation implements ObservationDocumentation {
/**
* Observation created when a task runner is executed.

View File

@@ -16,6 +16,8 @@
package org.springframework.cloud.task.configuration.observation;
import java.util.function.Supplier;
import io.micrometer.observation.Observation;
/**
@@ -24,7 +26,7 @@ import io.micrometer.observation.Observation;
* @author Marcin Grzejszczak
* @since 3.0.0
*/
public class TaskObservationContext extends Observation.Context {
public class TaskObservationContext extends Observation.Context implements Supplier<TaskObservationContext> {
private final String beanName;
@@ -36,4 +38,9 @@ public class TaskObservationContext extends Observation.Context {
return beanName;
}
@Override
public TaskObservationContext get() {
return this;
}
}

View File

@@ -19,7 +19,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;
import io.micrometer.observation.docs.ObservationDocumentation;
/**
* Enumeration for task execution observations.
@@ -27,7 +27,7 @@ import io.micrometer.observation.docs.DocumentedObservation;
* @author Glenn Renfro
* @since 3.0.0
*/
public enum TaskExecutionObservation implements DocumentedObservation {
public enum TaskExecutionObservation implements ObservationDocumentation {
/**
* Metrics created around a task execution.

View File

@@ -16,6 +16,8 @@
package org.springframework.cloud.task.listener;
import java.util.function.Supplier;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationHandler;
@@ -27,7 +29,8 @@ import org.springframework.cloud.task.repository.TaskExecution;
* @author Glenn Renfro
* @since 3.0.0
*/
public class TaskExecutionObservationContext extends Observation.Context {
public class TaskExecutionObservationContext extends Observation.Context
implements Supplier<TaskExecutionObservationContext> {
private final TaskExecution taskExecution;
@@ -59,4 +62,9 @@ public class TaskExecutionObservationContext extends Observation.Context {
this.status = status;
}
@Override
public TaskExecutionObservationContext get() {
return this;
}
}

View File

@@ -51,6 +51,9 @@ import static org.springframework.cloud.task.listener.TaskObservations.UNKNOWN;
*/
public class TaskObservationsTests {
/**
* Prefix for the spring cloud task project.
*/
public static final String PREFIX = "spring.cloud.task";
private TaskObservations taskObservations;