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

Updated Observation code to use the updates offered by the Micrometer snapshot

Browse Source
This commit is contained in:
Glenn Renfro
2022-08-30 14:28:54 -04:00
parent e4581420b0
commit 3609e53751
13 changed files with 84 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ public class DefaultTaskObservationConvention implements TaskObservationConventi
@Override
public KeyValues getLowCardinalityKeyValues(TaskObservationContext context) {
return KeyValues.of(TaskDocumentedObservation.TaskRunnerTags.BEAN_NAME.of(context.getBeanName()));
return KeyValues.of(TaskDocumentedObservation.TaskRunnerTags.BEAN_NAME.withValue(context.getBeanName()));
}
@Override

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

@@ -53,7 +53,7 @@ enum TaskDocumentedObservation implements DocumentedObservation {
*/
BEAN_NAME {
@Override
public String getKeyName() {
public String asString() {
return "spring.cloud.task.runner.bean-name";
}
}

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

@@ -40,10 +40,10 @@ public class DefaultTaskExecutionObservationConvention implements TaskExecutionO
private KeyValues getKeyValuesForTaskExecution(TaskExecutionObservationContext context) {
TaskExecution execution = context.getTaskExecution();
return KeyValues.of(TaskExecutionObservation.TaskKeyValues.TASK_STATUS.getKeyName(), context.getStatus(),
TaskExecutionObservation.TaskKeyValues.TASK_EXIT_CODE.getKeyName(),
return KeyValues.of(TaskExecutionObservation.TaskKeyValues.TASK_STATUS.asString(), context.getStatus(),
TaskExecutionObservation.TaskKeyValues.TASK_EXIT_CODE.asString(),
String.valueOf(execution.getExitCode()),
TaskExecutionObservation.TaskKeyValues.TASK_EXECUTION_ID.getKeyName(),
TaskExecutionObservation.TaskKeyValues.TASK_EXECUTION_ID.asString(),
String.valueOf(execution.getExecutionId()));
}

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

@@ -54,8 +54,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
* Task name measurement.
*/
TASK_NAME {
@Override
public String getKeyName() {
public String asString() {
return "spring.cloud.task.name";
}
},
@@ -65,7 +64,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_EXECUTION_ID {
@Override
public String getKeyName() {
public String asString() {
return "spring.cloud.task.execution.id";
}
},
@@ -75,7 +74,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_PARENT_EXECUTION_ID {
@Override
public String getKeyName() {
public String asString() {
return "spring.cloud.task.parent.execution.id";
}
},
@@ -85,7 +84,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_EXTERNAL_EXECUTION_ID {
@Override
public String getKeyName() {
public String asString() {
return "spring.cloud.task.external.execution.id";
}
},
@@ -94,7 +93,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_EXIT_CODE {
@Override
public String getKeyName() {
public String asString() {
return "spring.cloud.task.exit.code";
}
},
@@ -104,7 +103,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_STATUS {
@Override
public String getKeyName() {
public String asString() {
return "spring.cloud.task.status";
}
},
@@ -114,7 +113,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_CF_ORG_NAME {
@Override
public String getKeyName() {
public String asString() {
return "cf.org.name";
}
},
@@ -124,7 +123,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_CF_SPACE_ID {
@Override
public String getKeyName() {
public String asString() {
return "cf.space.id";
}
},
@@ -134,7 +133,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_CF_SPACE_NAME {
@Override
public String getKeyName() {
public String asString() {
return "cf.space.name";
}
},
@@ -144,7 +143,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_CF_APP_NAME {
@Override
public String getKeyName() {
public String asString() {
return "cf.app.name";
}
},
@@ -154,7 +153,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_CF_APP_ID {
@Override
public String getKeyName() {
public String asString() {
return "cf.app.id";
}
},
@@ -164,7 +163,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_CF_APP_VERSION {
@Override
public String getKeyName() {
public String asString() {
return "cf.app.version";
}
},
@@ -174,7 +173,7 @@ public enum TaskExecutionObservation implements DocumentedObservation {
*/
TASK_CF_INSTANCE_INDEX {
@Override
public String getKeyName() {
public String asString() {
return "cf.instance.index";
}
}

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

@@ -75,31 +75,30 @@ public class TaskObservations {
.observation(this.customObservationConvention, new DefaultTaskExecutionObservationConvention(),
this.taskObservationContext, this.observationRegistry)
.contextualName(String.valueOf(taskExecution.getExecutionId()))
.keyValuesProvider(this.observationsProvider)
.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_NAME.getKeyName(),
.observationConvention(this.observationsProvider)
.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_NAME.asString(),
getValueOrDefault(taskExecution.getTaskName()))
.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_EXECUTION_ID.getKeyName(),
.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_EXECUTION_ID.asString(),
"" + taskExecution.getExecutionId())
.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_PARENT_EXECUTION_ID.getKeyName(),
.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_PARENT_EXECUTION_ID.asString(),
(getValueOrDefault(taskExecution.getParentExecutionId())))
.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_EXTERNAL_EXECUTION_ID.getKeyName(),
.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_EXTERNAL_EXECUTION_ID.asString(),
(getValueOrDefault(taskExecution.getExternalExecutionId())));
if (taskObservationCloudKeyValues != null) {
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_ORG_NAME.getKeyName(),
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_ORG_NAME.asString(),
this.taskObservationCloudKeyValues.getOrganizationName());
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_SPACE_ID.getKeyName(),
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_SPACE_ID.asString(),
this.taskObservationCloudKeyValues.getSpaceId());
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_SPACE_NAME.getKeyName(),
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_SPACE_NAME.asString(),
this.taskObservationCloudKeyValues.getSpaceName());
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_APP_ID.getKeyName(),
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_APP_ID.asString(),
this.taskObservationCloudKeyValues.getApplicationId());
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_APP_NAME.getKeyName(),
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_APP_NAME.asString(),
this.taskObservationCloudKeyValues.getApplicationName());
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_APP_VERSION.getKeyName(),
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_APP_VERSION.asString(),
this.taskObservationCloudKeyValues.getApplicationVersion());
observation.lowCardinalityKeyValue(
TaskExecutionObservation.TaskKeyValues.TASK_CF_INSTANCE_INDEX.getKeyName(),
observation.lowCardinalityKeyValue(TaskExecutionObservation.TaskKeyValues.TASK_CF_INSTANCE_INDEX.asString(),
this.taskObservationCloudKeyValues.getInstanceIndex());
}
observation.start();