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

Tolerate exceptions among experimental resource detectors #4373

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Tolerate exceptions among experimental resource detectors #4373

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dbd4f4
feat: Tolerate exceptions among experimental resource detectors
cruisehall Dec 29, 2024
a47ffe3
test: 'Resource.create' tolerates missing resource detector
cruisehall Dec 29, 2024
993ed42
test: Adds additional assertion to 'test_resource_detector_entry_poin…
cruisehall Dec 29, 2024
c84cf02
chore: Updates CHANGELOG
cruisehall Dec 29, 2024
12edef9
Merge branch 'main' into feat/tolerate-missing-resource-detector
cruisehall Dec 29, 2024
4751ba7
feat: Logs exception when skipping a resource detector
cruisehall Jan 3, 2025
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#4260](https://github.com/open-telemetry/opentelemetry-python/pull/4260))
- semantic-conventions: Bump to 1.29.0
([#4337](https://github.com/open-telemetry/opentelemetry-python/pull/4337))
- Tolerates exceptions when loading resource detectors via `OTEL_EXPERIMENTAL_RESOURCE_DETECTORS` ([#4373](https://github.com/open-telemetry/opentelemetry-python/pull/4373))

## Version 1.28.0/0.49b0 (2024-11-05)

Expand Down
24 changes: 14 additions & 10 deletions opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,20 @@ def create(

resource_detector: str
for resource_detector in otel_experimental_resource_detectors:
resource_detectors.append(
next(
iter(
entry_points(
group="opentelemetry_resource_detector",
name=resource_detector.strip(),
) # type: ignore
)
).load()()
)
try:
resource_detectors.append(
next(
iter(
entry_points(
group="opentelemetry_resource_detector",
name=resource_detector.strip(),
) # type: ignore
)
).load()()
)
except:
# TODO emit warning per failed detector?
cruisehall marked this conversation as resolved.
Show resolved Hide resolved
continue
resource = get_aggregated_resources(
resource_detectors, _DEFAULT_RESOURCE
).merge(Resource(attributes, schema_url))
Expand Down
10 changes: 10 additions & 0 deletions opentelemetry-sdk/tests/resources/test_resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,3 +800,13 @@ def test_resource_detector_entry_points_host(self):
resource = Resource({}).create()
self.assertIn(HOST_NAME, resource.attributes)
self.assertIn(HOST_ARCH, resource.attributes)

@patch.dict(
environ, {OTEL_EXPERIMENTAL_RESOURCE_DETECTORS: "doesnotexist,host"}, clear=True
)
def test_resource_detector_entry_points_tolerate_missing_detector(self):
resource = Resource({}).create()
self.assertEqual(
resource.attributes["telemetry.sdk.language"], "python"
)
self.assertIn(HOST_NAME, resource.attributes)