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

Polishing Observability changes

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-10-20 14:48:30 +02:00
parent 55aad155f8
commit eb63634c83
5 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-function-context/pom.xml
View File

@@ -147,6 +147,11 @@
<artifactId>micrometer-observation-test</artifactId> <artifactId>micrometer-observation-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-tracing-bridge-otel</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

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

@@ -43,6 +43,6 @@ public class DefaultFunctionObservationConvention implements FunctionObservation
@Override @Override
public String getContextualName(FunctionContext context) { public String getContextualName(FunctionContext context) {
return context.getTargetFunction().getFunctionDefinition(); return context.getTargetFunction().getFunctionDefinition() + " process";
} }
} }

7
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/observability/FunctionContext.java
View File

@@ -19,19 +19,24 @@ package org.springframework.cloud.function.observability;
import io.micrometer.observation.Observation; import io.micrometer.observation.Observation;
import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry;
import org.springframework.messaging.Message;
/** /**
* {@link Observation.Context} for function processing. * {@link Observation.Context} for function processing.
* *
* @author Marcin Grzejszczak * @author Marcin Grzejszczak
* @author Oleg Zhurakousky
* @since 4.0.0 * @since 4.0.0
*/ */
public class FunctionContext extends Observation.Context { public class FunctionContext extends Observation.Context {
private final SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction; private final SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction;
public FunctionContext(SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction) { private final Message<?> message;
public FunctionContext(SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction, Message<?> message) {
this.targetFunction = targetFunction; this.targetFunction = targetFunction;
this.message = message;
} }
public SimpleFunctionRegistry.FunctionInvocationWrapper getTargetFunction() { public SimpleFunctionRegistry.FunctionInvocationWrapper getTargetFunction() {

8
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/observability/ObservationAutoConfiguration.java
View File

@@ -36,7 +36,11 @@ public class ObservationAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnBean(ObservationRegistry.class) @ConditionalOnBean(ObservationRegistry.class)
public FunctionAroundWrapper observationFunctionAroundWrapper(ObservationRegistry registry, ObjectProvider<FunctionReceiverObservationConvention> functionReceiverObservationConvention, ObjectProvider<FunctionObservationConvention> functionObservationConvention, ObjectProvider<FunctionSenderObservationConvention> functionSenderObservationConvention) { public FunctionAroundWrapper observationFunctionAroundWrapper(ObservationRegistry registry,
return new ObservationFunctionAroundWrapper(registry, functionReceiverObservationConvention.getIfAvailable(() -> null), functionObservationConvention.getIfAvailable(() -> null), functionSenderObservationConvention.getIfAvailable(() -> null)); ObjectProvider<FunctionReceiverObservationConvention> functionReceiverObservationConvention,
ObjectProvider<FunctionObservationConvention> functionObservationConvention,
ObjectProvider<FunctionSenderObservationConvention> functionSenderObservationConvention) {
return new ObservationFunctionAroundWrapper(registry, functionReceiverObservationConvention.getIfAvailable(() -> null),
functionObservationConvention.getIfAvailable(() -> null), functionSenderObservationConvention.getIfAvailable(() -> null));
} }
} }

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

@@ -46,7 +46,8 @@ public class ObservationFunctionAroundWrapper extends FunctionAroundWrapper {
private final FunctionSenderObservationConvention functionSenderObservationConvention; private final FunctionSenderObservationConvention functionSenderObservationConvention;
public ObservationFunctionAroundWrapper(ObservationRegistry observationRegistry, @Nullable FunctionReceiverObservationConvention functionReceiverObservationConvention, @Nullable FunctionObservationConvention functionObservationConvention, @Nullable FunctionSenderObservationConvention functionSenderObservationConvention) { public ObservationFunctionAroundWrapper(ObservationRegistry observationRegistry, @Nullable FunctionReceiverObservationConvention functionReceiverObservationConvention,
@Nullable FunctionObservationConvention functionObservationConvention, @Nullable FunctionSenderObservationConvention functionSenderObservationConvention) {
this.observationRegistry = observationRegistry; this.observationRegistry = observationRegistry;
this.functionReceiverObservationConvention = functionReceiverObservationConvention; this.functionReceiverObservationConvention = functionReceiverObservationConvention;
this.functionObservationConvention = functionObservationConvention; this.functionObservationConvention = functionObservationConvention;
@@ -58,19 +59,19 @@ public class ObservationFunctionAroundWrapper extends FunctionAroundWrapper {
if (FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())) { if (FunctionTypeUtils.isCollectionOfMessage(targetFunction.getOutputType())) {
return targetFunction.apply(message); // no instrumentation return targetFunction.apply(message); // no instrumentation
} }
return nonReactorStream(message, targetFunction); return nonReactorStream((Message<?>) message, targetFunction);
} }
private Object nonReactorStream(Object message, private Object nonReactorStream(Message<?> message,
SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction) { SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction) {
if (targetFunction.isConsumer()) { if (targetFunction.isConsumer()) {
Observation observationOfInputMessage = stoppedObservationOfInputMessage(message, targetFunction); Observation observationOfInputMessage = stoppedObservationOfInputMessage(message, targetFunction);
Observation consumerObservation = consumerObservation(targetFunction, observationOfInputMessage); Observation consumerObservation = consumerObservation(targetFunction, observationOfInputMessage, message);
return consumerObservation.observe(() -> targetFunction.apply(message)); return consumerObservation.observe(() -> targetFunction.apply(message));
} }
else if (targetFunction.isFunction()) { else if (targetFunction.isFunction()) {
Observation observationOfInputMessage = stoppedObservationOfInputMessage(message, targetFunction); Observation observationOfInputMessage = stoppedObservationOfInputMessage(message, targetFunction);
Observation consumerObservation = consumerObservation(targetFunction, observationOfInputMessage); Observation consumerObservation = consumerObservation(targetFunction, observationOfInputMessage, message);
Object outputMessage = consumerObservation.observe(() -> targetFunction.apply(message)); Object outputMessage = consumerObservation.observe(() -> targetFunction.apply(message));
if (isNonNullMessageType(outputMessage)) { if (isNonNullMessageType(outputMessage)) {
return outputMessage; // no instrumentation return outputMessage; // no instrumentation
@@ -78,7 +79,7 @@ public class ObservationFunctionAroundWrapper extends FunctionAroundWrapper {
return observeOutputMessage(outputMessage, targetFunction, consumerObservation); return observeOutputMessage(outputMessage, targetFunction, consumerObservation);
} }
else { else {
Object supplierOutputMessage = functionProcessingObservation(targetFunction).observe(targetFunction::get); Object supplierOutputMessage = functionProcessingObservation(targetFunction, message).observe(targetFunction::get);
if (isNonNullMessageType(supplierOutputMessage)) { if (isNonNullMessageType(supplierOutputMessage)) {
return supplierOutputMessage; // no instrumentation return supplierOutputMessage; // no instrumentation
} }
@@ -86,12 +87,12 @@ public class ObservationFunctionAroundWrapper extends FunctionAroundWrapper {
} }
} }
private Observation functionProcessingObservation(SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction) { private Observation functionProcessingObservation(SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction, Message<?> message) {
return FunctionObservation.FUNCTION_PROCESSING_OBSERVATION.observation(this.functionObservationConvention, DefaultFunctionObservationConvention.INSTANCE, () -> new FunctionContext(targetFunction), this.observationRegistry); return FunctionObservation.FUNCTION_PROCESSING_OBSERVATION.observation(this.functionObservationConvention, DefaultFunctionObservationConvention.INSTANCE, () -> new FunctionContext(targetFunction, message), this.observationRegistry);
} }
private Observation consumerObservation(SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction, Observation observationOfInputMessage) { private Observation consumerObservation(SimpleFunctionRegistry.FunctionInvocationWrapper targetFunction, Observation observationOfInputMessage, Message<?> message) {
return functionProcessingObservation(targetFunction) return functionProcessingObservation(targetFunction, message)
.parentObservation(observationOfInputMessage); .parentObservation(observationOfInputMessage);
} }