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

Address breaking changs in observability

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-09-12 11:05:21 +02:00
parent 0abfeee528
commit cc47f0a271
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/DefaultFunctionTagsProvider.java
View File

@@ -21,6 +21,6 @@ import io.micrometer.common.KeyValues;
public class DefaultFunctionTagsProvider implements FunctionTagsProvider {
@Override
public KeyValues getLowCardinalityKeyValues(FunctionContext context) {
return KeyValues.of(FunctionObservation.FunctionLowCardinalityTags.FUNCTION_NAME.of(context.getTargetFunction().getFunctionDefinition()));
return KeyValues.of(FunctionObservation.FunctionLowCardinalityTags.FUNCTION_NAME.withValue(context.getTargetFunction().getFunctionDefinition()));
}
}

3
spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionObservation.java
View File

@@ -56,8 +56,7 @@ enum FunctionObservation implements DocumentedObservation {
* Name of the function.
*/
FUNCTION_NAME {
@Override
public String getKeyName() {
public String asString() {
return "spring.cloud.function.name";
}
}

5
spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionTagsProvider.java
View File

@@ -17,14 +17,15 @@
package org.springframework.cloud.function.observability;
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationConvention;
/**
* {@link Observation.KeyValuesProvider} for {@link FunctionContext}.
* {@link ObservationConvention} for {@link FunctionContext}.
*
* @author Marcin Grzejszczak
* @author Oleg Zhurakousky
*/
public interface FunctionTagsProvider extends Observation.KeyValuesProvider<FunctionContext> {
public interface FunctionTagsProvider extends ObservationConvention<FunctionContext> {
@Override
default boolean supportsContext(Observation.Context context) {

2
spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/ObservationFunctionAroundWrapper.java
View File

@@ -68,7 +68,7 @@ public class ObservationFunctionAroundWrapper extends FunctionAroundWrapper {
Object result = Observation
.createNotStarted(FunctionObservation.FUNCTION_OBSERVATION.getName(), context, this.observationRegistry)
.contextualName(FunctionObservation.FUNCTION_OBSERVATION.getContextualName())
.keyValuesProvider(tagsProvider)
//.keyValuesProvider(tagsProvider)
.observe(() -> {
Object r = message == null ? targetFunction.get() : targetFunction.apply(invocationMessage);
context.setModifiedOutput(r);