Skip to content

Commit b3aa7a7

Browse files
authored
Update TraceState (#276)
1 parent 8b9202b commit b3aa7a7

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

Diff for: .github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 2b188b9a43dfaa74c1a0a4514b91d1cb07d3075d
9+
CORE_REPO_SHA: dea21fdf97472e5b4434e8455d1aaf9c2130028c
1010

1111
jobs:
1212
build:

Diff for: CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6565
([#246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/246))
6666
- `opentelemetry-instrumentation-dbapi`, `opentelemetry-instrumentation-psycopg2`, `opentelemetry-instrumentation-mysql`, `opentelemetry-instrumentation-pymysql`, `opentelemetry-instrumentation-aiopg` Use SQL command name as the span operation name instead of the entire query.
6767
([#246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/246))
68+
- Update TraceState to adhere to specs
69+
([#276](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/276))
6870

6971
## [0.16b1](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.16b1) - 2020-11-26
7072

Diff for: exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DD_ORIGIN = "_dd_origin"
1+
DD_ORIGIN = "dd_origin"
22
AUTO_REJECT = 0
33
AUTO_KEEP = 1
44
USER_KEEP = 2

Diff for: exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def extract(
7070
span_id=int(span_id),
7171
is_remote=True,
7272
trace_flags=trace_flags,
73-
trace_state=trace.TraceState({constants.DD_ORIGIN: origin}),
73+
trace_state=trace.TraceState([(constants.DD_ORIGIN, origin)]),
7474
)
7575

7676
return set_span_in_context(trace.DefaultSpan(span_context), context)

Diff for: exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ def test_origin(self):
542542
span_id=trace_api.INVALID_SPAN,
543543
is_remote=True,
544544
trace_state=trace_api.TraceState(
545-
{datadog.constants.DD_ORIGIN: "origin-service"}
545+
[(datadog.constants.DD_ORIGIN, "origin-service")]
546546
),
547547
)
548548

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,9 @@ def test_inject_into_context_with_non_default_state(self):
139139
AwsXRayPropagatorTest.XRAY_PROPAGATOR.inject(
140140
AwsXRayPropagatorTest.carrier_setter,
141141
carrier,
142-
build_test_current_context(trace_state=TraceState({"foo": "bar"})),
142+
build_test_current_context(
143+
trace_state=TraceState([("foo", "bar")])
144+
),
143145
)
144146

145147
# TODO: (NathanielRN) Assert trace state when the propagator supports it

0 commit comments

Comments
 (0)