Skip to content

[opentelemetry-resourcedetector-gcp] Fix directory structure and version number #4861

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

Open
DylanRussell wants to merge 4 commits into
base: main
Choose a base branch
from
+19 −18
Open

[opentelemetry-resourcedetector-gcp] Fix directory structure and version number #4861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4288aec
Fix GCP resource detecotr..
DylanRussell Jul 23, 2026
5fdb54e
Add changelog
DylanRussell Jul 23, 2026
e52eca1
Merge branch 'main' into fix-resource-detector
DylanRussell Jul 23, 2026
791e3af
Bump version #
DylanRussell Jul 23, 2026
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
1 change: 1 addition & 0 deletions resource/opentelemetry-resourcedetector-gcp/.changelog/4861.changed
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update package namespace to ``opentelemetry.resourcedetector.gcp_resource_detector``.
4 changes: 2 additions & 2 deletions resource/opentelemetry-resourcedetector-gcp/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions ...lemetry/resource/detector/gcp/__init__.py → ...etector/gcp_resource_detector/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...metry/resource/detector/gcp/_constants.py → ...ector/gcp_resource_detector/_constants.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ntelemetry/resource/detector/gcp/_faas.py → ...cedetector/gcp_resource_detector/_faas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry/resource/detector/gcp/_gae.py → ...rcedetector/gcp_resource_detector/_gae.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import os

from opentelemetry.resource.detector.gcp import (
from opentelemetry.resourcedetector.gcp_resource_detector import (
_faas,
_gce,
_metadata,
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry/resource/detector/gcp/_gce.py → ...rcedetector/gcp_resource_detector/_gce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry/resource/detector/gcp/_gke.py → ...rcedetector/gcp_resource_detector/_gke.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down
4 changes: 2 additions & 2 deletions ...lemetry/resource/detector/gcp/_mapping.py → ...etector/gcp_resource_detector/_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...emetry/resource/detector/gcp/_metadata.py → ...tector/gcp_resource_detector/_metadata.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...elemetry/resource/detector/gcp/version.py → ...detector/gcp_resource_detector/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright The OpenTelemetry Authors
# SPDX-License-Identifier: Apache-2.0

__version__ = "1.14.0.dev"
__version__ = "1.14.0a0.dev"
2 changes: 1 addition & 1 deletion resource/opentelemetry-resourcedetector-gcp/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion resource/opentelemetry-resourcedetector-gcp/tests/test_faas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion resource/opentelemetry-resourcedetector-gcp/tests/test_gae.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion resource/opentelemetry-resourcedetector-gcp/tests/test_gce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import pytest

from opentelemetry.resource.detector.gcp import (
from opentelemetry.resourcedetector.gcp_resource_detector import (
_gce,
_metadata,
)
Expand Down
2 changes: 1 addition & 1 deletion resource/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 @@ -6,7 +6,7 @@
import pytest
import requests

from opentelemetry.resource.detector.gcp import (
from opentelemetry.resourcedetector.gcp_resource_detector import (
GoogleCloudResourceDetector,
_metadata,
)
Expand Down
2 changes: 1 addition & 1 deletion resource/opentelemetry-resourcedetector-gcp/tests/test_gke.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion resource/opentelemetry-resourcedetector-gcp/tests/test_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading