Skip to content

Commit c3c3bac

Browse files
hectorhdzghectorhdzg
committed
Fix tests
1 parent 5333893 commit c3c3bac

File tree

3 files changed

+19
-29
lines changed

3 files changed

+19
-29
lines changed

‎exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder/__init__.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ def _encode_log(log_record: SDKLogRecord) -> PB2LogRecord:
5757
flags=int(log_record.trace_flags),
5858
body=_encode_value(body, allow_null=True),
5959
severity_text=log_record.severity_text,
60-
attributes=_encode_attributes(
61-
log_record.attributes, allow_null=True
62-
),
60+
attributes=_encode_attributes(log_record.attributes, allow_null=True),
6361
dropped_attributes_count=log_record.dropped_attributes,
6462
severity_number=log_record.severity_number.value,
6563
event_name=log_record.event_name,

‎exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def test_encode(self):
6565
def test_encode_no_body(self):
6666
sdk_logs, expected_encoding = self.get_test_logs()
6767
for log in sdk_logs:
68-
log.log_record.body = None
68+
log.body = None
6969

7070
for resource_log in expected_encoding.resource_logs:
7171
for scope_log in resource_log.scope_logs:
@@ -77,7 +77,7 @@ def test_encode_no_body(self):
7777
def test_dropped_attributes_count(self):
7878
sdk_logs = self._get_test_logs_dropped_attributes()
7979
encoded_logs = encode_logs(sdk_logs)
80-
self.assertTrue(hasattr(sdk_logs[0].log_record, "dropped_attributes"))
80+
self.assertTrue(hasattr(sdk_logs[0], "dropped_attributes"))
8181
self.assertEqual(
8282
# pylint:disable=no-member
8383
encoded_logs.resource_logs[0]

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

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,9 @@ def test_translate_log_data(self):
351351
log_records=[
352352
PB2LogRecord(
353353
# pylint: disable=no-member
354-
time_unix_nano=self.log_data_1.log_record.timestamp,
355-
observed_time_unix_nano=self.log_data_1.log_record.observed_timestamp,
356-
severity_number=self.log_data_1.log_record.severity_number.value,
354+
time_unix_nano=self.log_data_1.timestamp,
355+
observed_time_unix_nano=self.log_data_1.observed_timestamp,
356+
severity_number=self.log_data_1.severity_number.value,
357357
severity_text="WARNING",
358358
span_id=int.to_bytes(
359359
5213367945872657620, 8, "big"
@@ -376,9 +376,7 @@ def test_translate_log_data(self):
376376
value=AnyValue(string_value="c"),
377377
),
378378
],
379-
flags=int(
380-
self.log_data_1.log_record.trace_flags
381-
),
379+
flags=int(self.log_data_1.trace_flags),
382380
)
383381
],
384382
)
@@ -411,9 +409,9 @@ def test_translate_multiple_logs(self):
411409
log_records=[
412410
PB2LogRecord(
413411
# pylint: disable=no-member
414-
time_unix_nano=self.log_data_1.log_record.timestamp,
415-
observed_time_unix_nano=self.log_data_1.log_record.observed_timestamp,
416-
severity_number=self.log_data_1.log_record.severity_number.value,
412+
time_unix_nano=self.log_data_1.timestamp,
413+
observed_time_unix_nano=self.log_data_1.observed_timestamp,
414+
severity_number=self.log_data_1.severity_number.value,
417415
severity_text="WARNING",
418416
span_id=int.to_bytes(
419417
5213367945872657620, 8, "big"
@@ -436,9 +434,7 @@ def test_translate_multiple_logs(self):
436434
value=AnyValue(string_value="c"),
437435
),
438436
],
439-
flags=int(
440-
self.log_data_1.log_record.trace_flags
441-
),
437+
flags=int(self.log_data_1.trace_flags),
442438
)
443439
],
444440
),
@@ -449,9 +445,9 @@ def test_translate_multiple_logs(self):
449445
log_records=[
450446
PB2LogRecord(
451447
# pylint: disable=no-member
452-
time_unix_nano=self.log_data_2.log_record.timestamp,
453-
observed_time_unix_nano=self.log_data_2.log_record.observed_timestamp,
454-
severity_number=self.log_data_2.log_record.severity_number.value,
448+
time_unix_nano=self.log_data_2.timestamp,
449+
observed_time_unix_nano=self.log_data_2.observed_timestamp,
450+
severity_number=self.log_data_2.severity_number.value,
455451
severity_text="INFO",
456452
span_id=int.to_bytes(
457453
5213367945872657623, 8, "big"
@@ -470,9 +466,7 @@ def test_translate_multiple_logs(self):
470466
value=_encode_value([1, 2, 3]),
471467
),
472468
],
473-
flags=int(
474-
self.log_data_2.log_record.trace_flags
475-
),
469+
flags=int(self.log_data_2.trace_flags),
476470
)
477471
],
478472
),
@@ -495,9 +489,9 @@ def test_translate_multiple_logs(self):
495489
log_records=[
496490
PB2LogRecord(
497491
# pylint: disable=no-member
498-
time_unix_nano=self.log_data_3.log_record.timestamp,
499-
observed_time_unix_nano=self.log_data_3.log_record.observed_timestamp,
500-
severity_number=self.log_data_3.log_record.severity_number.value,
492+
time_unix_nano=self.log_data_3.timestamp,
493+
observed_time_unix_nano=self.log_data_3.observed_timestamp,
494+
severity_number=self.log_data_3.severity_number.value,
501495
severity_text="ERROR",
502496
span_id=int.to_bytes(
503497
5213367945872657628, 8, "big"
@@ -511,9 +505,7 @@ def test_translate_multiple_logs(self):
511505
"Mumbai, Boil water before drinking"
512506
),
513507
attributes=[],
514-
flags=int(
515-
self.log_data_3.log_record.trace_flags
516-
),
508+
flags=int(self.log_data_3.trace_flags),
517509
)
518510
],
519511
)

0 commit comments

Comments
 (0)