Skip to content

Commit b0ca7de

Browse files
dashpoledashpole
authored
use faas.instance instead of faas.id, and bump e2e test image (#271)
1 parent 5d1e729 commit b0ca7de

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

‎cloudbuild-e2e-cloud-run.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ steps:
3232

3333
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3434
substitutions:
35-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
35+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3636
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}

‎cloudbuild-e2e-gce.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ steps:
3434

3535
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3636
substitutions:
37-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
37+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3838
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}

‎cloudbuild-e2e-gke.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ steps:
3232

3333
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3434
substitutions:
35-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
35+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3636
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}

‎cloudbuild-e2e-local.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ steps:
3434

3535
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3636
substitutions:
37-
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.16.0
37+
_TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.17.0
3838
_TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}

‎opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def get_cloudrun_resources():
122122
{
123123
"cloud.platform": "gcp_cloud_run",
124124
"cloud.region": all_metadata["instance"]["region"].split("/")[-1],
125-
"faas.id": all_metadata["instance"]["id"],
125+
"faas.instance": all_metadata["instance"]["id"],
126126
"gcp.resource_type": "cloud_run",
127127
}
128128
)
@@ -152,7 +152,7 @@ def get_cloudfunctions_resources():
152152
{
153153
"cloud.platform": "gcp_cloud_functions",
154154
"cloud.region": all_metadata["instance"]["region"].split("/")[-1],
155-
"faas.id": all_metadata["instance"]["id"],
155+
"faas.instance": all_metadata["instance"]["id"],
156156
"gcp.resource_type": "cloud_functions",
157157
}
158158
)

‎opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def test_missing_service_name(self, getter):
241241
"cloud.account.id": "project_id",
242242
"cloud.platform": "gcp_cloud_run",
243243
"cloud.region": "region",
244-
"faas.id": "instance_id",
244+
"faas.instance": "instance_id",
245245
"cloud.zone": "zone",
246246
"cloud.provider": "gcp",
247247
"gcp.resource_type": "cloud_run",
@@ -260,7 +260,7 @@ def test_environment_empty_strings(self, getter):
260260
"cloud.account.id": "project_id",
261261
"cloud.platform": "gcp_cloud_run",
262262
"cloud.region": "region",
263-
"faas.id": "instance_id",
263+
"faas.instance": "instance_id",
264264
"faas.name": "",
265265
"faas.version": "",
266266
"cloud.zone": "zone",
@@ -281,7 +281,7 @@ def test_finding_cloudrun_resources(self, getter):
281281
"cloud.account.id": "project_id",
282282
"cloud.platform": "gcp_cloud_run",
283283
"cloud.region": "region",
284-
"faas.id": "instance_id",
284+
"faas.instance": "instance_id",
285285
"faas.name": "service",
286286
"faas.version": "revision",
287287
"cloud.zone": "zone",
@@ -315,7 +315,7 @@ def test_missing_service_name(self, getter):
315315
"cloud.account.id": "project_id",
316316
"cloud.platform": "gcp_cloud_functions",
317317
"cloud.region": "region",
318-
"faas.id": "instance_id",
318+
"faas.instance": "instance_id",
319319
"cloud.zone": "zone",
320320
"cloud.provider": "gcp",
321321
"gcp.resource_type": "cloud_functions",
@@ -334,7 +334,7 @@ def test_environment_empty_strings(self, getter):
334334
"cloud.account.id": "project_id",
335335
"cloud.platform": "gcp_cloud_functions",
336336
"cloud.region": "region",
337-
"faas.id": "instance_id",
337+
"faas.instance": "instance_id",
338338
"faas.name": "",
339339
"faas.version": "",
340340
"cloud.zone": "zone",
@@ -355,7 +355,7 @@ def test_finding_cloudfunctions_resources(self, getter):
355355
"cloud.account.id": "project_id",
356356
"cloud.platform": "gcp_cloud_functions",
357357
"cloud.region": "region",
358-
"faas.id": "instance_id",
358+
"faas.instance": "instance_id",
359359
"faas.name": "service",
360360
"faas.version": "revision",
361361
"cloud.zone": "zone",
@@ -458,7 +458,7 @@ def test_finding_cloudrun_resources(self, getter):
458458
"cloud.account.id": "project_id",
459459
"cloud.platform": "gcp_cloud_run",
460460
"cloud.region": "region",
461-
"faas.id": "instance_id",
461+
"faas.instance": "instance_id",
462462
"faas.name": "service",
463463
"faas.version": "revision",
464464
"cloud.zone": "zone",
@@ -489,7 +489,7 @@ def test_finding_cloudfunctions_resources(self, getter):
489489
"cloud.account.id": "project_id",
490490
"cloud.platform": "gcp_cloud_functions",
491491
"cloud.region": "region",
492-
"faas.id": "instance_id",
492+
"faas.instance": "instance_id",
493493
"faas.name": "service",
494494
"faas.version": "revision",
495495
"cloud.zone": "zone",

0 commit comments

Comments
 (0)