From dbc2e6443b665ad07e26aaf3c7abb9989767c69a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 16 Dec 2020 11:33:20 +0100 Subject: [PATCH 1/3] Add some repr()s to basic trace types. --- CHANGELOG.md | 2 ++ opentelemetry-api/src/opentelemetry/trace/span.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dad442d2522..2f1817e5f8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#1420](https://github.com/open-telemetry/opentelemetry-python/pull/1420)) - `opentelemetry-exporter-zipkin` Add support for array attributes in Span and Resource exports ([#1285](https://github.com/open-telemetry/opentelemetry-python/pull/1285)) +- Added `__repr__` for `DefaultSpan`, added `trace_flags` to `__repr__` of + `SpanContext` ([#????]()]) ## [0.16b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.16b1) - 2020-11-26 ### Added diff --git a/opentelemetry-api/src/opentelemetry/trace/span.py b/opentelemetry-api/src/opentelemetry/trace/span.py index 6506f6f949d..3ddce052f9e 100644 --- a/opentelemetry-api/src/opentelemetry/trace/span.py +++ b/opentelemetry-api/src/opentelemetry/trace/span.py @@ -237,11 +237,12 @@ def __delattr__(self, *args: str) -> None: def __repr__(self) -> str: return ( - "{}(trace_id={}, span_id={}, trace_state={!r}, is_remote={})" + "{}(trace_id={}, span_id={}, trace_flags=0x{:02x}, trace_state={!r}, is_remote={})" ).format( type(self).__name__, format_trace_id(self.trace_id), format_span_id(self.span_id), + self.trace_flags, self.trace_state, self.is_remote, ) @@ -291,6 +292,9 @@ def record_exception( ) -> None: pass + def __repr__(self): + return "DefaultSpan({!r})".format(self._context) + INVALID_SPAN_ID = 0x0000000000000000 INVALID_TRACE_ID = 0x00000000000000000000000000000000 From 18f6cd92247b63452c14942a7370fa9539b95fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 16 Dec 2020 11:41:14 +0100 Subject: [PATCH 2/3] Fill out PR#. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f1817e5f8c..c42611caf67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `opentelemetry-exporter-zipkin` Add support for array attributes in Span and Resource exports ([#1285](https://github.com/open-telemetry/opentelemetry-python/pull/1285)) - Added `__repr__` for `DefaultSpan`, added `trace_flags` to `__repr__` of - `SpanContext` ([#????]()]) + `SpanContext` ([#1485](https://github.com/open-telemetry/opentelemetry-python/pull/1485)]) ## [0.16b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.16b1) - 2020-11-26 ### Added From 2b1e2b6f3359e467fcaf5c636404322d42375d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Neum=C3=BCller?= Date: Wed, 16 Dec 2020 14:10:06 +0100 Subject: [PATCH 3/3] Add missing type annotation. --- opentelemetry-api/src/opentelemetry/trace/span.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-api/src/opentelemetry/trace/span.py b/opentelemetry-api/src/opentelemetry/trace/span.py index 3ddce052f9e..507b0513684 100644 --- a/opentelemetry-api/src/opentelemetry/trace/span.py +++ b/opentelemetry-api/src/opentelemetry/trace/span.py @@ -292,7 +292,7 @@ def record_exception( ) -> None: pass - def __repr__(self): + def __repr__(self) -> str: return "DefaultSpan({!r})".format(self._context)