Skip to content

Commit ff636b5

Browse files
jkschneiderwilkinsona
authored andcommitted
Make the Graphite export protocol configurable
Closes gh-10523
1 parent 7fc272d commit ff636b5

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphiteProperties.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.time.Duration;
2020
import java.util.concurrent.TimeUnit;
2121

22+
import io.micrometer.graphite.GraphiteProtocol;
23+
2224
import org.springframework.boot.context.properties.ConfigurationProperties;
2325

2426
/**
@@ -29,6 +31,7 @@
2931
*/
3032
@ConfigurationProperties(prefix = "spring.metrics.graphite")
3133
public class GraphiteProperties {
34+
3235
/**
3336
* Enable publishing to the backend.
3437
*/
@@ -59,6 +62,11 @@ public class GraphiteProperties {
5962
*/
6063
private Integer port;
6164

65+
/**
66+
* Protocol to use while shipping data to Graphite.
67+
*/
68+
private GraphiteProtocol protocol = GraphiteProtocol.Pickled;
69+
6270
public Boolean getEnabled() {
6371
return this.enabled;
6472
}
@@ -106,4 +114,13 @@ public Integer getPort() {
106114
public void setPort(Integer port) {
107115
this.port = port;
108116
}
117+
118+
public GraphiteProtocol getProtocol() {
119+
return this.protocol;
120+
}
121+
122+
public void setProtocol(GraphiteProtocol protocol) {
123+
this.protocol = protocol;
124+
}
125+
109126
}

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/graphite/GraphitePropertiesConfigAdapter.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.concurrent.TimeUnit;
2121

2222
import io.micrometer.graphite.GraphiteConfig;
23+
import io.micrometer.graphite.GraphiteProtocol;
2324

2425
import org.springframework.boot.actuate.autoconfigure.metrics.export.PropertiesConfigAdapter;
2526

@@ -74,4 +75,9 @@ public int port() {
7475
return get(GraphiteProperties::getPort, GraphiteConfig::port);
7576
}
7677

78+
@Override
79+
public GraphiteProtocol protocol() {
80+
return get(GraphiteProperties::getProtocol, GraphiteConfig::protocol);
81+
}
82+
7783
}

0 commit comments

Comments
 (0)