From a732053afdfe50467428c05e69afbc3e990d8a99 Mon Sep 17 00:00:00 2001 From: Jon Schneider Date: Wed, 14 Feb 2018 17:47:22 -0600 Subject: [PATCH] Add SignalFxConfig source property See gh-12066 --- .../metrics/export/signalfx/SignalFxProperties.java | 13 +++++++++++++ .../signalfx/SignalFxPropertiesConfigAdapter.java | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java index e22ac458ab9..94eed099888 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxProperties.java @@ -39,6 +39,11 @@ public class SignalFxProperties extends StepRegistryProperties { */ private String uri; + /** + * Uniquely identifies the app instance that is publishing metrics to SignalFx. Defaults to the local host name. + */ + private String source; + public String getAccessToken() { return this.accessToken; } @@ -55,4 +60,12 @@ public class SignalFxProperties extends StepRegistryProperties { this.uri = uri; } + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesConfigAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesConfigAdapter.java index 3181018440d..721c1a52d8a 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesConfigAdapter.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/signalfx/SignalFxPropertiesConfigAdapter.java @@ -44,4 +44,9 @@ public class SignalFxPropertiesConfigAdapter return get(SignalFxProperties::getUri, SignalFxConfig.super::uri); } + @Override + public String source() { + return get(SignalFxProperties::getSource, SignalFxConfig.super::source); + } + }