Skip to content

Commit 0e9a8e4

Browse files
sdk: Span.resource will now default to an empty resource (#724)
Right now, A resource object attached to a Span can be None. That means that there's two similar objects that refer to an empty resource: None, and the _EMPTY_RESOURCE global. We should just always default to the _EMPTY_RESOURCE object: this avoids None checks in exporters. Co-authored-by: Yusuke Tsutsumi <[email protected]>
1 parent 46f8f64 commit 0e9a8e4

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

docs/sdk/resources.rst

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
opentelemetry.sdk.resources package
2+
==========================================
3+
4+
.. automodule:: opentelemetry.sdk.resources
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

docs/sdk/sdk.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ OpenTelemetry Python SDK
77
:maxdepth: 1
88

99
metrics
10-
trace
10+
resources
11+
trace

ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/__init__.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ def _translate_to_jaeger(spans: Span):
197197
parent_id = span.parent.span_id if span.parent else 0
198198

199199
tags = _extract_tags(span.attributes)
200-
if span.resource:
201-
tags.extend(_extract_tags(span.resource.labels))
200+
tags.extend(_extract_tags(span.resource.labels))
202201

203202
tags.extend(
204203
[

opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def __init__(
264264
parent: Optional[trace_api.SpanContext] = None,
265265
sampler: Optional[sampling.Sampler] = None,
266266
trace_config: None = None, # TODO
267-
resource: None = None,
267+
resource: Resource = Resource.create_empty(),
268268
attributes: types.Attributes = None, # TODO
269269
events: Sequence[Event] = None, # TODO
270270
links: Sequence[trace_api.Link] = (),

0 commit comments

Comments
 (0)