From 17a8dcbdcb79783d28d41cf2f3a8b48af3c9cbad Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 12 Sep 2022 11:09:47 +0200
Subject: [PATCH] Additional observability related changes

---
 .../cloud/function/observability/FunctionObservation.java       | 2 +-
 .../observability/ObservationFunctionAroundWrapper.java         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionObservation.java b/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionObservation.java
index 5c2c5d267..cf71f1c02 100644
--- a/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionObservation.java
+++ b/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionObservation.java
@@ -57,7 +57,7 @@ enum FunctionObservation implements DocumentedObservation {
 		 */
 		FUNCTION_NAME {
 			public String asString() {
-				return "spring.cloud.function.name";
+				return "spring.cloud.function.definition";
 			}
 		}
 
diff --git a/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/ObservationFunctionAroundWrapper.java b/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/ObservationFunctionAroundWrapper.java
index dbf296d6e..100e0eb71 100644
--- a/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/ObservationFunctionAroundWrapper.java
+++ b/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/ObservationFunctionAroundWrapper.java
@@ -68,7 +68,6 @@ public class ObservationFunctionAroundWrapper extends FunctionAroundWrapper {
 		Object result = Observation
 			.createNotStarted(FunctionObservation.FUNCTION_OBSERVATION.getName(), context, this.observationRegistry)
 			.contextualName(FunctionObservation.FUNCTION_OBSERVATION.getContextualName())
-			//.keyValuesProvider(tagsProvider)
 			.observe(() -> {
 				Object r = message == null ? targetFunction.get() : targetFunction.apply(invocationMessage);
 				context.setModifiedOutput(r);