Skip to content

Commit 7980997

Browse files
authored
Rename DefaultSpan to NonRecordingSpan (#354)
1 parent e57dec8 commit 7980997

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 0008290841a1f59ee266f906dd841fc151f757ea
9+
CORE_REPO_SHA: 91ae6fc6226ddfbbe9f92da286470cf65aa834a4
1010

1111
jobs:
1212
build:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88

99
### Changed
1010
- Rename `IdsGenerator` to `IdGenerator`
11-
([#350])(https://github.com/open-telemetry/opentelemetry-python/pull/350)
11+
([#350](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/350))
1212

1313
## [0.18b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.18b0) - 2021-02-16
1414

exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ def extract(
7373
trace_state=trace.TraceState([(constants.DD_ORIGIN, origin)]),
7474
)
7575

76-
return set_span_in_context(trace.DefaultSpan(span_context), context)
76+
return set_span_in_context(
77+
trace.NonRecordingSpan(span_context), context
78+
)
7779

7880
def inject(
7981
self,

propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from opentelemetry.trace import (
2121
INVALID_SPAN_ID,
2222
INVALID_TRACE_ID,
23-
DefaultSpan,
23+
NonRecordingSpan,
2424
SpanContext,
2525
TraceFlags,
2626
get_current_span,
@@ -76,7 +76,7 @@ def extract(
7676
and _valid_extract_spanid.fullmatch(spanid) is not None
7777
):
7878
context = set_span_in_context(
79-
DefaultSpan(
79+
NonRecordingSpan(
8080
SpanContext(
8181
trace_id=int(traceid, 16),
8282
span_id=int(spanid, 16),

sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/trace/propagation/aws_xray_format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def extract(
151151
)
152152

153153
return trace.set_span_in_context(
154-
trace.DefaultSpan(span_context), context=context
154+
trace.NonRecordingSpan(span_context), context=context
155155
)
156156

157157
@staticmethod

sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def build_test_current_context(
5656
trace_state=DEFAULT_TRACE_STATE,
5757
):
5858
return set_span_in_context(
59-
trace_api.DefaultSpan(
59+
trace_api.NonRecordingSpan(
6060
build_test_span_context(
6161
trace_id, span_id, is_remote, trace_flags, trace_state
6262
)

0 commit comments

Comments
 (0)