From 4b25afdb043797888e76b39ce0698f8e6f0d606d Mon Sep 17 00:00:00 2001 From: Dylan Russell Date: Fri, 24 Jul 2026 17:32:16 +0000 Subject: [PATCH 1/3] Add gcp_resource_detector back as entry point name --- .../opentelemetry-resourcedetector-gcp/pyproject.toml | 1 + .../tests/test_gcp_resource_detector.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/resource/opentelemetry-resourcedetector-gcp/pyproject.toml b/resource/opentelemetry-resourcedetector-gcp/pyproject.toml index a065c35b3c..2dc7230587 100644 --- a/resource/opentelemetry-resourcedetector-gcp/pyproject.toml +++ b/resource/opentelemetry-resourcedetector-gcp/pyproject.toml @@ -32,6 +32,7 @@ dependencies = [ [project.entry-points.opentelemetry_resource_detector] gcp = "opentelemetry.resourcedetector.gcp_resource_detector:GoogleCloudResourceDetector" +gcp_resource_detector = "opentelemetry.resourcedetector.gcp_resource_detector:GoogleCloudResourceDetector" [project.urls] Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/resource/opentelemetry-resourcedetector-gcp" diff --git a/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py b/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py index d381059a84..8f56d4d51e 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py @@ -1,6 +1,7 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 +from importlib.metadata import entry_points from unittest.mock import Mock import pytest @@ -187,3 +188,13 @@ def test_detects_gae_flex( ) assert dict(GoogleCloudResourceDetector().detect().attributes) == snapshot + + +def test_entry_points(): + eps = entry_points(group="opentelemetry_resource_detector") + ep_map = {ep.name: ep for ep in eps} + assert "gcp" in ep_map + assert "gcp_resource_detector" in ep_map + assert ep_map["gcp"].load() is GoogleCloudResourceDetector + assert ep_map["gcp_resource_detector"].load() is GoogleCloudResourceDetector + From 08be5783d2f3f463cb20613e2e9b3d1d38b8f0e2 Mon Sep 17 00:00:00 2001 From: Dylan Russell Date: Fri, 24 Jul 2026 17:36:21 +0000 Subject: [PATCH 2/3] Add changelog entry for #4865 --- .../opentelemetry-resourcedetector-gcp/.changelog/4865.fixed | 1 + 1 file changed, 1 insertion(+) create mode 100644 resource/opentelemetry-resourcedetector-gcp/.changelog/4865.fixed diff --git a/resource/opentelemetry-resourcedetector-gcp/.changelog/4865.fixed b/resource/opentelemetry-resourcedetector-gcp/.changelog/4865.fixed new file mode 100644 index 0000000000..cc06b4d023 --- /dev/null +++ b/resource/opentelemetry-resourcedetector-gcp/.changelog/4865.fixed @@ -0,0 +1 @@ +Add back `gcp_resource_detector` entry point name for backward compatibility. From eb2ba486649cf0ddc3ca53baa50ca4e57d148e31 Mon Sep 17 00:00:00 2001 From: Dylan Russell Date: Fri, 24 Jul 2026 17:41:05 +0000 Subject: [PATCH 3/3] Run precommit --- .../tests/test_gcp_resource_detector.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py b/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py index 8f56d4d51e..92e08293dd 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py @@ -196,5 +196,6 @@ def test_entry_points(): assert "gcp" in ep_map assert "gcp_resource_detector" in ep_map assert ep_map["gcp"].load() is GoogleCloudResourceDetector - assert ep_map["gcp_resource_detector"].load() is GoogleCloudResourceDetector - + assert ( + ep_map["gcp_resource_detector"].load() is GoogleCloudResourceDetector + )