Commit 28f89098 by Bertrand Renuart

Allow for periods in metric name (see gh354)

parent 8bb578ad
...@@ -48,7 +48,7 @@ public class DefaultServoMetricNaming implements ServoMetricNaming { ...@@ -48,7 +48,7 @@ public class DefaultServoMetricNaming implements ServoMetricNaming {
private String handleMetric(MonitorConfig config, TagList tags) { private String handleMetric(MonitorConfig config, TagList tags) {
String type = cleanValue(tags.getTag(DataSourceType.KEY), false); String type = cleanValue(tags.getTag(DataSourceType.KEY), false);
String instanceName = cleanValue(tags.getTag("instance"), false); String instanceName = cleanValue(tags.getTag("instance"), false);
String name = cleanupIllegalCharacters(config.getName(), false); String name = cleanupIllegalCharacters(config.getName(), true);
String statistic = cleanValue(tags.getTag("statistic"), false); String statistic = cleanValue(tags.getTag("statistic"), false);
StringBuilder nameBuilder = new StringBuilder(); StringBuilder nameBuilder = new StringBuilder();
...@@ -74,7 +74,7 @@ public class DefaultServoMetricNaming implements ServoMetricNaming { ...@@ -74,7 +74,7 @@ public class DefaultServoMetricNaming implements ServoMetricNaming {
String domain = cleanValue(tags.getTag(JMX_DOMAIN_KEY), true); String domain = cleanValue(tags.getTag(JMX_DOMAIN_KEY), true);
String type = cleanValue(tags.getTag("Jmx.type"), false); String type = cleanValue(tags.getTag("Jmx.type"), false);
String instanceName = cleanValue(tags.getTag("Jmx.instance"), false); String instanceName = cleanValue(tags.getTag("Jmx.instance"), false);
String name = cleanValue(tags.getTag("Jmx.name"), false); String name = cleanValue(tags.getTag("Jmx.name"), true);
String fieldName = cleanupIllegalCharacters(config.getName(), false); String fieldName = cleanupIllegalCharacters(config.getName(), false);
StringBuilder nameBuilder = new StringBuilder(); StringBuilder nameBuilder = new StringBuilder();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment