Merge branch 'master' into release/0.17b0-auto

CHANGELOG.md

@@ -67,6 +67,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
 

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

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)

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")]
             ),
         )
 

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