Skip to content

Bug fix regex should match ${k1}_${k2}... #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bug fix regex should match ${k1}_${k2}... #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
913331d
Bug fix regex should match _
Nov 5, 2021
fd31ac3
unit test fix
Nov 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...g/hypertrace/label/application/rule/config/service/LabelApplicationRuleValidatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,12 @@ public void validateLabelExpression(Action.DynamicLabel dynamicLabel) {
validKeys.add(tokenExtractionRule.getAlias());
}
});
Pattern pattern = Pattern.compile("\\{(\\\\}|[^}])*}");
Pattern pattern = Pattern.compile("\\$\\{(\\\\}|[^}])*}");
Matcher matcher = pattern.matcher(labelExpression);
int startOffset = 0;
while (startOffset < labelExpression.length() && matcher.find(startOffset)) {
String match = matcher.group();
String key = match.substring(1, match.length() - 1);
String key = match.substring(2, match.length() - 1);
startOffset = startOffset + matcher.end();
if (!validKeys.contains(key)) {
throwInvalidArgumentException("Invalid key name in label expression");
Expand Down
4 changes: 2 additions & 2 deletions ...g/hypertrace/label/application/rule/config/service/LabelApplicationRuleValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void validateLabelExpression() {
Condition.newBuilder().setLeafCondition(errorLeafCondition).build();
CreateLabelApplicationRuleRequest request1 =
buildCreateCreateLabelApplicationRuleRequest(
"Label Expression Rule", matchingCondition, Optional.of("${status}_{wrong-key}"));
"Label Expression Rule", matchingCondition, Optional.of("${status}_${wrong-key}"));
Throwable exception =
assertThrows(
StatusRuntimeException.class,
Expand All @@ -206,7 +206,7 @@ void validateLabelExpression() {
});
CreateLabelApplicationRuleRequest request2 =
buildCreateCreateLabelApplicationRuleRequest(
"Label Expression Rule", matchingCondition, Optional.of("${status}_{method}"));
"Label Expression Rule", matchingCondition, Optional.of("${status}_${method}"));
assertDoesNotThrow(
() -> {
labelApplicationRuleValidator.validateOrThrow(REQUEST_CONTEXT, request2);
Expand Down