diff --git a/CHANGELOG.md b/CHANGELOG.md index ebbac2371..c3f4a47b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python-contrib/compare/v0.200...HEAD) +### Changed +- `opentelemetry-propagator-ot-trace` Use `TraceFlags` object in `extract` + ([#472](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/472)) + ### Added - Move `opentelemetry-instrumentation` from core repository ([#465](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/465)) diff --git a/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py b/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py index 401323774..0097a1bcf 100644 --- a/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py +++ b/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py @@ -85,7 +85,7 @@ class OTTracePropagator(TextMapPropagator): trace_id=int(traceid, 16), span_id=int(spanid, 16), is_remote=True, - trace_flags=traceflags, + trace_flags=TraceFlags(traceflags), ) ), context, diff --git a/propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py b/propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py index 5afa91d5d..0fbcb42db 100644 --- a/propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py +++ b/propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py @@ -248,6 +248,9 @@ class TestOTTracePropagator(TestCase): self.assertEqual(hex(span_context.span_id)[2:], "e457b5a2e4d86bd1") self.assertTrue(span_context.is_remote) self.assertEqual(span_context.trace_flags, TraceFlags.SAMPLED) + self.assertIsInstance( + get_current_span().get_span_context().trace_flags, TraceFlags + ) def test_extract_trace_id_span_id_sampled_false(self): """Test valid trace_id, span_id and sampled false""" @@ -268,6 +271,9 @@ class TestOTTracePropagator(TestCase): self.assertEqual(hex(span_context.span_id)[2:], "e457b5a2e4d86bd1") self.assertTrue(span_context.is_remote) self.assertEqual(span_context.trace_flags, TraceFlags.DEFAULT) + self.assertIsInstance( + get_current_span().get_span_context().trace_flags, TraceFlags + ) def test_extract_malformed_trace_id(self): """Test extraction with malformed trace_id"""