From 196c351edbf950df1a495a742baec2ff835809a8 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Mon, 27 Jul 2020 09:54:05 -0600 Subject: [PATCH] Revert context trace flags handling --- opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py index 09ca49a28fb..2547a438c63 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py @@ -796,11 +796,7 @@ def start_span( # pylint: disable=too-many-locals ) if sampling_decision.sampled: - # FIXME investigate this to make sure that this is the right - # approach. There seems to be an issue here currently because if - # context.trace_flags is 0, then options will be always set to 1. - # options = context.trace_flags | trace_api.TraceFlags.SAMPLED - options = context.trace_flags + options = context.trace_flags | trace_api.TraceFlags.SAMPLED context.trace_flags = trace_api.TraceFlags(options) if attributes is None: span_attributes = sampling_decision.attributes @@ -868,7 +864,7 @@ def __init__( shutdown_on_exit: bool = True, active_span_processor: Union[ SynchronousMultiSpanProcessor, ConcurrentMultiSpanProcessor - ] = None, + ]=None, ): self._active_span_processor = ( active_span_processor or SynchronousMultiSpanProcessor()