From a732053afdfe50467428c05e69afbc3e990d8a99 Mon Sep 17 00:00:00 2001
From: Jon Schneider <jschneider@pivotal.io>
Date: Wed, 14 Feb 2018 17:47:22 -0600
Subject: [PATCH 1/2] 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);
+	}
+
 }

From 6c85ed70e44d4523763792c1e8ac9bb2ffa515ef Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 19 Feb 2018 10:53:25 +0100
Subject: [PATCH 2/2] Polish "Add SignalFxConfig source property"

Closes gh-12066
---
 .../metrics/export/signalfx/SignalFxProperties.java          | 5 +++--
 .../src/main/asciidoc/appendix-application-properties.adoc   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

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 94eed099888..8cd16b678bc 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
@@ -40,7 +40,8 @@ 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.
+	 * Uniquely identifies the app instance that is publishing metrics to SignalFx.
+	 * Defaults to the local host name.
 	 */
 	private String source;
 
@@ -61,7 +62,7 @@ public class SignalFxProperties extends StepRegistryProperties {
 	}
 
 	public String getSource() {
-		return source;
+		return this.source;
 	}
 
 	public void setSource(String source) {
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
index 27e7fee5015..4c7ce88a384 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
@@ -1380,6 +1380,7 @@ content into your application. Rather, pick only the properties that you need.
 	management.metrics.export.signalfx.enabled= # Whether exporting of metrics to this backend is enabled.
 	management.metrics.export.signalfx.num-threads= # Number of threads to use with the metrics publishing scheduler.
 	management.metrics.export.signalfx.read-timeout= # Read timeout for requests to this backend.
+	management.metrics.export.signalfx.source= # Uniquely identifies the app instance that is publishing metrics to SignalFx. Defaults to the local host name.
 	management.metrics.export.signalfx.step=1m # Step size (i.e. reporting frequency) to use.
 	management.metrics.export.signalfx.uri= # Optional custom URI for the SignalFX API.
 	management.metrics.export.simple.mode=cumulative # Counting mode.