Skip to content

Commit 580636c

Browse files
authored
Polish gh-5609 (#5752)
1 parent 0aaf730 commit 580636c

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/DefaultGrpcClientObservationConvention.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.core.instrument.binder.grpc;
1717

18+
import io.micrometer.common.KeyValue;
1819
import io.micrometer.common.KeyValues;
1920
import io.micrometer.core.instrument.binder.grpc.GrpcObservationDocumentation.LowCardinalityKeyNames;
2021

@@ -27,6 +28,8 @@
2728
*/
2829
public class DefaultGrpcClientObservationConvention implements GrpcClientObservationConvention {
2930

31+
private static final KeyValue STATUS_CODE_UNKNOWN = LowCardinalityKeyNames.STATUS_CODE.withValue(UNKNOWN);
32+
3033
@Override
3134
public String getName() {
3235
return "grpc.client";
@@ -39,9 +42,9 @@ public String getContextualName(GrpcClientObservationContext context) {
3942

4043
@Override
4144
public KeyValues getLowCardinalityKeyValues(GrpcClientObservationContext context) {
42-
String statusCode = context.getStatusCode() != null ? context.getStatusCode().name() : UNKNOWN;
43-
return KeyValues.of(LowCardinalityKeyNames.STATUS_CODE.withValue(statusCode),
44-
LowCardinalityKeyNames.METHOD.withValue(context.getMethodName()),
45+
KeyValue statusCodeKeyValue = context.getStatusCode() != null
46+
? LowCardinalityKeyNames.STATUS_CODE.withValue(context.getStatusCode().name()) : STATUS_CODE_UNKNOWN;
47+
return KeyValues.of(statusCodeKeyValue, LowCardinalityKeyNames.METHOD.withValue(context.getMethodName()),
4548
LowCardinalityKeyNames.SERVICE.withValue(context.getServiceName()),
4649
LowCardinalityKeyNames.METHOD_TYPE.withValue(context.getMethodType().name()));
4750
}

micrometer-core/src/main/java/io/micrometer/core/instrument/binder/grpc/DefaultGrpcServerObservationConvention.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package io.micrometer.core.instrument.binder.grpc;
1717

18+
import io.micrometer.common.KeyValue;
1819
import io.micrometer.common.KeyValues;
1920
import io.micrometer.core.instrument.binder.grpc.GrpcObservationDocumentation.LowCardinalityKeyNames;
2021

@@ -27,6 +28,8 @@
2728
*/
2829
public class DefaultGrpcServerObservationConvention implements GrpcServerObservationConvention {
2930

31+
private static final KeyValue STATUS_CODE_UNKNOWN = LowCardinalityKeyNames.STATUS_CODE.withValue(UNKNOWN);
32+
3033
@Override
3134
public String getName() {
3235
return "grpc.server";
@@ -39,9 +42,9 @@ public String getContextualName(GrpcServerObservationContext context) {
3942

4043
@Override
4144
public KeyValues getLowCardinalityKeyValues(GrpcServerObservationContext context) {
42-
String statusCode = context.getStatusCode() != null ? context.getStatusCode().name() : UNKNOWN;
43-
return KeyValues.of(LowCardinalityKeyNames.STATUS_CODE.withValue(statusCode),
44-
LowCardinalityKeyNames.METHOD.withValue(context.getMethodName()),
45+
KeyValue statusCodeKeyValue = context.getStatusCode() != null
46+
? LowCardinalityKeyNames.STATUS_CODE.withValue(context.getStatusCode().name()) : STATUS_CODE_UNKNOWN;
47+
return KeyValues.of(statusCodeKeyValue, LowCardinalityKeyNames.METHOD.withValue(context.getMethodName()),
4548
LowCardinalityKeyNames.SERVICE.withValue(context.getServiceName()),
4649
LowCardinalityKeyNames.METHOD_TYPE.withValue(context.getMethodType().name()));
4750
}

0 commit comments

Comments
 (0)