Skip to content

Commit 2ef9329

Browse files
cppwfscppwfs
committed
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 <[email protected]>
1 parent b7b7de5 commit 2ef9329

File tree

22 files changed

+57
-147
lines changed

22 files changed

+57
-147
lines changed

‎spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/handler/TaskJobLauncherApplicationRunner.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ private void throwJobFailedException(List<JobExecution> failedJobExecutions) {
197197
}
198198

199199
private JobParameters removeNonIdentifying(JobParameters parameters) {
200-
Map<String, JobParameter> parameterMap = parameters.getParameters();
201-
HashMap<String, JobParameter> copy = new HashMap<>();
200+
Map<String, JobParameter<?>> parameterMap = parameters.getParameters();
201+
HashMap<String, JobParameter<?>> copy = new HashMap<>();
202202

203-
for (Map.Entry<String, JobParameter> parameter : parameterMap.entrySet()) {
203+
for (Map.Entry<String, JobParameter<?>> parameter : parameterMap.entrySet()) {
204204
if (parameter.getValue().isIdentifying()) {
205205
copy.put(parameter.getKey(), parameter.getValue());
206206
}
@@ -215,7 +215,7 @@ private boolean isStoppedOrFailed(JobExecution execution) {
215215
}
216216

217217
private JobParameters merge(JobParameters parameters, JobParameters additionals) {
218-
Map<String, JobParameter> merged = new HashMap<>();
218+
Map<String, JobParameter<?>> merged = new HashMap<>();
219219
merged.putAll(parameters.getParameters());
220220
merged.putAll(additionals.getParameters());
221221
return new JobParameters(merged);

‎spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskDocumentedObservation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import io.micrometer.common.docs.KeyName;
2020
import io.micrometer.observation.Observation;
2121
import io.micrometer.observation.ObservationConvention;
22-
import io.micrometer.observation.docs.DocumentedObservation;
22+
import io.micrometer.observation.docs.ObservationDocumentation;
2323

24-
enum TaskDocumentedObservation implements DocumentedObservation {
24+
enum TaskDocumentedObservation implements ObservationDocumentation {
2525

2626
/**
2727
* Observation created when a task runner is executed.

‎spring-cloud-task-core/src/main/java/org/springframework/cloud/task/configuration/observation/TaskObservationContext.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.cloud.task.configuration.observation;
1818

19+
import java.util.function.Supplier;
20+
1921
import io.micrometer.observation.Observation;
2022

2123
/**
@@ -24,7 +26,7 @@
2426
* @author Marcin Grzejszczak
2527
* @since 3.0.0
2628
*/
27-
public class TaskObservationContext extends Observation.Context {
29+
public class TaskObservationContext extends Observation.Context implements Supplier<TaskObservationContext> {
2830

2931
private final String beanName;
3032

@@ -36,4 +38,9 @@ public String getBeanName() {
3638
return beanName;
3739
}
3840

41+
@Override
42+
public TaskObservationContext get() {
43+
return this;
44+
}
45+
3946
}

‎spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import io.micrometer.common.docs.KeyName;
2020
import io.micrometer.observation.Observation;
2121
import io.micrometer.observation.ObservationConvention;
22-
import io.micrometer.observation.docs.DocumentedObservation;
22+
import io.micrometer.observation.docs.ObservationDocumentation;
2323

2424
/**
2525
* Enumeration for task execution observations.
2626
*
2727
* @author Glenn Renfro
2828
* @since 3.0.0
2929
*/
30-
public enum TaskExecutionObservation implements DocumentedObservation {
30+
public enum TaskExecutionObservation implements ObservationDocumentation {
3131

3232
/**
3333
* Metrics created around a task execution.

‎spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskExecutionObservationContext.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.cloud.task.listener;
1818

19+
import java.util.function.Supplier;
20+
1921
import io.micrometer.observation.Observation;
2022
import io.micrometer.observation.ObservationHandler;
2123

@@ -27,7 +29,8 @@
2729
* @author Glenn Renfro
2830
* @since 3.0.0
2931
*/
30-
public class TaskExecutionObservationContext extends Observation.Context {
32+
public class TaskExecutionObservationContext extends Observation.Context
33+
implements Supplier<TaskExecutionObservationContext> {
3134

3235
private final TaskExecution taskExecution;
3336

@@ -59,4 +62,9 @@ public void setStatus(String status) {
5962
this.status = status;
6063
}
6164

65+
@Override
66+
public TaskExecutionObservationContext get() {
67+
return this;
68+
}
69+
6270
}

‎spring-cloud-task-core/src/test/java/org/springframework/cloud/task/micrometer/TaskObservationsTests.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
*/
5252
public class TaskObservationsTests {
5353

54+
/**
55+
* Prefix for the spring cloud task project.
56+
*/
5457
public static final String PREFIX = "spring.cloud.task";
5558

5659
private TaskObservations taskObservations;

‎spring-cloud-task-samples/batch-events/pom.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.0.0-M5</version>
16+
<version>3.0.0-SNAPSHOT</version>
1717
<relativePath />
1818
</parent>
1919

@@ -96,14 +96,6 @@
9696
<plugin>
9797
<groupId>org.springframework.boot</groupId>
9898
<artifactId>spring-boot-maven-plugin</artifactId>
99-
<executions>
100-
<execution>
101-
<id>process-aot</id>
102-
<goals>
103-
<goal>process-aot</goal>
104-
</goals>
105-
</execution>
106-
</executions>
10799
</plugin>
108100
<plugin>
109101
<groupId>org.apache.maven.plugins</groupId>

‎spring-cloud-task-samples/batch-job/pom.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.0.0-M5</version>
16+
<version>3.0.0-SNAPSHOT</version>
1717
<relativePath />
1818
</parent>
1919

@@ -109,14 +109,6 @@
109109
<plugin>
110110
<groupId>org.springframework.boot</groupId>
111111
<artifactId>spring-boot-maven-plugin</artifactId>
112-
<executions>
113-
<execution>
114-
<id>process-aot</id>
115-
<goals>
116-
<goal>process-aot</goal>
117-
</goals>
118-
</execution>
119-
</executions>
120112
</plugin>
121113
<plugin>
122114
<groupId>org.apache.maven.plugins</groupId>

‎spring-cloud-task-samples/jpa-sample/pom.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>3.0.0-M5</version>
16+
<version>3.0.0-SNAPSHOT</version>
1717
<relativePath />
1818
</parent>
1919

@@ -111,14 +111,6 @@
111111
<plugin>
112112
<groupId>org.springframework.boot</groupId>
113113
<artifactId>spring-boot-maven-plugin</artifactId>
114-
<executions>
115-
<execution>
116-
<id>process-aot</id>
117-
<goals>
118-
<goal>process-aot</goal>
119-
</goals>
120-
</execution>
121-
</executions>
122114
</plugin>
123115
<plugin>
124116
<groupId>org.apache.maven.plugins</groupId>

‎spring-cloud-task-samples/multiple-datasources/pom.xml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>3.0.0-M5</version>
17+
<version>3.0.0-SNAPSHOT</version>
1818
<relativePath />
1919
</parent>
2020

@@ -116,14 +116,6 @@
116116
<plugin>
117117
<groupId>org.springframework.boot</groupId>
118118
<artifactId>spring-boot-maven-plugin</artifactId>
119-
<executions>
120-
<execution>
121-
<id>process-aot</id>
122-
<goals>
123-
<goal>process-aot</goal>
124-
</goals>
125-
</execution>
126-
</executions>
127119
</plugin>
128120
<plugin>
129121
<groupId>org.apache.maven.plugins</groupId>

0 commit comments

Comments
 (0)