Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6087aea

Browse files
author
alrex
authored
expose StatusCode from opentelemetry.trace (open-telemetry#1681)
1 parent 50d0bc0 commit 6087aea

File tree

8 files changed

+17
-25
lines changed

8 files changed

+17
-25
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4242
([#1663](https://github.com/open-telemetry/opentelemetry-python/pull/1663))
4343
- Rename `JaegerSpanExporter` to `JaegerExporter` and rename `ZipkinSpanExporter` to `ZipkinExporter`
4444
([#1664](https://github.com/open-telemetry/opentelemetry-python/pull/1664))
45+
- Expose `StatusCode` from the `opentelemetry.trace` module
46+
([#](https://github.com/open-telemetry/opentelemetry-python/pull/))
4547

4648
### Removed
4749
- Removed unused `get_hexadecimal_trace_id` and `get_hexadecimal_span_id` methods.

‎exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,12 @@ def test_translate_to_collector(self):
147147
otel_spans[0].set_attribute("key_float", 111.22)
148148
otel_spans[0].set_attribute("key_int", 333)
149149
otel_spans[0].set_status(
150-
trace_api.Status(
151-
trace_api.status.StatusCode.OK, "test description",
152-
)
150+
trace_api.Status(trace_api.StatusCode.OK, "test description",)
153151
)
154152
otel_spans[0].end(end_time=end_times[0])
155153
otel_spans[1].start(start_time=start_times[1])
156154
otel_spans[1].set_status(
157-
trace_api.Status(
158-
trace_api.status.StatusCode.ERROR, {"test", "val"},
159-
)
155+
trace_api.Status(trace_api.StatusCode.ERROR, {"test", "val"},)
160156
)
161157
otel_spans[1].end(end_time=end_times[1])
162158
otel_spans[2].start(start_time=start_times[2])
@@ -196,7 +192,7 @@ def test_translate_to_collector(self):
196192
output_spans[2].parent_span_id, b"\x11\x11\x11\x11\x11\x11\x11\x11"
197193
)
198194
self.assertEqual(
199-
output_spans[0].status.code, trace_api.status.StatusCode.OK.value,
195+
output_spans[0].status.code, trace_api.StatusCode.OK.value,
200196
)
201197
self.assertEqual(output_spans[0].status.message, "test description")
202198
self.assertEqual(len(output_spans[0].tracestate.entries), 1)
@@ -267,8 +263,7 @@ def test_translate_to_collector(self):
267263
trace_pb2.Span.Link.Type.TYPE_UNSPECIFIED,
268264
)
269265
self.assertEqual(
270-
output_spans[1].status.code,
271-
trace_api.status.StatusCode.ERROR.value,
266+
output_spans[1].status.code, trace_api.StatusCode.ERROR.value,
272267
)
273268
self.assertEqual(
274269
output_spans[2].links.link[0].type,

‎exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
)
4848
from opentelemetry.sdk.trace import Span as ReadableSpan
4949
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
50-
from opentelemetry.trace.status import StatusCode
50+
from opentelemetry.trace import StatusCode
5151

5252
logger = logging.getLogger(__name__)
5353

‎exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/encoder/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
from opentelemetry.trace import (
2929
Span,
3030
SpanContext,
31+
StatusCode,
3132
format_span_id,
3233
format_trace_id,
3334
)
34-
from opentelemetry.trace.status import StatusCode
3535

3636
EncodedLocalEndpointT = TypeVar("EncodedLocalEndpointT")
3737

‎opentelemetry-api/src/opentelemetry/trace/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,4 +516,5 @@ def use_span(
516516
"set_span_in_context",
517517
"use_span",
518518
"Status",
519+
"StatusCode",
519520
]

‎opentelemetry-instrumentation/src/opentelemetry/instrumentation/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from wrapt import ObjectProxy
1818

19-
from opentelemetry.trace.status import StatusCode
19+
from opentelemetry.trace import StatusCode
2020

2121

2222
def extract_attributes_from_object(

‎opentelemetry-instrumentation/tests/test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
from opentelemetry.instrumentation.utils import http_status_to_status_code
1818
from opentelemetry.test.test_base import TestBase
19-
from opentelemetry.trace.status import StatusCode
19+
from opentelemetry.trace import StatusCode
2020

2121

2222
class TestUtils(TestBase):

‎opentelemetry-sdk/tests/trace/test_trace.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from opentelemetry.sdk.trace.id_generator import RandomIdGenerator
3838
from opentelemetry.sdk.util import ns_to_iso_str
3939
from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
40-
from opentelemetry.trace.status import StatusCode
40+
from opentelemetry.trace import StatusCode
4141
from opentelemetry.util.time import time_ns
4242

4343

@@ -835,18 +835,14 @@ def test_start_span(self):
835835
self.assertEqual(start_time, span.start_time)
836836

837837
self.assertIsNotNone(span.status)
838-
self.assertIs(
839-
span.status.status_code, trace_api.status.StatusCode.UNSET
840-
)
838+
self.assertIs(span.status.status_code, trace_api.StatusCode.UNSET)
841839

842840
# status
843841
new_status = trace_api.status.Status(
844-
trace_api.status.StatusCode.ERROR, "Test description"
842+
trace_api.StatusCode.ERROR, "Test description"
845843
)
846844
span.set_status(new_status)
847-
self.assertIs(
848-
span.status.status_code, trace_api.status.StatusCode.ERROR
849-
)
845+
self.assertIs(span.status.status_code, trace_api.StatusCode.ERROR)
850846
self.assertIs(span.status.description, "Test description")
851847

852848
def test_start_accepts_context(self):
@@ -906,14 +902,12 @@ def test_ended_span(self):
906902
self.assertEqual(root.name, "root")
907903

908904
new_status = trace_api.status.Status(
909-
trace_api.status.StatusCode.ERROR, "Test description"
905+
trace_api.StatusCode.ERROR, "Test description"
910906
)
911907

912908
with self.assertLogs(level=WARNING):
913909
root.set_status(new_status)
914-
self.assertEqual(
915-
root.status.status_code, trace_api.status.StatusCode.UNSET
916-
)
910+
self.assertEqual(root.status.status_code, trace_api.StatusCode.UNSET)
917911

918912
def test_error_status(self):
919913
def error_status_test(context):

0 commit comments

Comments
 (0)