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

Skip to content

Commit 2f2d252

Browse files
author
Alex Boten
authored
update proto to 0.12.0 (open-telemetry#2415)
* update proto to 0.12.0 This PR updates the proto to the latest release. * remove deprecated status codes, no longer supported * update logs to log_records * remove unused import * update changelog
1 parent d112814 commit 2f2d252

File tree

14 files changed

+695
-1027
lines changed

14 files changed

+695
-1027
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.9.0-0.28b0...HEAD)
99

10+
- Update opentelemetry-proto to v0.12.0. Note that this update removes deprecated status codes.
11+
([#2415](https://github.com/open-telemetry/opentelemetry-python/pull/2415))
12+
1013
## [1.9.0-0.28b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.9.0-0.28b0) - 2022-01-26
1114

1215

‎exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_log_exporter/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def _translate_data(
155155
"severity_number"
156156
] = log_data.log_record.severity_number.value
157157

158-
instrumentation_library_logs.logs.append(
158+
instrumentation_library_logs.log_records.append(
159159
PB2LogRecord(**self._collector_kwargs)
160160
)
161161

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
)
5050
from opentelemetry.sdk.trace import ReadableSpan
5151
from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
52-
from opentelemetry.trace import StatusCode
5352

5453
logger = logging.getLogger(__name__)
5554

@@ -208,11 +207,7 @@ def _translate_links(self, sdk_span: ReadableSpan) -> None:
208207
def _translate_status(self, sdk_span: ReadableSpan) -> None:
209208
# pylint: disable=no-member
210209
if sdk_span.status is not None:
211-
deprecated_code = Status.DEPRECATED_STATUS_CODE_OK
212-
if sdk_span.status.status_code == StatusCode.ERROR:
213-
deprecated_code = Status.DEPRECATED_STATUS_CODE_UNKNOWN_ERROR
214210
self._collector_kwargs["status"] = Status(
215-
deprecated_code=deprecated_code,
216211
code=sdk_span.status.status_code.value,
217212
message=sdk_span.status.description,
218213
)

‎exporter/opentelemetry-exporter-otlp-proto-grpc/tests/logs/test_otlp_logs_exporter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ def test_translate_log_data(self):
312312
instrumentation_library=InstrumentationLibrary(
313313
name="first_name", version="first_version"
314314
),
315-
logs=[
315+
log_records=[
316316
PB2LogRecord(
317317
# pylint: disable=no-member
318318
name="name",
@@ -372,7 +372,7 @@ def test_translate_multiple_logs(self):
372372
instrumentation_library=InstrumentationLibrary(
373373
name="first_name", version="first_version"
374374
),
375-
logs=[
375+
log_records=[
376376
PB2LogRecord(
377377
# pylint: disable=no-member
378378
name="name",
@@ -410,7 +410,7 @@ def test_translate_multiple_logs(self):
410410
instrumentation_library=InstrumentationLibrary(
411411
name="second_name", version="second_version"
412412
),
413-
logs=[
413+
log_records=[
414414
PB2LogRecord(
415415
# pylint: disable=no-member
416416
name="info name",
@@ -456,7 +456,7 @@ def test_translate_multiple_logs(self):
456456
instrumentation_library=InstrumentationLibrary(
457457
name="third_name", version="third_version"
458458
),
459-
logs=[
459+
log_records=[
460460
PB2LogRecord(
461461
# pylint: disable=no-member
462462
name="error name",

‎exporter/opentelemetry-exporter-otlp-proto-grpc/tests/test_otlp_trace_exporter.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,6 @@ def _check_translated_status(
762762
self,
763763
translated: ExportTraceServiceRequest,
764764
code_expected: Status,
765-
deprecated_code_expected: Status,
766765
):
767766
status = (
768767
translated.resource_spans[0]
@@ -775,10 +774,6 @@ def _check_translated_status(
775774
status.code,
776775
code_expected,
777776
)
778-
self.assertEqual(
779-
status.deprecated_code,
780-
deprecated_code_expected,
781-
)
782777

783778
def test_span_status_translate(self):
784779
# pylint: disable=protected-access,no-member
@@ -797,17 +792,14 @@ def test_span_status_translate(self):
797792
self._check_translated_status(
798793
unset_translated,
799794
Status.STATUS_CODE_UNSET,
800-
Status.DEPRECATED_STATUS_CODE_OK,
801795
)
802796
self._check_translated_status(
803797
ok_translated,
804798
Status.STATUS_CODE_OK,
805-
Status.DEPRECATED_STATUS_CODE_OK,
806799
)
807800
self._check_translated_status(
808801
error_translated,
809802
Status.STATUS_CODE_ERROR,
810-
Status.DEPRECATED_STATUS_CODE_UNKNOWN_ERROR,
811803
)
812804

813805
# pylint:disable=no-member

‎exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/trace_exporter/encoder/__init__.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
from opentelemetry.trace import Link
4646
from opentelemetry.trace import SpanKind
4747
from opentelemetry.trace.span import SpanContext, TraceState, Status
48-
from opentelemetry.trace.status import StatusCode
4948
from opentelemetry.util.types import Attributes
5049

5150
# pylint: disable=E1101
@@ -196,11 +195,7 @@ def _encode_links(links: List[Link]) -> List[PB2SPan.Link]:
196195
def _encode_status(status: Status) -> Optional[PB2Status]:
197196
pb2_status = None
198197
if status is not None:
199-
deprecated_code = PB2Status.DEPRECATED_STATUS_CODE_OK
200-
if status.status_code is StatusCode.ERROR:
201-
deprecated_code = PB2Status.DEPRECATED_STATUS_CODE_UNKNOWN_ERROR
202198
pb2_status = PB2Status(
203-
deprecated_code=deprecated_code,
204199
code=status.status_code.value,
205200
message=status.description,
206201
)

‎exporter/opentelemetry-exporter-otlp-proto-http/tests/test_protobuf_encoder.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ def get_exhaustive_test_spans(
268268
)
269269
],
270270
status=PB2Status(
271-
deprecated_code=PB2Status.DEPRECATED_STATUS_CODE_UNKNOWN_ERROR, # pylint: disable=no-member
272271
code=SDKStatusCode.ERROR.value,
273272
message="Example description",
274273
),
@@ -374,23 +373,20 @@ def test_encode_status_code_translations(self):
374373
self.assertEqual(
375374
_encode_status(SDKStatus(status_code=SDKStatusCode.UNSET)),
376375
PB2Status(
377-
deprecated_code=PB2Status.DEPRECATED_STATUS_CODE_OK, # pylint: disable=no-member
378376
code=SDKStatusCode.UNSET.value,
379377
),
380378
)
381379

382380
self.assertEqual(
383381
_encode_status(SDKStatus(status_code=SDKStatusCode.OK)),
384382
PB2Status(
385-
deprecated_code=PB2Status.DEPRECATED_STATUS_CODE_OK, # pylint: disable=no-member
386383
code=SDKStatusCode.OK.value,
387384
),
388385
)
389386

390387
self.assertEqual(
391388
_encode_status(SDKStatus(status_code=SDKStatusCode.ERROR)),
392389
PB2Status(
393-
deprecated_code=PB2Status.DEPRECATED_STATUS_CODE_UNKNOWN_ERROR, # pylint: disable=no-member
394390
code=SDKStatusCode.ERROR.value,
395391
),
396392
)

‎opentelemetry-proto/src/opentelemetry/proto/logs/v1/logs_pb2.py

Lines changed: 54 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)