Skip to content

Fix creation of resources in _detector #366

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

Merged
aabmass merged 3 commits into from
Dec 26, 2024
Merged

Fix creation of resources in _detector #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1160c32
Fix creation of resources in _detector
xrmx Dec 19, 2024
b0ff830
Update snapshots
xrmx Dec 24, 2024
c87f638
Use get_aggregated_resources in e2e test so we get OTEL_RESOURCE_ATTR…
aabmass Dec 26, 2024
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
11 changes: 5 additions & 6 deletions e2e-test-server/e2e_test_server/scenarios.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from opentelemetry.sdk.trace.export import BatchSpanProcessor
from opentelemetry.sdk.trace.sampling import ALWAYS_ON
from opentelemetry.trace import SpanKind, Tracer, format_trace_id
from opentelemetry.sdk.resources import get_aggregated_resources
from pydantic import BaseModel

from .constants import INSTRUMENTING_MODULE_NAME, PROJECT_ID, TEST_ID, TRACE_ID
Expand Down Expand Up @@ -59,9 +60,7 @@ def _tracer_setup(
spans created during the test after.
"""

tracer_provider = TracerProvider(
sampler=ALWAYS_ON, **tracer_provider_config
)
tracer_provider = TracerProvider(sampler=ALWAYS_ON, **tracer_provider_config)
tracer_provider.add_span_processor(
BatchSpanProcessor(
CloudTraceSpanExporter(project_id=PROJECT_ID, **exporter_config)
Expand Down Expand Up @@ -139,9 +138,9 @@ def detect_resource(request: Request) -> Response:
"""Create a trace with GCP resource detector"""
with _tracer_setup(
tracer_provider_config={
"resource": GoogleCloudResourceDetector(
raise_on_error=True
).detect()
"resource": get_aggregated_resources(
[GoogleCloudResourceDetector(raise_on_error=True)]
)
},
exporter_config={"resource_regex": r".*"},
) as tracer:
Expand Down
2 changes: 1 addition & 1 deletion ...esourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/_detector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def _gae_resource() -> Resource:


def _make_resource(attrs: Mapping[str, AttributeValue]) -> Resource:
return Resource.create(
return Resource(
{
ResourceAttributes.CLOUD_PROVIDER: "gcp",
ResourceAttributes.CLOUD_ACCOUNT_ID: _metadata.get_metadata()[
Expand Down
28 changes: 0 additions & 28 deletions opentelemetry-resourcedetector-gcp/tests/__snapshots__/test_detector.ambr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
'faas.instance': '0087244a',
'faas.name': 'fake-service',
'faas.version': 'fake-revision',
'service.name': 'unknown_service',
'telemetry.sdk.language': 'python',
'telemetry.sdk.name': 'opentelemetry',
'telemetry.sdk.version': '1.20.0',
})
# ---
# name: test_detects_cloud_run
Expand All @@ -22,10 +18,6 @@
'faas.instance': '0087244a',
'faas.name': 'fake-service',
'faas.version': 'fake-revision',
'service.name': 'unknown_service',
'telemetry.sdk.language': 'python',
'telemetry.sdk.name': 'opentelemetry',
'telemetry.sdk.version': '1.20.0',
})
# ---
# name: test_detects_empty_as_fallback
Expand All @@ -46,10 +38,6 @@
'faas.instance': 'fake-instance',
'faas.name': 'fake-service',
'faas.version': 'fake-version',
'service.name': 'unknown_service',
'telemetry.sdk.language': 'python',
'telemetry.sdk.name': 'opentelemetry',
'telemetry.sdk.version': '1.20.0',
})
# ---
# name: test_detects_gae_standard
Expand All @@ -62,10 +50,6 @@
'faas.instance': 'fake-instance',
'faas.name': 'fake-service',
'faas.version': 'fake-version',
'service.name': 'unknown_service',
'telemetry.sdk.language': 'python',
'telemetry.sdk.name': 'opentelemetry',
'telemetry.sdk.version': '1.20.0',
})
# ---
# name: test_detects_gce
Expand All @@ -78,10 +62,6 @@
'host.id': '0087244a',
'host.name': 'fakeName',
'host.type': 'fakeMachineType',
'service.name': 'unknown_service',
'telemetry.sdk.language': 'python',
'telemetry.sdk.name': 'opentelemetry',
'telemetry.sdk.version': '1.20.0',
})
# ---
# name: test_detects_gke[regional]
Expand All @@ -92,10 +72,6 @@
'cloud.region': 'us-east4',
'host.id': '12345',
'k8s.cluster.name': 'fakeClusterName',
'service.name': 'unknown_service',
'telemetry.sdk.language': 'python',
'telemetry.sdk.name': 'opentelemetry',
'telemetry.sdk.version': '1.20.0',
})
# ---
# name: test_detects_gke[zonal]
Expand All @@ -106,9 +82,5 @@
'cloud.provider': 'gcp',
'host.id': '12345',
'k8s.cluster.name': 'fakeClusterName',
'service.name': 'unknown_service',
'telemetry.sdk.language': 'python',
'telemetry.sdk.name': 'opentelemetry',
'telemetry.sdk.version': '1.20.0',
})
# ---