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

Adapt to changes in Micrometer.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2022-09-12 14:05:50 +02:00
parent d8094ecb73
commit f3cf13118d
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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