Add host.id as a fallback for instance (#852)

* add host.id as a fallback for instance * add additional test for service instance id override
GoogleCloudPlatform · May 22, 2024 · 4c2cadc · 4c2cadc
1 parent f2ec3e7
commit 4c2cadc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/exporter/collector/googlemanagedprometheus/monitoredresource.go b/exporter/collector/googlemanagedprometheus/monitoredresource.go
@@ -71,6 +71,7 @@ var promTargetKeys = map[string][]string{
 		semconv.AttributeServiceInstanceID,
 		semconv.AttributeFaaSInstance,
 		semconv.AttributeK8SPodName,
+		semconv.AttributeHostID,
 	},
 }
 

diff --git a/exporter/collector/googlemanagedprometheus/monitoredresource_test.go b/exporter/collector/googlemanagedprometheus/monitoredresource_test.go
@@ -319,11 +319,31 @@ func TestMapToPrometheusTarget(t *testing.T) {
 		},
 		{
 			desc: "Attributes from GCE with environment label",
+			resourceLabels: map[string]string{
+				"cloud.platform": "gcp_compute_engine",
+				"cloud.region":   "us-central1",
+				"service.name":   "service-name",
+				"host.id":        "1234759430923053489543203",
+			},
+			expected: &monitoredrespb.MonitoredResource{
+				Type: "prometheus_target",
+				Labels: map[string]string{
+					"location":  "us-central1",
+					"cluster":   "__gce__",
+					"namespace": "",
+					"job":       "service-name",
+					"instance":  "1234759430923053489543203",
+				},
+			},
+		},
+		{
+			desc: "Attributes from GCE with instance ID override",
 			resourceLabels: map[string]string{
 				"cloud.platform":      "gcp_compute_engine",
 				"cloud.region":        "us-central1",
 				"service.name":        "service-name",
-				"service.instance.id": "1234759430923053489543203",
+				"service.instance.id": "service-instance-id",
+				"host.id":             "1234759430923053489543203",
 			},
 			expected: &monitoredrespb.MonitoredResource{
 				Type: "prometheus_target",
@@ -332,7 +352,7 @@ func TestMapToPrometheusTarget(t *testing.T) {
 					"cluster":   "__gce__",
 					"namespace": "",
 					"job":       "service-name",
-					"instance":  "1234759430923053489543203",
+					"instance":  "service-instance-id",
 				},
 			},
 		},