Fixes #1214: makes hostname a stored var with a 1 hour ttl when apply…

…ing tags, unknown hosts will be labeled not_found

control/metrics.go

@@ -46,17 +46,46 @@ var (
 
 // hostnameReader, hostnamer created for mocking
 func init() {
-	hostnameReader = &hostnameReaderType{}
+	host, err := os.Hostname()
+	if err != nil {
+		log.WithFields(log.Fields{
+			"_module": "control",
+			"_file":   "metrics.go,",
+			"_block":  "addStandardAndWorkflowTags",
+			"error":   err.Error(),
+		}).Error("Unable to determine hostname")
+		host = "not_found"
+	}
+	hostnameReader = &hostnameReaderType{hostname: host, hostnameRefreshTTL: time.Hour, lastRefresh: time.Now()}
 }
 
 type hostnamer interface {
-	Hostname() (name string, err error)
+	Hostname() (name string)
 }
 
-type hostnameReaderType struct{}
+type hostnameReaderType struct {
+	hostname           string
+	hostnameRefreshTTL time.Duration
+	lastRefresh        time.Time
+}
 
-func (h *hostnameReaderType) Hostname() (name string, err error) {
-	return os.Hostname()
+func (h *hostnameReaderType) Hostname() (name string) {
+	if time.Now().After(h.lastRefresh.Add(h.hostnameRefreshTTL)) {
+		host, err := os.Hostname()
+		if err != nil {
+			log.WithFields(log.Fields{
+				"_module": "control",
+				"_file":   "metrics.go,",
+				"_block":  "addStandardAndWorkflowTags",
+				"error":   err.Error(),
+			}).Error("Unable to determine hostname")
+			host = "not_found"
+		}
+
+		h.hostname = host
+		h.lastRefresh = time.Now()
+	}
+	return h.hostname
 }
 
 func errorMetricNotFound(ns string, ver ...int) error {
@@ -513,15 +542,8 @@ func appendIfMissing(keys []string, ns string) []string {
 }
 
 func addStandardAndWorkflowTags(m core.Metric, allTags map[string]map[string]string) core.Metric {
-	hostname, err := hostnameReader.Hostname()
-	if err != nil {
-		log.WithFields(log.Fields{
-			"_module": "control",
-			"_file":   "metrics.go,",
-			"_block":  "addStandardAndWorkflowTags",
-			"error":   err.Error(),
-		}).Error("Unable to determine hostname")
-	}
+	hostname := hostnameReader.Hostname()
+
 	tags := m.Tags()
 	if tags == nil {
 		tags = map[string]string{}

control/metrics_small_test.go

@@ -130,8 +130,8 @@ func TestContainsTupleNegative(t *testing.T) {
 
 type mockHostnameReader struct{}
 
-func (m *mockHostnameReader) Hostname() (string, error) {
-	return "hostname", nil
+func (m *mockHostnameReader) Hostname() string {
+	return "hostname"
 }
 
 type testCase struct {
@@ -141,7 +141,7 @@ type testCase struct {
 }
 
 func prepareTestCases() []testCase {
-	hostname, _ := hostnameReader.Hostname()
+	hostname := hostnameReader.Hostname()
 	fooTags := map[string]string{
 		"foo_tag": "foo_val",
 	}

docs/METRICS.md

@@ -20,7 +20,7 @@ A metric in snap has the following fields.
  * Are key value pairs that provide additional meta data about the metric
  * May be added by the framework or other plugins (processors)
   * The framework currently adds the following standard tag to all metrics
-   * `plugin_running_on` describing on which host the plugin is running
+   * `plugin_running_on` describing on which host the plugin is running. This value is updated every hour due to a TTL set internally.
  * May be added by a task manifests as described [here](https://github.com/intelsdi-x/snap/pull/941)
  * May be added by the snapd config as described [here](https://github.com/intelsdi-x/snap/issues/827)
 * Unit `string`