SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated code to use the latest micrometer api

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-10-25 13:10:33 +02:00
parent 2a41185699
commit f095769049
3 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
docs/pom.xml
View File

@@ -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>

5
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/DocumentedConfigObservation.java
View File

@@ -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();

5
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/ObservationEnvironmentRepositoryObservationConvention.java
View File

@@ -62,4 +62,9 @@ class ObservationEnvironmentRepositoryObservationConvention
return "spring.cloud.config.environment.find";
}
@Override
public String getContextualName(ObservationEnvironmentRepositoryContext context) {
return "env find";
}
}