From cc47f0a27180f29a60b529179b623e8297f7c0b4 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 12 Sep 2022 11:05:21 +0200
Subject: [PATCH] Address breaking changs in observability

---
 .../function/observability/DefaultFunctionTagsProvider.java  | 2 +-
 .../cloud/function/observability/FunctionObservation.java    | 3 +--
 .../cloud/function/observability/FunctionTagsProvider.java   | 5 +++--
 .../observability/ObservationFunctionAroundWrapper.java      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/DefaultFunctionTagsProvider.java b/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/DefaultFunctionTagsProvider.java
index 892762011..8b75b4ad9 100644
--- a/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/DefaultFunctionTagsProvider.java
+++ b/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/DefaultFunctionTagsProvider.java
@@ -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()));
 	}
 }
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 bda0d718b..5c2c5d267 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
@@ -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";
 			}
 		}
diff --git a/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionTagsProvider.java b/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionTagsProvider.java
index 3118f691a..0dcd7e389 100644
--- a/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionTagsProvider.java
+++ b/spring-cloud-function-observability/src/main/java/org/springframework/cloud/function/observability/FunctionTagsProvider.java
@@ -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) {
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 4bdd1363d..dbf296d6e 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,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);