Adding upstream version 1.40.0.upstream/1.40.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/exporting/prometheus/remote_write/remote_write_request.cc b/exporting/prometheus/remote_write/remote_write_request.cc
index ecfa11fa8..a628082d1 100644
--- a/exporting/prometheus/remote_write/remote_write_request.cc
+++ b/exporting/prometheus/remote_write/remote_write_request.cc
@@ -45,16 +45,16 @@ void add_host_info(
     label->set_name("__name__");
     label->set_value(name);
 
-    label = timeseries->add_labels();
-    label->set_name("instance");
-    label->set_value(instance);
-
     if (application) {
         label = timeseries->add_labels();
         label->set_name("application");
         label->set_value(application);
     }
 
+    label = timeseries->add_labels();
+    label->set_name("instance");
+    label->set_value(instance);
+
     if (version) {
         label = timeseries->add_labels();
         label->set_name("version");
@@ -118,10 +118,6 @@ void add_metric(
     label->set_name("chart");
     label->set_value(chart);
 
-    label = timeseries->add_labels();
-    label->set_name("family");
-    label->set_value(family);
-
     if (dimension) {
         label = timeseries->add_labels();
         label->set_name("dimension");
@@ -129,6 +125,10 @@ void add_metric(
     }
 
     label = timeseries->add_labels();
+    label->set_name("family");
+    label->set_value(family);
+
+    label = timeseries->add_labels();
     label->set_name("instance");
     label->set_value(instance);