Skip to content

Commit 2ee39cc

Browse files
izeyeizeye
authored
Use KeyValue.NONE_VALUE where possible (#6124)
Signed-off-by: Johnny Lim <[email protected]>
1 parent d192fda commit 2ee39cc

File tree

8 files changed

+21
-13
lines changed

8 files changed

+21
-13
lines changed

Diff for: ‎micrometer-core/src/main/java/io/micrometer/core/aop/CountedAspect.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.core.aop;
1717

18+
import io.micrometer.common.KeyValue;
1819
import io.micrometer.common.lang.NonNullApi;
1920
import io.micrometer.common.lang.Nullable;
2021
import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
@@ -83,7 +84,7 @@ public class CountedAspect {
8384

8485
private static final Predicate<ProceedingJoinPoint> DONT_SKIP_ANYTHING = pjp -> false;
8586

86-
public final String DEFAULT_EXCEPTION_TAG_VALUE = "none";
87+
public final String DEFAULT_EXCEPTION_TAG_VALUE = KeyValue.NONE_VALUE;
8788

8889
public final String RESULT_TAG_FAILURE_VALUE = "failure";
8990

Diff for: ‎micrometer-core/src/main/java/io/micrometer/core/aop/TimedAspect.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.core.aop;
1717

18+
import io.micrometer.common.KeyValue;
1819
import io.micrometer.common.lang.NonNullApi;
1920
import io.micrometer.common.lang.Nullable;
2021
import io.micrometer.common.util.internal.logging.WarnThenDebugLogger;
@@ -92,7 +93,7 @@ public class TimedAspect {
9293

9394
public static final String DEFAULT_METRIC_NAME = "method.timed";
9495

95-
public static final String DEFAULT_EXCEPTION_TAG_VALUE = "none";
96+
public static final String DEFAULT_EXCEPTION_TAG_VALUE = KeyValue.NONE_VALUE;
9697

9798
/**
9899
* Tag key for an exception.

Diff for: ‎micrometer-core/src/main/java/io/micrometer/core/instrument/binder/commonspool2/CommonsObjectPool2Metrics.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.core.instrument.binder.commonspool2;
1717

18+
import io.micrometer.common.KeyValue;
1819
import io.micrometer.common.lang.NonNull;
1920
import io.micrometer.common.lang.Nullable;
2021
import io.micrometer.common.util.internal.logging.InternalLogger;
@@ -129,17 +130,18 @@ public void bindTo(@NonNull MeterRegistry registry) {
129130

130131
private Iterable<Tag> nameTag(ObjectName name, String type)
131132
throws AttributeNotFoundException, MBeanException, ReflectionException, InstanceNotFoundException {
132-
return Tags.of("name", name.getKeyProperty("name"), "type", type, "factoryType", getFactoryType(name, type));
133+
return Tags.of("name", name.getKeyProperty("name"), "type", type, "factoryType",
134+
getFactoryTypeTagValue(name, type));
133135
}
134136

135-
private String getFactoryType(ObjectName name, String type)
137+
private String getFactoryTypeTagValue(ObjectName name, String type)
136138
throws ReflectionException, AttributeNotFoundException, InstanceNotFoundException, MBeanException {
137139
if (Objects.equals(type, "GenericObjectPool")) {
138140
// for GenericObjectPool, we want to include the name and factoryType as tags
139141
return mBeanServer.getAttribute(name, "FactoryType").toString();
140142
}
141143
else {
142-
return "none";
144+
return KeyValue.NONE_VALUE;
143145
}
144146
}
145147

Diff for: ‎micrometer-core/src/main/java/io/micrometer/core/instrument/binder/db/JooqExecuteListener.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.core.instrument.binder.db;
1717

18+
import io.micrometer.common.KeyValue;
1819
import io.micrometer.common.util.StringUtils;
1920
import io.micrometer.core.instrument.MeterRegistry;
2021
import io.micrometer.core.instrument.Tag;
@@ -84,8 +85,8 @@ private void stopTimerIfStillRunning(ExecuteContext ctx) {
8485
if (sample == null)
8586
return;
8687

87-
String exceptionName = "none";
88-
String exceptionSubclass = "none";
88+
String exceptionName = KeyValue.NONE_VALUE;
89+
String exceptionSubclass = KeyValue.NONE_VALUE;
8990

9091
Exception exception = ctx.exception();
9192
if (exception != null) {
@@ -94,7 +95,7 @@ private void stopTimerIfStillRunning(ExecuteContext ctx) {
9495
exceptionName = dae.sqlStateClass().name().toLowerCase().replace('_', ' ');
9596
exceptionSubclass = dae.sqlStateSubclass().name().toLowerCase().replace('_', ' ');
9697
if (exceptionSubclass.contains("no subclass")) {
97-
exceptionSubclass = "none";
98+
exceptionSubclass = KeyValue.NONE_VALUE;
9899
}
99100
}
100101
else {

Diff for: ‎micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpMetricsEventListener.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.core.instrument.binder.okhttp3;
1717

18+
import io.micrometer.common.KeyValue;
1819
import io.micrometer.common.lang.NonNullApi;
1920
import io.micrometer.common.lang.NonNullFields;
2021
import io.micrometer.common.lang.Nullable;
@@ -269,7 +270,7 @@ public static class Builder {
269270
private final String name;
270271

271272
private Function<Request, String> uriMapper = (request) -> Optional.ofNullable(request.header(URI_PATTERN))
272-
.orElse("none");
273+
.orElse(KeyValue.NONE_VALUE);
273274

274275
private Tags tags = Tags.empty();
275276

Diff for: ‎micrometer-core/src/main/java/io/micrometer/core/instrument/binder/okhttp3/OkHttpObservationInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public static class Builder {
144144
private final ObservationRegistry registry;
145145

146146
private Function<Request, String> uriMapper = (request) -> Optional.ofNullable(request.header(URI_PATTERN))
147-
.orElse("none");
147+
.orElse(KeyValue.NONE_VALUE);
148148

149149
private KeyValues tags = KeyValues.empty();
150150

Diff for: ‎micrometer-core/src/main/java/io/micrometer/core/instrument/observation/DefaultMeterObservationHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void onEvent(Observation.Event event, Observation.Context context) {
105105

106106
private String getErrorValue(Observation.Context context) {
107107
Throwable error = context.getError();
108-
return error != null ? error.getClass().getSimpleName() : "none";
108+
return error != null ? error.getClass().getSimpleName() : KeyValue.NONE_VALUE;
109109
}
110110

111111
private List<Tag> createTags(Observation.Context context) {

Diff for: ‎micrometer-test/src/main/java/io/micrometer/core/tck/MeterRegistryCompatibilityKit.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.core.tck;
1717

18+
import io.micrometer.common.KeyValue;
1819
import io.micrometer.core.Issue;
1920
import io.micrometer.core.annotation.Timed;
2021
import io.micrometer.core.instrument.Timer;
@@ -929,7 +930,8 @@ void recordWithObservation() {
929930

930931
assertThat(longTaskTimer.activeTasks()).isEqualTo(0);
931932

932-
Timer timer = registry.timer("myObservation", "error", "none", "staticTag", "42", "dynamicTag", "24");
933+
Timer timer = registry.timer("myObservation", "error", KeyValue.NONE_VALUE, "staticTag", "42", "dynamicTag",
934+
"24");
933935
assertSoftly(softly -> {
934936
softly.assertThat(timer.count()).isEqualTo(1L);
935937
softly.assertThat(timer.totalTime(TimeUnit.SECONDS)).isCloseTo(1, offset(1.0e-12));
@@ -951,7 +953,7 @@ void recordWithObservationAndScope() {
951953
observation.stop();
952954
clock(registry).add(step());
953955

954-
Timer timer = registry.timer("myObservation", "error", "none");
956+
Timer timer = registry.timer("myObservation", "error", KeyValue.NONE_VALUE);
955957
assertSoftly(softly -> {
956958
softly.assertThat(timer.count()).isEqualTo(1L);
957959
softly.assertThat(timer.totalTime(TimeUnit.NANOSECONDS)).isCloseTo(10, offset(1.0e-12));

0 commit comments

Comments
 (0)