Commit 9a5346f2 authored by Stephane Nicoll's avatar Stephane Nicoll

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

Closes gh-8906
parent 9e705c83
...@@ -88,7 +88,8 @@ public class StatsdMetricWriter implements MetricWriter, Closeable { ...@@ -88,7 +88,8 @@ public class StatsdMetricWriter implements MetricWriter, Closeable {
@Override @Override
public void increment(Delta<?> delta) { public void increment(Delta<?> delta) {
this.client.count(sanitizeMetricName(delta.getName()), delta.getValue().longValue()); this.client.count(sanitizeMetricName(delta.getName()),
delta.getValue().longValue());
} }
@Override @Override
...@@ -119,13 +120,12 @@ public class StatsdMetricWriter implements MetricWriter, Closeable { ...@@ -119,13 +120,12 @@ public class StatsdMetricWriter implements MetricWriter, Closeable {
} }
/** /**
* The statsd server does not allow ":" in metric names. Since the the statsd client * Sanitize the metric name if necessary.
* is not dealing with this, we have to sanitize the metric name.
* @param name The metric name * @param name The metric name
* @return The sanitized metric name * @return The sanitized metric name
*/ */
private String sanitizeMetricName(String name) { private String sanitizeMetricName(String name) {
return name.replace(":", ""); return name.replace(":", "-");
} }
private static final class LoggingStatsdErrorHandler private static final class LoggingStatsdErrorHandler
......
/* /*
* 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -100,16 +100,16 @@ public class StatsdMetricWriterTests { ...@@ -100,16 +100,16 @@ public class StatsdMetricWriterTests {
@Test @Test
public void incrementMetricWithInvalidCharsInName() throws Exception { 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(); 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 @Test
public void setMetricWithInvalidCharsInName() throws Exception { 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(); 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 { private static final class DummyStatsDServer implements Runnable {
......
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