automatically map faas.name and faas.instance to prometheus job and i…

…nstance (#695)
GoogleCloudPlatform · Aug 7, 2023 · b087585 · b087585
1 parent ce6e82d
commit b087585
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/exporter/collector/googlemanagedprometheus/monitoredresource.go b/exporter/collector/googlemanagedprometheus/monitoredresource.go
@@ -40,9 +40,9 @@ var promTargetKeys = map[string][]string{
 	locationLabel:         {locationLabel, semconv.AttributeCloudAvailabilityZone, semconv.AttributeCloudRegion},
 	clusterLabel:          {clusterLabel, semconv.AttributeK8SClusterName},
 	namespaceLabel:        {namespaceLabel, semconv.AttributeK8SNamespaceName},
-	jobLabel:              {semconv.AttributeServiceName},
+	jobLabel:              {jobLabel, semconv.AttributeFaaSName, semconv.AttributeServiceName},
 	serviceNamespaceLabel: {semconv.AttributeServiceNamespace},
-	instanceLabel:         {semconv.AttributeServiceInstanceID},
+	instanceLabel:         {instanceLabel, semconv.AttributeFaaSInstance, semconv.AttributeServiceInstanceID},
 }
 
 func MapToPrometheusTarget(res pcommon.Resource) *monitoredrespb.MonitoredResource {

diff --git a/exporter/collector/googlemanagedprometheus/monitoredresource_test.go b/exporter/collector/googlemanagedprometheus/monitoredresource_test.go
@@ -146,6 +146,25 @@ func TestMapToPrometheusTarget(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc: "Attributes from cloud run",
+			resourceLabels: map[string]string{
+				"cloud.region":  "us-central1",
+				"service.name":  "service:unknown",
+				"faas.name":     "my-cloud-run-service",
+				"faas.instance": "1234759430923053489543203",
+			},
+			expected: &monitoredrespb.MonitoredResource{
+				Type: "prometheus_target",
+				Labels: map[string]string{
+					"location":  "us-central1",
+					"cluster":   "",
+					"namespace": "",
+					"job":       "my-cloud-run-service",
+					"instance":  "1234759430923053489543203",
+				},
+			},
+		},
 	} {
 		t.Run(tc.desc, func(t *testing.T) {
 			r := pcommon.NewResource()