Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use faas.instance instead of faas.id, and bump e2e test image #271

Merged
merged 1 commit into from
Aug 15, 2023
Merged

Use faas.instance instead of faas.id, and bump e2e test image #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cloudbuild-e2e-cloud-run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion cloudbuild-e2e-gce.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion cloudbuild-e2e-gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
2 changes: 1 addition & 1 deletion cloudbuild-e2e-local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
4 changes: 2 additions & 2 deletions ...resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}
)
Expand Down Expand Up @@ -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",
}
)
Expand Down
16 changes: 8 additions & 8 deletions opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down