From fb08a02acdfe1c78b7efdc59bc218234245b84c2 Mon Sep 17 00:00:00 2001 From: Thomas Pierce Date: Fri, 16 Aug 2024 15:29:08 -0700 Subject: [PATCH 1/2] Add nil checks --- .../distro/attribute_propagating_span_processor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/attribute_propagating_span_processor.py b/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/attribute_propagating_span_processor.py index 61a36d0c1..471617561 100644 --- a/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/attribute_propagating_span_processor.py +++ b/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/attribute_propagating_span_processor.py @@ -66,9 +66,9 @@ def on_start(self, span: Span, parent_context: Optional[Context] = None) -> None if is_local_root(span): if not _is_server_kind(span): propagation_data = self._propagation_data_extractor(span) - elif _is_server_kind(parent_span): + elif parent_span && _is_server_kind(parent_span): propagation_data = self._propagation_data_extractor(parent_span) - else: + elif parent_span: propagation_data = parent_span.attributes.get(self._propagation_data_key) if propagation_data is not None: From 604cc1006121d9d0058308c664c667e1f8761cd8 Mon Sep 17 00:00:00 2001 From: Thomas Pierce Date: Fri, 16 Aug 2024 16:19:12 -0700 Subject: [PATCH 2/2] Update attribute_propagating_span_processor.py --- .../distro/attribute_propagating_span_processor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/attribute_propagating_span_processor.py b/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/attribute_propagating_span_processor.py index 471617561..6121723f8 100644 --- a/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/attribute_propagating_span_processor.py +++ b/aws-opentelemetry-distro/src/amazon/opentelemetry/distro/attribute_propagating_span_processor.py @@ -66,7 +66,7 @@ def on_start(self, span: Span, parent_context: Optional[Context] = None) -> None if is_local_root(span): if not _is_server_kind(span): propagation_data = self._propagation_data_extractor(span) - elif parent_span && _is_server_kind(parent_span): + elif parent_span and _is_server_kind(parent_span): propagation_data = self._propagation_data_extractor(parent_span) elif parent_span: propagation_data = parent_span.attributes.get(self._propagation_data_key)