Skip to content

Commit 6d0fcf3

Browse files
committed
Remove StatusError
1 parent 7421a6d commit 6d0fcf3

File tree

3 files changed

+15
-46
lines changed

3 files changed

+15
-46
lines changed

Diff for: opentelemetry-api/src/opentelemetry/trace/status.py

-22
Original file line numberDiff line numberDiff line change
@@ -183,25 +183,3 @@ def description(self) -> typing.Optional[str]:
183183
def is_ok(self) -> bool:
184184
"""Returns false if this represents an error, true otherwise."""
185185
return self._canonical_code is StatusCanonicalCode.OK
186-
187-
188-
class StatusError(Exception):
189-
def __init__(
190-
self,
191-
canonical_code: StatusCanonicalCode,
192-
description: typing.Optional[str] = None,
193-
):
194-
self._canonical_code = canonical_code
195-
self._description = description
196-
197-
super(StatusError, self).__init__()
198-
199-
@property
200-
def canonical_code(self) -> StatusCanonicalCode:
201-
"""Represents the canonical status code of a finished Span."""
202-
return self._canonical_code
203-
204-
@property
205-
def description(self) -> typing.Optional[str]:
206-
"""Status description"""
207-
return self._description

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

+8-17
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from opentelemetry.sdk import util
2727
from opentelemetry.sdk.util import BoundedDict, BoundedList
2828
from opentelemetry.trace import sampling
29-
from opentelemetry.trace.status import Status, StatusCanonicalCode, StatusError
29+
from opentelemetry.trace.status import Status, StatusCanonicalCode
3030
from opentelemetry.util import time_ns, types
3131

3232
logger = logging.getLogger(__name__)
@@ -296,23 +296,14 @@ def __exit__(
296296
if self.status is None and self._auto_update_status:
297297
if exc_val is not None:
298298

299-
if isinstance(exc_val, StatusError):
300-
self.set_status(
301-
Status(
302-
canonical_code=exc_val.canonical_code,
303-
description=exc_val.description,
304-
)
305-
)
306-
307-
else:
308-
self.set_status(
309-
Status(
310-
canonical_code=StatusCanonicalCode.UNKNOWN,
311-
description="{}: {}".format(
312-
exc_type.__name__, exc_val
313-
),
314-
)
299+
self.set_status(
300+
Status(
301+
canonical_code=StatusCanonicalCode.UNKNOWN,
302+
description="{}: {}".format(
303+
exc_type.__name__, exc_val
304+
),
315305
)
306+
)
316307

317308
super().__exit__(exc_type, exc_val, exc_tb)
318309

Diff for: opentelemetry-sdk/tests/trace/test_trace.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from opentelemetry import trace as trace_api
2121
from opentelemetry.sdk import trace
2222
from opentelemetry.trace import sampling
23-
from opentelemetry.trace.status import StatusCanonicalCode, StatusError
23+
from opentelemetry.trace.status import StatusCanonicalCode
2424
from opentelemetry.util import time_ns
2525

2626

@@ -514,14 +514,14 @@ def test_ended_span(self):
514514
self.assertIs(root.status, None)
515515

516516
def test_error_status(self):
517-
with self.assertRaises(StatusError):
517+
try:
518518
with trace.Tracer("test_error_status").start_span("root") as root:
519-
raise StatusError(StatusCanonicalCode.CANCELLED, "cancelled")
519+
raise Exception("unknown")
520+
except Exception: # pylint: disable=broad-except
521+
pass
520522

521-
self.assertIs(
522-
root.status.canonical_code, StatusCanonicalCode.CANCELLED
523-
)
524-
self.assertEqual(root.status.description, "cancelled")
523+
self.assertIs(root.status.canonical_code, StatusCanonicalCode.UNKNOWN)
524+
self.assertEqual(root.status.description, "Exception: unknown")
525525

526526

527527
def span_event_start_fmt(span_processor_name, span_name):

0 commit comments

Comments
 (0)