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

Merge branch '1.4.x' into 1.5.x

Browse Source
This commit is contained in:
Stephane Nicoll
2017-04-18 10:42:48 +02:00
parent b2ae6b5f50 63cfad855c
commit 6c14420221
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
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.
@@ -36,6 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link StatsdMetricWriter}.
*
* @author Dave Syer
* @author Odín del Río
*/
public class StatsdMetricWriterTests {
@@ -97,6 +98,20 @@ public class StatsdMetricWriterTests {
assertThat(this.server.messagesReceived().get(0)).isEqualTo("my.gauge.foo:3|g");
}
@Test
public void incrementMetricWithInvalidCharsInName() throws Exception {
this.writer.increment(new Delta<Long>("counter.fo:o", 3L));
this.server.waitForMessage();
assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.counter.fo-o:3|c");
}
@Test
public void setMetricWithInvalidCharsInName() throws Exception {
this.writer.set(new Metric<Long>("gauge.f:o:o", 3L));
this.server.waitForMessage();
assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.gauge.f-o-o:3|g");
}
private static final class DummyStatsDServer implements Runnable {
private final List<String> messagesReceived = new ArrayList<String>();