Skip to content

Commit 80cfcad

Browse files
committed
fix test: trim spaces in expression
1 parent c1e8801 commit 80cfcad

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/yaml/MetricStructure.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,15 @@ private static String tryParseFunction(String function, String expression, Strin
205205
if (!expression.startsWith(function)) {
206206
return null;
207207
}
208-
String expr = expression.substring(function.length());
208+
String expr = expression.substring(function.length()).trim();
209209
if (expr.charAt(0) != '(' || expr.charAt(expr.length() - 1) != ')') {
210210
throw new IllegalArgumentException(errorMsg);
211211
}
212-
expr = expr.substring(1, expr.length() - 1);
212+
expr = expr.substring(1, expr.length() - 1).trim();
213213
if (expr.isEmpty()) {
214214
throw new IllegalArgumentException(errorMsg);
215215
}
216-
return expr;
216+
return expr.trim();
217217
}
218218

219219
private MetricAttribute buildStateMetricAttribute(String key, Map<?, ?> stateMap) {

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/yaml/MetricStructureTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,13 @@ void metricAttribute_beanParam(String target, String value, String expectedValue
7878
strings = {
7979
"missing(name)", // non-existing target
8080
"param()", // missing parameter
81+
"param( )", // missing parameter with empty string
8182
"param(name)a", // something after parenthesis
8283
"lowercase()", // misng target in modifier
8384
"lowercase(param(name)", // missing parenthesis for modifier
8485
"lowercase(missing(name))", // non-existing target within modifier
8586
"lowercase(param())", // missing parameter in modifier
87+
"lowercase(param( ))", // missing parameter in modifier with empty string
8688
"lowercase(param))", // missing parenthesis within modifier
8789
})
8890
void invalidTargetSyntax(String target) {

0 commit comments

Comments
 (0)