From ea25f6d0dbaba4dedd130b4398d4f714a01a3e2a Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Thu, 24 Dec 2020 15:36:25 +0530 Subject: [PATCH 1/5] Fix tracestate to adhere specs --- .github/workflows/test.yml | 2 +- .../src/opentelemetry/exporter/datadog/propagator.py | 2 +- .../tests/test_datadog_exporter.py | 2 +- .../tests/trace/propagation/test_aws_xray_format.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c4dd9b5af4..59c5b60da7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: master + CORE_REPO_SHA: 883e80e766c9d3401e3e6450abfb67b0cc8411a7 jobs: build: 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 09a46a140c..5f2e30336c 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py @@ -72,7 +72,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..b51e28f49d 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,7 @@ 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 From 4156b20a30828bbfb50f9cd7c7882ae15e30a7b1 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Thu, 24 Dec 2020 15:44:59 +0530 Subject: [PATCH 2/5] Update DD constant --- .../src/opentelemetry/exporter/datadog/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 1b48063400c53ff0a1aeb5a19b9b9e9e305ddd1c Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Thu, 24 Dec 2020 15:45:47 +0530 Subject: [PATCH 3/5] Fix lint --- .../tests/trace/propagation/test_aws_xray_format.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 b51e28f49d..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 From 1e319dbaf21df7573f15f35773b8272579dd1030 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Wed, 13 Jan 2021 00:14:48 +0530 Subject: [PATCH 4/5] Update core repo SHA --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 59c5b60da7..29c1337d45 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: 883e80e766c9d3401e3e6450abfb67b0cc8411a7 + CORE_REPO_SHA: dea21fdf97472e5b4434e8455d1aaf9c2130028c jobs: build: From c2ce5a9b5082dd2b846bf533cfddaa2afbb82d97 Mon Sep 17 00:00:00 2001 From: Srikanth Chekuri Date: Wed, 13 Jan 2021 01:09:09 +0530 Subject: [PATCH 5/5] Add CHANGELOG entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0312ed9764..dd2bcdc558 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#235](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/235)) - `opentelemetry-exporter-datadog` `opentelemetry-sdk-extension-aws` Fix reference to ids_generator in sdk ([#235](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/235)) +- 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