diff --git a/micrometer-commons/src/main/java/io/micrometer/common/docs/KeyName.java b/micrometer-commons/src/main/java/io/micrometer/common/docs/KeyName.java index d71dbebf1e..8ce149a47f 100644 --- a/micrometer-commons/src/main/java/io/micrometer/common/docs/KeyName.java +++ b/micrometer-commons/src/main/java/io/micrometer/common/docs/KeyName.java @@ -46,6 +46,15 @@ default KeyValue withValue(String value) { return KeyValue.of(this, value); } + /** + * Creates a key value for the given key name with {@value KeyValue#NONE_VALUE}. + * @return key value + * @since 1.16.0 + */ + default KeyValue withNoneValue() { + return KeyValue.of(this, KeyValue.NONE_VALUE); + } + /** * Creates a key value for the given key name. * @param value value for key diff --git a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/DefaultApacheHttpClientObservationConvention.java b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/DefaultApacheHttpClientObservationConvention.java index dda3ca0431..eb2a3ee761 100644 --- a/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/DefaultApacheHttpClientObservationConvention.java +++ b/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/DefaultApacheHttpClientObservationConvention.java @@ -53,7 +53,7 @@ public class DefaultApacheHttpClientObservationConvention implements ApacheHttpC private static final KeyValue STATUS_CLIENT_ERROR = ApacheHttpClientKeyNames.STATUS.withValue("CLIENT_ERROR"); - private static final KeyValue EXCEPTION_NONE = ApacheHttpClientKeyNames.EXCEPTION.withValue(KeyValue.NONE_VALUE); + private static final KeyValue EXCEPTION_NONE = ApacheHttpClientKeyNames.EXCEPTION.withNoneValue(); private static final KeyValue OUTCOME_UNKNOWN = ApacheHttpClientKeyNames.OUTCOME.withValue(Outcome.UNKNOWN.name()); diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/DefaultApacheHttpClientObservationConventionTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/DefaultApacheHttpClientObservationConventionTest.java index e465f778b0..95ebc30e45 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/DefaultApacheHttpClientObservationConventionTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/DefaultApacheHttpClientObservationConventionTest.java @@ -15,7 +15,6 @@ */ package io.micrometer.core.instrument.binder.httpcomponents.hc5; -import io.micrometer.common.KeyValue; import org.apache.hc.client5.http.HttpRoute; import org.apache.hc.client5.http.async.methods.SimpleHttpRequest; import org.apache.hc.client5.http.async.methods.SimpleHttpResponse; @@ -67,8 +66,7 @@ void shouldHaveDefaultContextName() { void shouldContributeExceptionNoneWhenSuccess() { HttpClientContext clientContext = HttpClientContext.create(); ApacheHttpClientContext context = new ApacheHttpClientContext(null, clientContext); - assertThat(observationConvention.getLowCardinalityKeyValues(context)) - .contains(EXCEPTION.withValue(KeyValue.NONE_VALUE)); + assertThat(observationConvention.getLowCardinalityKeyValues(context)).contains(EXCEPTION.withNoneValue()); } @Test diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandlerTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandlerTest.java index 1dfd3bc567..07930ca5e7 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandlerTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/httpcomponents/hc5/ObservationExecChainHandlerTest.java @@ -15,7 +15,6 @@ */ package io.micrometer.core.instrument.binder.httpcomponents.hc5; -import io.micrometer.common.KeyValue; import io.micrometer.common.lang.Nullable; import io.micrometer.observation.tck.TestObservationRegistry; import org.apache.hc.client5.http.HttpRoute; @@ -165,7 +164,7 @@ void shouldInstrumentCancelledRequests() throws Exception { assertThat(observationRegistry).hasObservationWithNameEqualTo("httpcomponents.httpclient.request") .that() .hasLowCardinalityKeyValue(OUTCOME.withValue("UNKNOWN")) - .hasLowCardinalityKeyValue(EXCEPTION.withValue(KeyValue.NONE_VALUE)); + .hasLowCardinalityKeyValue(EXCEPTION.withNoneValue()); } }