From 4288aec5a91e4a8bc21e2387e2551c3540dfe80b Mon Sep 17 00:00:00 2001 From: Dylan Russell Date: Thu, 23 Jul 2026 14:59:34 +0000 Subject: [PATCH 1/3] Fix GCP resource detecotr.. --- resource/opentelemetry-resourcedetector-gcp/pyproject.toml | 4 ++-- .../gcp_resource_detector}/__init__.py | 4 ++-- .../gcp_resource_detector}/_constants.py | 0 .../gcp => resourcedetector/gcp_resource_detector}/_faas.py | 2 +- .../gcp => resourcedetector/gcp_resource_detector}/_gae.py | 2 +- .../gcp => resourcedetector/gcp_resource_detector}/_gce.py | 2 +- .../gcp => resourcedetector/gcp_resource_detector}/_gke.py | 2 +- .../gcp_resource_detector}/_mapping.py | 4 ++-- .../gcp_resource_detector}/_metadata.py | 0 .../gcp => resourcedetector/gcp_resource_detector}/version.py | 3 +-- resource/opentelemetry-resourcedetector-gcp/tests/conftest.py | 2 +- .../opentelemetry-resourcedetector-gcp/tests/test_faas.py | 2 +- resource/opentelemetry-resourcedetector-gcp/tests/test_gae.py | 2 +- resource/opentelemetry-resourcedetector-gcp/tests/test_gce.py | 2 +- .../tests/test_gcp_resource_detector.py | 2 +- resource/opentelemetry-resourcedetector-gcp/tests/test_gke.py | 2 +- .../opentelemetry-resourcedetector-gcp/tests/test_mapping.py | 2 +- 17 files changed, 18 insertions(+), 19 deletions(-) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/__init__.py (96%) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/_constants.py (100%) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/_faas.py (94%) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/_gae.py (96%) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/_gce.py (95%) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/_gke.py (94%) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/_mapping.py (98%) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/_metadata.py (100%) rename resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/{resource/detector/gcp => resourcedetector/gcp_resource_detector}/version.py (72%) diff --git a/resource/opentelemetry-resourcedetector-gcp/pyproject.toml b/resource/opentelemetry-resourcedetector-gcp/pyproject.toml index 517b88a69f..a065c35b3c 100644 --- a/resource/opentelemetry-resourcedetector-gcp/pyproject.toml +++ b/resource/opentelemetry-resourcedetector-gcp/pyproject.toml @@ -31,14 +31,14 @@ dependencies = [ ] [project.entry-points.opentelemetry_resource_detector] -gcp = "opentelemetry.resource.detector.gcp:GoogleCloudResourceDetector" +gcp = "opentelemetry.resourcedetector.gcp_resource_detector:GoogleCloudResourceDetector" [project.urls] Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/resource/opentelemetry-resourcedetector-gcp" Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib" [tool.hatch.version] -path = "src/opentelemetry/resource/detector/gcp/version.py" +path = "src/opentelemetry/resourcedetector/gcp_resource_detector/version.py" [tool.hatch.build.targets.sdist] include = [ diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/__init__.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/__init__.py similarity index 96% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/__init__.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/__init__.py index 41e6613f8e..19eaa9dff8 100644 --- a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/__init__.py +++ b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/__init__.py @@ -3,14 +3,14 @@ from typing import Mapping -from opentelemetry.resource.detector.gcp import ( +from opentelemetry.resourcedetector.gcp_resource_detector import ( _faas, _gae, _gce, _gke, _metadata, ) -from opentelemetry.resource.detector.gcp._constants import ( +from opentelemetry.resourcedetector.gcp_resource_detector._constants import ( ResourceAttributes, ) from opentelemetry.sdk.resources import Resource, ResourceDetector diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_constants.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_constants.py similarity index 100% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_constants.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_constants.py diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_faas.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_faas.py similarity index 94% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_faas.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_faas.py index cad55f7d1c..0825d484f7 100644 --- a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_faas.py +++ b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_faas.py @@ -6,7 +6,7 @@ import os -from opentelemetry.resource.detector.gcp import _metadata +from opentelemetry.resourcedetector.gcp_resource_detector import _metadata _CLOUD_RUN_CONFIG_ENV = "K_CONFIGURATION" _CLOUD_FUNCTION_TARGET_ENV = "FUNCTION_TARGET" diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gae.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gae.py similarity index 96% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gae.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gae.py index c3ae84f95a..0560bb4a88 100644 --- a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gae.py +++ b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gae.py @@ -6,7 +6,7 @@ import os -from opentelemetry.resource.detector.gcp import ( +from opentelemetry.resourcedetector.gcp_resource_detector import ( _faas, _gce, _metadata, diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gce.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gce.py similarity index 95% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gce.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gce.py index 5fff92e5d6..1e16a28855 100644 --- a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gce.py +++ b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gce.py @@ -5,7 +5,7 @@ import re from dataclasses import dataclass -from opentelemetry.resource.detector.gcp import _metadata +from opentelemetry.resourcedetector.gcp_resource_detector import _metadata # Format described in # https://cloud.google.com/compute/docs/metadata/default-metadata-values#vm_instance_metadata diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gke.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py similarity index 94% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gke.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py index 482b2d7268..580f5052c2 100644 --- a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_gke.py +++ b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_gke.py @@ -5,7 +5,7 @@ from dataclasses import dataclass from typing import Literal -from opentelemetry.resource.detector.gcp import ( +from opentelemetry.resourcedetector.gcp_resource_detector import ( _gce, _metadata, ) diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_mapping.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_mapping.py similarity index 98% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_mapping.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_mapping.py index 3aad900210..2e0f5055a9 100644 --- a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_mapping.py +++ b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_mapping.py @@ -5,8 +5,8 @@ from dataclasses import dataclass from typing import Dict, Mapping, Optional, Tuple -from opentelemetry.resource.detector.gcp import _constants -from opentelemetry.resource.detector.gcp._constants import ( +from opentelemetry.resourcedetector.gcp_resource_detector import _constants +from opentelemetry.resourcedetector.gcp_resource_detector._constants import ( ResourceAttributes, ) from opentelemetry.sdk.resources import Attributes, Resource diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_metadata.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py similarity index 100% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/_metadata.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_metadata.py diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/version.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/version.py similarity index 72% rename from resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/version.py rename to resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/version.py index 5d1e81efd8..1b3433a146 100644 --- a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resource/detector/gcp/version.py +++ b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/version.py @@ -1,4 +1,3 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 - -__version__ = "1.13.0.dev" +__version__ = "1.13.0a0.dev" diff --git a/resource/opentelemetry-resourcedetector-gcp/tests/conftest.py b/resource/opentelemetry-resourcedetector-gcp/tests/conftest.py index 9965635d27..8edc011ec1 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/conftest.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/conftest.py @@ -5,7 +5,7 @@ import pytest -from opentelemetry.resource.detector.gcp import _metadata +from opentelemetry.resourcedetector.gcp_resource_detector import _metadata @pytest.fixture(name="fake_get_metadata") diff --git a/resource/opentelemetry-resourcedetector-gcp/tests/test_faas.py b/resource/opentelemetry-resourcedetector-gcp/tests/test_faas.py index 5c0b4ae5dc..3226891503 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/test_faas.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/test_faas.py @@ -5,7 +5,7 @@ import pytest -from opentelemetry.resource.detector.gcp import _faas +from opentelemetry.resourcedetector.gcp_resource_detector import _faas # Reset stuff before every test diff --git a/resource/opentelemetry-resourcedetector-gcp/tests/test_gae.py b/resource/opentelemetry-resourcedetector-gcp/tests/test_gae.py index a0e38b3f79..85a8d6750c 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/test_gae.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/test_gae.py @@ -5,7 +5,7 @@ import pytest -from opentelemetry.resource.detector.gcp import _gae +from opentelemetry.resourcedetector.gcp_resource_detector import _gae # Reset stuff before every test diff --git a/resource/opentelemetry-resourcedetector-gcp/tests/test_gce.py b/resource/opentelemetry-resourcedetector-gcp/tests/test_gce.py index 04d2bff2bc..a0a0d8b9de 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/test_gce.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/test_gce.py @@ -5,7 +5,7 @@ import pytest -from opentelemetry.resource.detector.gcp import ( +from opentelemetry.resourcedetector.gcp_resource_detector import ( _gce, _metadata, ) 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 2eadaa1f8e..d381059a84 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/test_gcp_resource_detector.py @@ -6,7 +6,7 @@ import pytest import requests -from opentelemetry.resource.detector.gcp import ( +from opentelemetry.resourcedetector.gcp_resource_detector import ( GoogleCloudResourceDetector, _metadata, ) diff --git a/resource/opentelemetry-resourcedetector-gcp/tests/test_gke.py b/resource/opentelemetry-resourcedetector-gcp/tests/test_gke.py index 84434ef896..a2a38060db 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/test_gke.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/test_gke.py @@ -4,7 +4,7 @@ import pytest -from opentelemetry.resource.detector.gcp import _gke +from opentelemetry.resourcedetector.gcp_resource_detector import _gke def test_detects_on_gke(monkeypatch: pytest.MonkeyPatch) -> None: diff --git a/resource/opentelemetry-resourcedetector-gcp/tests/test_mapping.py b/resource/opentelemetry-resourcedetector-gcp/tests/test_mapping.py index 65572b1ace..41eea6290d 100644 --- a/resource/opentelemetry-resourcedetector-gcp/tests/test_mapping.py +++ b/resource/opentelemetry-resourcedetector-gcp/tests/test_mapping.py @@ -6,7 +6,7 @@ import pytest from syrupy.assertion import SnapshotAssertion -from opentelemetry.resource.detector.gcp._mapping import ( +from opentelemetry.resourcedetector.gcp_resource_detector._mapping import ( get_monitored_resource, ) from opentelemetry.sdk.resources import Attributes, LabelValue, Resource From 5fdb54ea05053888c4f5a4af803e0ef99e69f17f Mon Sep 17 00:00:00 2001 From: Dylan Russell Date: Thu, 23 Jul 2026 15:18:36 +0000 Subject: [PATCH 2/3] Add changelog --- .../opentelemetry-resourcedetector-gcp/.changelog/4861.changed | 1 + 1 file changed, 1 insertion(+) create mode 100644 resource/opentelemetry-resourcedetector-gcp/.changelog/4861.changed diff --git a/resource/opentelemetry-resourcedetector-gcp/.changelog/4861.changed b/resource/opentelemetry-resourcedetector-gcp/.changelog/4861.changed new file mode 100644 index 0000000000..346ab7f9d4 --- /dev/null +++ b/resource/opentelemetry-resourcedetector-gcp/.changelog/4861.changed @@ -0,0 +1 @@ +Update package namespace to ``opentelemetry.resourcedetector.gcp_resource_detector``. From 791e3af6b80f14b740740d3885ec01b1cde3075a Mon Sep 17 00:00:00 2001 From: Dylan Russell Date: Thu, 23 Jul 2026 15:45:00 +0000 Subject: [PATCH 3/3] Bump version # --- .../resourcedetector/gcp_resource_detector/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/version.py b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/version.py index a4fefa799f..5cfde14393 100644 --- a/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/version.py +++ b/resource/opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/version.py @@ -1,4 +1,4 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 -__version__ = "1.13.0a0.dev" +__version__ = "1.14.0a0.dev"