From b3aa7a79d30713215af7a90a1c941367b0f95647 Mon Sep 17 00:00:00 2001
From: Srikanth Chekuri <srikanth.chekuri92@gmail.com>
Date: Thu, 21 Jan 2021 01:43:12 +0530
Subject: [PATCH] Update TraceState (#276)

---
 .github/workflows/test.yml                                    | 2 +-
 CHANGELOG.md                                                  | 2 ++
 .../src/opentelemetry/exporter/datadog/constants.py           | 2 +-
 .../src/opentelemetry/exporter/datadog/propagator.py          | 2 +-
 .../tests/test_datadog_exporter.py                            | 2 +-
 .../tests/trace/propagation/test_aws_xray_format.py           | 4 +++-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 02406343a..29c1337d4 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 86fc70995..b36a5f7c8 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 2ae5386e8..90f15a7ff 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 66c833174..d5f14011b 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 @@ class DatadogFormat(TextMapPropagator):
             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 3ef5d226b..4a576c5de 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 @@ class TestDatadogSpanExporter(unittest.TestCase):
             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 3d5fb3606..5130c9dae 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 @@ class AwsXRayPropagatorTest(unittest.TestCase):
         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