Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Fix statsd metrics collection for names with ":""

Browse Source 
Closes gh-8906
This commit is contained in:
Stephane Nicoll
2017-04-18 10:39:54 +02:00
parent 9e705c83c8
commit 9a5346f29c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java
View File

@@ -88,7 +88,8 @@ public class StatsdMetricWriter implements MetricWriter, Closeable {
@Override
public void increment(Delta<?> delta) {
this.client.count(sanitizeMetricName(delta.getName()), delta.getValue().longValue());
this.client.count(sanitizeMetricName(delta.getName()),
delta.getValue().longValue());
}
@Override
@@ -119,13 +120,12 @@ public class StatsdMetricWriter implements MetricWriter, Closeable {
}
/**
* The statsd server does not allow ":" in metric names. Since the the statsd client
* is not dealing with this, we have to sanitize the metric name.
* Sanitize the metric name if necessary.
* @param name The metric name
* @return The sanitized metric name
*/
private String sanitizeMetricName(String name) {
return name.replace(":", "");
return name.replace(":", "-");
}
private static final class LoggingStatsdErrorHandler

10
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -100,16 +100,16 @@ public class StatsdMetricWriterTests {
@Test
public void incrementMetricWithInvalidCharsInName() throws Exception {
this.writer.increment(new Delta<>("counter.fo:o", 3L));
this.writer.increment(new Delta<Long>("counter.fo:o", 3L));
this.server.waitForMessage();
assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.counter.foo:3|c");
assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.counter.fo-o:3|c");
}
@Test
public void setMetricWithInvalidCharsInName() throws Exception {
this.writer.set(new Metric<>("gauge.f:o:o", 3L));
this.writer.set(new Metric<Long>("gauge.f:o:o", 3L));
this.server.waitForMessage();
assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.gauge.foo:3|g");
assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.gauge.f-o-o:3|g");
}
private static final class DummyStatsDServer implements Runnable {