diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerDocumentedObservation.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerDocumentedObservation.java index 0ea749a2..e66a6d14 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerDocumentedObservation.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerDocumentedObservation.java @@ -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> getDefaultConvention() { + public Class> getDefaultConvention() { return DefaultCircuitBreakerObservationConvention.class; } @@ -54,7 +55,7 @@ enum CircuitBreakerDocumentedObservation implements DocumentedObservation { */ CIRCUIT_BREAKER_FUNCTION_OBSERVATION { @Override - public Class> getDefaultConvention() { + public Class> getDefaultConvention() { return DefaultCircuitBreakerObservationConvention.class; } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationConvention.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationConvention.java index 21b08250..6dd7c0c9 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationConvention.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/observation/CircuitBreakerObservationConvention.java @@ -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 { +public interface CircuitBreakerObservationConvention extends ObservationConvention { @Override default boolean supportsContext(Observation.Context context) {