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

Fixed observation convention issues

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-12-15 16:58:34 +01:00
parent 99fda44272
commit 31cade5948
3 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
docs/pom.xml
View File

@@ -54,29 +54,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>
@@ -88,11 +72,9 @@
</executions>
<dependencies>
<dependency>
<groupId>io.micrometer
</groupId>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-docs-generator</artifactId>
<version>${micrometer-docs-generator.version}
</version>
<version>${micrometer-docs-generator.version}</version>
<type>jar</type>
</dependency>
</dependencies>

8
spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationDocumentation.java
View File

@@ -42,10 +42,6 @@ enum CircuitBreakerObservationDocumentation implements ObservationDocumentation
return "spring.cloud.circuitbreaker";
}
@Override
public String getContextualName() {
return "circuit-breaker";
}
},
/**
@@ -68,10 +64,6 @@ enum CircuitBreakerObservationDocumentation implements ObservationDocumentation
return "spring.cloud.circuitbreaker";
}
@Override
public String getContextualName() {
return "circuit-breaker fallback";
}
};
public enum LowCardinalityTags implements KeyName {

8
spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/DefaultCircuitBreakerObservationConvention.java
View File

@@ -44,4 +44,12 @@ public class DefaultCircuitBreakerObservationConvention implements CircuitBreake
return "spring.cloud.circuitbreaker";
}
@Override
public String getContextualName(CircuitBreakerObservationContext context) {
if (context.getType() == CircuitBreakerObservationContext.Type.SUPPLIER) {
return "circuit-breaker";
}
return "circuit-breaker fallback";
}
}