From f095769049dfe339ec52a3fd00e7d3579a7c5f74 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@vmware.com>
Date: Tue, 25 Oct 2022 13:10:33 +0200
Subject: [PATCH] Updated code to use the latest micrometer api

---
 docs/pom.xml                                  | 38 +++----------------
 .../DocumentedConfigObservation.java          |  5 ---
 ...onmentRepositoryObservationConvention.java |  5 +++
 3 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 5a032f84..0147b31f 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -24,7 +24,7 @@
 		<configprops.inclusionPattern>spring.cloud.config.*</configprops.inclusionPattern>
 
 		<!-- Observability -->
-		<micrometer-docs-generator.version>1.0.0-M5</micrometer-docs-generator.version>
+		<micrometer-docs-generator.version>1.0.0-RC1</micrometer-docs-generator.version>
 		<micrometer-docs-generator.inputPath>${maven.multiModuleProjectDirectory}/spring-cloud-config-server/</micrometer-docs-generator.inputPath>
 		<micrometer-docs-generator.inclusionPattern>.*</micrometer-docs-generator.inclusionPattern>
 		<micrometer-docs-generator.outputPath>${maven.multiModuleProjectDirectory}/target/</micrometer-docs-generator.outputPath>
@@ -58,29 +58,13 @@
 						<artifactId>exec-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>generate-metrics-metadata</id>
+								<id>generate-docs</id>
 								<phase>prepare-package</phase>
 								<goals>
 									<goal>java</goal>
 								</goals>
 								<configuration>
-									<mainClass>io.micrometer.docs.metrics.DocsFromSources</mainClass>
-									<includePluginDependencies>true</includePluginDependencies>
-									<arguments>
-										<argument>${micrometer-docs-generator.inputPath}</argument>
-										<argument>${micrometer-docs-generator.inclusionPattern}</argument>
-										<argument>${micrometer-docs-generator.outputPath}</argument>
-									</arguments>
-								</configuration>
-							</execution>
-							<execution>
-								<id>generate-tracing-metadata</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>java</goal>
-								</goals>
-								<configuration>
-									<mainClass>io.micrometer.docs.spans.DocsFromSources</mainClass>
+									<mainClass>io.micrometer.docs.DocsGeneratorCommand</mainClass>
 									<includePluginDependencies>true</includePluginDependencies>
 									<arguments>
 										<argument>${micrometer-docs-generator.inputPath}</argument>
@@ -92,19 +76,9 @@
 						</executions>
 						<dependencies>
 							<dependency>
-								<groupId>io.micrometer
-								</groupId>
-								<artifactId>micrometer-docs-generator-spans</artifactId>
-								<version>${micrometer-docs-generator.version}
-								</version>
-								<type>jar</type>
-							</dependency>
-							<dependency>
-								<groupId>io.micrometer
-								</groupId>
-								<artifactId>micrometer-docs-generator-metrics</artifactId>
-								<version>${micrometer-docs-generator.version}
-								</version>
+								<groupId>io.micrometer</groupId>
+								<artifactId>micrometer-docs-generator</artifactId>
+								<version>${micrometer-docs-generator.version}</version>
 								<type>jar</type>
 							</dependency>
 						</dependencies>
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 b3f26bfd..22f71981 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
@@ -32,11 +32,6 @@ enum DocumentedConfigObservation implements ObservationDocumentation {
 			return ObservationEnvironmentRepositoryObservationConvention.class;
 		}
 
-		@Override
-		public String getContextualName() {
-			return "env find";
-		}
-
 		@Override
 		public KeyName[] getLowCardinalityKeyNames() {
 			return LowCardinalityTags.values();
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 855848bc..53e035b8 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
@@ -62,4 +62,9 @@ class ObservationEnvironmentRepositoryObservationConvention
 		return "spring.cloud.config.environment.find";
 	}
 
+	@Override
+	public String getContextualName(ObservationEnvironmentRepositoryContext context) {
+		return "env find";
+	}
+
 }