Skip to content

Commit 6767797

Browse files
authored
Merge pull request quarkusio#47906 from adutra/expression-verifier-fix
MeterTagsSupport: prevent null metric tag values
2 parents 6a04758 + 20c8bd0 commit 6767797

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MeterTagsSupport.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,19 @@ private static Tags getCommonTags(ArcInvocationContext context) {
6666
* Precedence copied from MeterTagAnnotationHandler
6767
*/
6868
private String resolveTagValue(MeterTag annotation, Object parameterValue) {
69+
String value = null;
6970
if (annotation.resolver() != NoOpValueResolver.class) {
7071
ValueResolver valueResolver = valueResolvers.get(annotation.resolver());
71-
return valueResolver.resolve(parameterValue);
72+
value = valueResolver.resolve(parameterValue);
7273
} else if (StringUtils.isNotBlank(annotation.expression())) {
7374
if (valueExpressionResolver == null) {
7475
throw new IllegalArgumentException("No valueExpressionResolver is defined");
7576
}
76-
return valueExpressionResolver.resolve(annotation.expression(), parameterValue);
77+
value = valueExpressionResolver.resolve(annotation.expression(), parameterValue);
7778
} else if (parameterValue != null) {
78-
return parameterValue.toString();
79-
} else {
80-
return "";
79+
value = parameterValue.toString();
8180
}
81+
return value == null ? "" : value;
8282
}
8383

8484
/*

0 commit comments

Comments
 (0)