From f3cf13118db82eaef9eb5e3b2af1e0c2041d82bf Mon Sep 17 00:00:00 2001
From: Olga Maciaszek-Sharma <olga.maciaszek@gmail.com>
Date: Mon, 12 Sep 2022 14:05:50 +0200
Subject: [PATCH] Adapt to changes in Micrometer.

---
 .../observation/CircuitBreakerDocumentedObservation.java    | 5 +++--
 .../observation/CircuitBreakerObservationConvention.java    | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerDocumentedObservation.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerDocumentedObservation.java
index 0ea749a2..e66a6d14 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerDocumentedObservation.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerDocumentedObservation.java
@@ -18,6 +18,7 @@ package org.springframework.cloud.client.circuitbreaker.observation;
 
 import io.micrometer.common.docs.KeyName;
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 import io.micrometer.observation.docs.DocumentedObservation;
 
 enum CircuitBreakerDocumentedObservation implements DocumentedObservation {
@@ -27,7 +28,7 @@ enum CircuitBreakerDocumentedObservation implements DocumentedObservation {
 	 */
 	CIRCUIT_BREAKER_SUPPLIER_OBSERVATION {
 		@Override
-		public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
+		public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
 			return DefaultCircuitBreakerObservationConvention.class;
 		}
 
@@ -54,7 +55,7 @@ enum CircuitBreakerDocumentedObservation implements DocumentedObservation {
 	 */
 	CIRCUIT_BREAKER_FUNCTION_OBSERVATION {
 		@Override
-		public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
+		public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
 			return DefaultCircuitBreakerObservationConvention.class;
 		}
 
diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationConvention.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationConvention.java
index 21b08250..6dd7c0c9 100644
--- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationConvention.java
+++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationConvention.java
@@ -17,15 +17,15 @@
 package org.springframework.cloud.client.circuitbreaker.observation;
 
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 
 /**
- * {@link Observation.ObservationConvention} for {@link CircuitBreakerObservationContext}.
+ * {@link ObservationConvention} for {@link CircuitBreakerObservationContext}.
  *
  * @author Marcin Grzejszczak
  * @since 4.0.0
  */
-public interface CircuitBreakerObservationConvention
-		extends Observation.ObservationConvention<CircuitBreakerObservationContext> {
+public interface CircuitBreakerObservationConvention extends ObservationConvention<CircuitBreakerObservationContext> {
 
 	@Override
 	default boolean supportsContext(Observation.Context context) {