Skip to content

Commit c87f638

Browse files
committed
Use get_aggregated_resources in e2e test so we get OTEL_RESOURCE_ATTRIBUTES envvar
1 parent b0ff830 commit c87f638

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

e2e-test-server/e2e_test_server/scenarios.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from opentelemetry.sdk.trace.export import BatchSpanProcessor
3030
from opentelemetry.sdk.trace.sampling import ALWAYS_ON
3131
from opentelemetry.trace import SpanKind, Tracer, format_trace_id
32+
from opentelemetry.sdk.resources import get_aggregated_resources
3233
from pydantic import BaseModel
3334

3435
from .constants import INSTRUMENTING_MODULE_NAME, PROJECT_ID, TEST_ID, TRACE_ID
@@ -59,9 +60,7 @@ def _tracer_setup(
5960
spans created during the test after.
6061
"""
6162

62-
tracer_provider = TracerProvider(
63-
sampler=ALWAYS_ON, **tracer_provider_config
64-
)
63+
tracer_provider = TracerProvider(sampler=ALWAYS_ON, **tracer_provider_config)
6564
tracer_provider.add_span_processor(
6665
BatchSpanProcessor(
6766
CloudTraceSpanExporter(project_id=PROJECT_ID, **exporter_config)
@@ -139,9 +138,9 @@ def detect_resource(request: Request) -> Response:
139138
"""Create a trace with GCP resource detector"""
140139
with _tracer_setup(
141140
tracer_provider_config={
142-
"resource": GoogleCloudResourceDetector(
143-
raise_on_error=True
144-
).detect()
141+
"resource": get_aggregated_resources(
142+
[GoogleCloudResourceDetector(raise_on_error=True)]
143+
)
145144
},
146145
exporter_config={"resource_regex": r".*"},
147146
) as tracer:

0 commit comments

Comments
 (0)