use faas.instance instead of faas.id, and bump e2e test image (#271)

GoogleCloudPlatform · Aug 15, 2023 · b0ca7de · b0ca7de
1 parent 5d1e729
commit b0ca7de
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/cloudbuild-e2e-cloud-run.yaml b/cloudbuild-e2e-cloud-run.yaml
@@ -32,5 +32,5 @@ steps:
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
-  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
+  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
   _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
diff --git a/cloudbuild-e2e-gce.yaml b/cloudbuild-e2e-gce.yaml
@@ -34,5 +34,5 @@ steps:
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
-  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
+  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
   _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
diff --git a/cloudbuild-e2e-gke.yaml b/cloudbuild-e2e-gke.yaml
@@ -32,5 +32,5 @@ steps:
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
-  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
+  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
   _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
diff --git a/cloudbuild-e2e-local.yaml b/cloudbuild-e2e-local.yaml
@@ -34,5 +34,5 @@ steps:
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
 substitutions:
-  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
+  _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
   _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
diff --git a/...resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/__init__.py b/...resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/__init__.py
@@ -122,7 +122,7 @@ def get_cloudrun_resources():
         {
             "cloud.platform": "gcp_cloud_run",
             "cloud.region": all_metadata["instance"]["region"].split("/")[-1],
-            "faas.id": all_metadata["instance"]["id"],
+            "faas.instance": all_metadata["instance"]["id"],
             "gcp.resource_type": "cloud_run",
         }
     )
@@ -152,7 +152,7 @@ def get_cloudfunctions_resources():
         {
             "cloud.platform": "gcp_cloud_functions",
             "cloud.region": all_metadata["instance"]["region"].split("/")[-1],
-            "faas.id": all_metadata["instance"]["id"],
+            "faas.instance": all_metadata["instance"]["id"],
             "gcp.resource_type": "cloud_functions",
         }
     )

diff --git a/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py b/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py
@@ -241,7 +241,7 @@ def test_missing_service_name(self, getter):
                 "cloud.account.id": "project_id",
                 "cloud.platform": "gcp_cloud_run",
                 "cloud.region": "region",
-                "faas.id": "instance_id",
+                "faas.instance": "instance_id",
                 "cloud.zone": "zone",
                 "cloud.provider": "gcp",
                 "gcp.resource_type": "cloud_run",
@@ -260,7 +260,7 @@ def test_environment_empty_strings(self, getter):
                 "cloud.account.id": "project_id",
                 "cloud.platform": "gcp_cloud_run",
                 "cloud.region": "region",
-                "faas.id": "instance_id",
+                "faas.instance": "instance_id",
                 "faas.name": "",
                 "faas.version": "",
                 "cloud.zone": "zone",
@@ -281,7 +281,7 @@ def test_finding_cloudrun_resources(self, getter):
                 "cloud.account.id": "project_id",
                 "cloud.platform": "gcp_cloud_run",
                 "cloud.region": "region",
-                "faas.id": "instance_id",
+                "faas.instance": "instance_id",
                 "faas.name": "service",
                 "faas.version": "revision",
                 "cloud.zone": "zone",
@@ -315,7 +315,7 @@ def test_missing_service_name(self, getter):
                 "cloud.account.id": "project_id",
                 "cloud.platform": "gcp_cloud_functions",
                 "cloud.region": "region",
-                "faas.id": "instance_id",
+                "faas.instance": "instance_id",
                 "cloud.zone": "zone",
                 "cloud.provider": "gcp",
                 "gcp.resource_type": "cloud_functions",
@@ -334,7 +334,7 @@ def test_environment_empty_strings(self, getter):
                 "cloud.account.id": "project_id",
                 "cloud.platform": "gcp_cloud_functions",
                 "cloud.region": "region",
-                "faas.id": "instance_id",
+                "faas.instance": "instance_id",
                 "faas.name": "",
                 "faas.version": "",
                 "cloud.zone": "zone",
@@ -355,7 +355,7 @@ def test_finding_cloudfunctions_resources(self, getter):
                 "cloud.account.id": "project_id",
                 "cloud.platform": "gcp_cloud_functions",
                 "cloud.region": "region",
-                "faas.id": "instance_id",
+                "faas.instance": "instance_id",
                 "faas.name": "service",
                 "faas.version": "revision",
                 "cloud.zone": "zone",
@@ -458,7 +458,7 @@ def test_finding_cloudrun_resources(self, getter):
                     "cloud.account.id": "project_id",
                     "cloud.platform": "gcp_cloud_run",
                     "cloud.region": "region",
-                    "faas.id": "instance_id",
+                    "faas.instance": "instance_id",
                     "faas.name": "service",
                     "faas.version": "revision",
                     "cloud.zone": "zone",
@@ -489,7 +489,7 @@ def test_finding_cloudfunctions_resources(self, getter):
                     "cloud.account.id": "project_id",
                     "cloud.platform": "gcp_cloud_functions",
                     "cloud.region": "region",
-                    "faas.id": "instance_id",
+                    "faas.instance": "instance_id",
                     "faas.name": "service",
                     "faas.version": "revision",
                     "cloud.zone": "zone",