Skip to content

Commit 4cb15ca

Browse files
committed
Fix breaking changes in micrometer APIs
Related to micrometer-metrics/micrometer#3310
1 parent 932e934 commit 4cb15ca

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ enum JobLowCardinalityTags implements KeyName {
6262
*/
6363
JOB_NAME {
6464
@Override
65-
public String getKeyName() {
65+
public String asString() {
6666
return "spring.batch.job.name";
6767
}
6868
},
@@ -72,7 +72,7 @@ public String getKeyName() {
7272
*/
7373
JOB_STATUS {
7474
@Override
75-
public String getKeyName() {
75+
public String asString() {
7676
return "spring.batch.job.status";
7777
}
7878
}
@@ -86,7 +86,7 @@ enum JobHighCardinalityTags implements KeyName {
8686
*/
8787
JOB_INSTANCE_ID {
8888
@Override
89-
public String getKeyName() {
89+
public String asString() {
9090
return "spring.batch.job.instanceId";
9191
}
9292
},
@@ -96,7 +96,7 @@ public String getKeyName() {
9696
*/
9797
JOB_EXECUTION_ID {
9898
@Override
99-
public String getKeyName() {
99+
public String asString() {
100100
return "spring.batch.job.executionId";
101101
}
102102
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ enum StepLowCardinalityTags implements KeyName {
6262
*/
6363
STEP_NAME {
6464
@Override
65-
public String getKeyName() {
65+
public String asString() {
6666
return "spring.batch.step.name";
6767
}
6868
},
@@ -72,7 +72,7 @@ public String getKeyName() {
7272
*/
7373
STEP_TYPE {
7474
@Override
75-
public String getKeyName() {
75+
public String asString() {
7676
return "spring.batch.step.type";
7777
}
7878
},
@@ -82,7 +82,7 @@ public String getKeyName() {
8282
*/
8383
JOB_NAME {
8484
@Override
85-
public String getKeyName() {
85+
public String asString() {
8686
return "spring.batch.step.job.name";
8787
}
8888
},
@@ -92,7 +92,7 @@ public String getKeyName() {
9292
*/
9393
STEP_STATUS {
9494
@Override
95-
public String getKeyName() {
95+
public String asString() {
9696
return "spring.batch.step.status";
9797
}
9898
}
@@ -106,7 +106,7 @@ enum StepHighCardinalityTags implements KeyName {
106106
*/
107107
STEP_EXECUTION_ID {
108108
@Override
109-
public String getKeyName() {
109+
public String asString() {
110110
return "spring.batch.step.executionId";
111111
}
112112
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,19 @@ public class DefaultBatchJobObservationConvention implements BatchJobObservation
3232
public KeyValues getLowCardinalityKeyValues(BatchJobContext context) {
3333
JobExecution execution = context.getJobExecution();
3434
return KeyValues.of(
35-
BatchJobObservation.JobLowCardinalityTags.JOB_NAME.of(execution.getJobInstance().getJobName()),
36-
BatchJobObservation.JobLowCardinalityTags.JOB_STATUS.of(execution.getExitStatus().getExitCode()));
35+
BatchJobObservation.JobLowCardinalityTags.JOB_NAME.withValue(execution.getJobInstance().getJobName()),
36+
BatchJobObservation.JobLowCardinalityTags.JOB_STATUS
37+
.withValue(execution.getExitStatus().getExitCode()));
3738
}
3839

3940
@Override
4041
public KeyValues getHighCardinalityKeyValues(BatchJobContext context) {
4142
JobExecution execution = context.getJobExecution();
4243
return KeyValues.of(
4344
BatchJobObservation.JobHighCardinalityTags.JOB_INSTANCE_ID
44-
.of(String.valueOf(execution.getJobInstance().getInstanceId())),
45-
BatchJobObservation.JobHighCardinalityTags.JOB_EXECUTION_ID.of(String.valueOf(execution.getId())));
45+
.withValue(String.valueOf(execution.getJobInstance().getInstanceId())),
46+
BatchJobObservation.JobHighCardinalityTags.JOB_EXECUTION_ID
47+
.withValue(String.valueOf(execution.getId())));
4648
}
4749

4850
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,18 @@ public class DefaultBatchStepObservationConvention implements BatchStepObservati
3131
@Override
3232
public KeyValues getLowCardinalityKeyValues(BatchStepContext context) {
3333
StepExecution execution = context.getStepExecution();
34-
return KeyValues.of(BatchStepObservation.StepLowCardinalityTags.STEP_NAME.of(execution.getStepName()),
34+
return KeyValues.of(BatchStepObservation.StepLowCardinalityTags.STEP_NAME.withValue(execution.getStepName()),
3535
BatchStepObservation.StepLowCardinalityTags.JOB_NAME
36-
.of(execution.getJobExecution().getJobInstance().getJobName()),
37-
BatchStepObservation.StepLowCardinalityTags.STEP_STATUS.of(execution.getExitStatus().getExitCode()));
36+
.withValue(execution.getJobExecution().getJobInstance().getJobName()),
37+
BatchStepObservation.StepLowCardinalityTags.STEP_STATUS
38+
.withValue(execution.getExitStatus().getExitCode()));
3839
}
3940

4041
@Override
4142
public KeyValues getHighCardinalityKeyValues(BatchStepContext context) {
4243
StepExecution execution = context.getStepExecution();
43-
return KeyValues.of(
44-
BatchStepObservation.StepHighCardinalityTags.STEP_EXECUTION_ID.of(String.valueOf(execution.getId())));
44+
return KeyValues.of(BatchStepObservation.StepHighCardinalityTags.STEP_EXECUTION_ID
45+
.withValue(String.valueOf(execution.getId())));
4546
}
4647

4748
}

0 commit comments

Comments
 (0)