Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
9a5346f2
Commit
9a5346f2
authored
Apr 18, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish "Fix statsd metrics collection for names with ":""
Closes gh-8906
parent
9e705c83
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
StatsdMetricWriter.java
...ework/boot/actuate/metrics/statsd/StatsdMetricWriter.java
+4
-4
StatsdMetricWriterTests.java
.../boot/actuate/metrics/statsd/StatsdMetricWriterTests.java
+5
-5
No files found.
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java
View file @
9a5346f2
...
@@ -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
...
...
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java
View file @
9a5346f2
/*
/*
* Copyright 2012-201
6
the original author or authors.
* Copyright 2012-201
7
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.f
o
o: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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment