From 7efb64ab2f884acaa3bafa7169994b185c6530fe Mon Sep 17 00:00:00 2001
From: erabii <eugen.rabii@gmail.com>
Date: Sat, 10 Sep 2022 02:32:39 +0300
Subject: [PATCH] fix micrometer dependency changes (#2144)

---
 .../config/server/environment/DocumentedConfigObservation.java | 3 ++-
 .../ObservationEnvironmentRepositoryObservationConvention.java | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java
index d881e615..f1e6a348 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java
@@ -18,6 +18,7 @@ package org.springframework.cloud.config.server.environment;
 
 import io.micrometer.common.docs.KeyName;
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 import io.micrometer.observation.docs.DocumentedObservation;
 
 enum DocumentedConfigObservation implements DocumentedObservation {
@@ -27,7 +28,7 @@ enum DocumentedConfigObservation implements DocumentedObservation {
 	 */
 	ENVIRONMENT_REPOSITORY {
 		@Override
-		public Class<? extends Observation.ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
+		public Class<? extends ObservationConvention<? extends Observation.Context>> getDefaultConvention() {
 			return ObservationEnvironmentRepositoryObservationConvention.class;
 		}
 
diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java
index 9eb983c3..855848bc 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java
@@ -19,6 +19,7 @@ package org.springframework.cloud.config.server.environment;
 import io.micrometer.common.KeyValues;
 import io.micrometer.common.docs.KeyName;
 import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
 
 import org.springframework.util.StringUtils;
 
@@ -29,7 +30,7 @@ import org.springframework.util.StringUtils;
  * @since 4.0.0
  */
 class ObservationEnvironmentRepositoryObservationConvention
-		implements Observation.ObservationConvention<ObservationEnvironmentRepositoryContext> {
+		implements ObservationConvention<ObservationEnvironmentRepositoryContext> {
 
 	@Override
 	public KeyValues getLowCardinalityKeyValues(ObservationEnvironmentRepositoryContext context) {