diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 02406343a7..29c1337d45 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: 2b188b9a43dfaa74c1a0a4514b91d1cb07d3075d + CORE_REPO_SHA: dea21fdf97472e5b4434e8455d1aaf9c2130028c jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 86fc70995c..b36a5f7c82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/246)) - `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. ([#246](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/246)) +- Update TraceState to adhere to specs + ([#276](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/276)) ## [0.16b1](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.16b1) - 2020-11-26 diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py index 2ae5386e84..90f15a7ffc 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py @@ -1,4 +1,4 @@ -DD_ORIGIN = "_dd_origin" +DD_ORIGIN = "dd_origin" AUTO_REJECT = 0 AUTO_KEEP = 1 USER_KEEP = 2 diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py index 66c833174e..d5f14011be 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py @@ -70,7 +70,7 @@ def extract( span_id=int(span_id), is_remote=True, trace_flags=trace_flags, - trace_state=trace.TraceState({constants.DD_ORIGIN: origin}), + trace_state=trace.TraceState([(constants.DD_ORIGIN, origin)]), ) return set_span_in_context(trace.DefaultSpan(span_context), context) diff --git a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py index 3ef5d226b9..4a576c5de1 100644 --- a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py +++ b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py @@ -542,7 +542,7 @@ def test_origin(self): span_id=trace_api.INVALID_SPAN, is_remote=True, trace_state=trace_api.TraceState( - {datadog.constants.DD_ORIGIN: "origin-service"} + [(datadog.constants.DD_ORIGIN, "origin-service")] ), ) diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py b/sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py index 3d5fb36069..5130c9daed 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/tests/trace/propagation/test_aws_xray_format.py @@ -139,7 +139,9 @@ def test_inject_into_context_with_non_default_state(self): AwsXRayPropagatorTest.XRAY_PROPAGATOR.inject( AwsXRayPropagatorTest.carrier_setter, carrier, - build_test_current_context(trace_state=TraceState({"foo": "bar"})), + build_test_current_context( + trace_state=TraceState([("foo", "bar")]) + ), ) # TODO: (NathanielRN) Assert trace state when the propagator supports it