Skip to content

fix(dropwizard5): use locale-independent placeholder keys in GraphiteNamePattern #2619

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
sharanggupta wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −1
Open

fix(dropwizard5): use locale-independent placeholder keys in GraphiteNamePattern #2619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...in/java/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Map<String, String> extractParameters(final String metricName) {
final Map<String, String> params = new HashMap<String, String>();
if (matcher.find()) {
for (int i = 1; i <= matcher.groupCount(); i++) {
params.put(String.format("${%d}", i - 1), matcher.group(i));
params.put("${" + (i - 1) + "}", matcher.group(i));
}
}

Expand Down
14 changes: 14 additions & 0 deletions ...ava/io/prometheus/metrics/instrumentation/dropwizard5/labels/GraphiteNamePatternTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -132,6 +133,19 @@ void extractParameters() {
.isEqualTo(expected);
}

@Test
void extractParameters_WHEN_DefaultLocaleHasNonAsciiDigits_THEN_ShouldUseAsciiKeys() {
Locale defaultLocale = Locale.getDefault();
Locale.setDefault(Locale.forLanguageTag("ar-EG"));
try {
GraphiteNamePattern pattern = new GraphiteNamePattern("org.test.controller.*.status.*");
Assertions.assertThat(pattern.extractParameters("org.test.controller.gather.status.400"))
.containsOnlyKeys("${0}", "${1}");
} finally {
Locale.setDefault(defaultLocale);
}
}

@Test
void extractParameters_WHEN_emptyStringInDottedMetricsName_THEN_ShouldReturnEmptyString() {
GraphiteNamePattern pattern;
Expand Down