Skip to content

Commit 18bca18

Browse files
committed
opentelemetry-exporter-otlp-proto-common: fix exporting of empty log severity number
1 parent f488fc4 commit 18bca18

File tree

2 files changed

+49
-2
lines changed
  • exporter/opentelemetry-exporter-otlp-proto-common

2 files changed

+49
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ def _encode_log(log_data: LogData) -> PB2LogRecord:
6161
log_data.log_record.attributes, allow_null=True
6262
),
6363
dropped_attributes_count=log_data.log_record.dropped_attributes,
64-
severity_number=log_data.log_record.severity_number.value,
64+
severity_number=getattr(
65+
log_data.log_record.severity_number, "value", None
66+
),
6567
event_name=log_data.log_record.event_name,
6668
)
6769

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

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,29 @@ def _get_sdk_log_data() -> List[LogData]:
304304
"extended_name", "extended_version"
305305
),
306306
)
307-
return [log1, log2, log3, log4, log5, log6, log7, log8]
307+
308+
ctx_log9 = set_span_in_context(
309+
NonRecordingSpan(
310+
SpanContext(
311+
212592107417388365804938480559624925566,
312+
6077757853989569466,
313+
False,
314+
TraceFlags(0x01),
315+
)
316+
)
317+
)
318+
log9 = LogData(
319+
log_record=SDKLogRecord(
320+
# these are otherwise set by default
321+
observed_timestamp=1644650584292683045,
322+
context=ctx_log9,
323+
resource=SDKResource({}),
324+
),
325+
instrumentation_scope=InstrumentationScope(
326+
"empty_log_record_name", "empty_log_record_version"
327+
),
328+
)
329+
return [log1, log2, log3, log4, log5, log6, log7, log8, log9]
308330

309331
def get_test_logs(
310332
self,
@@ -593,6 +615,29 @@ def get_test_logs(
593615
),
594616
],
595617
),
618+
PB2ScopeLogs(
619+
scope=PB2InstrumentationScope(
620+
name="empty_log_record_name",
621+
version="empty_log_record_version",
622+
),
623+
log_records=[
624+
PB2LogRecord(
625+
time_unix_nano=None,
626+
observed_time_unix_nano=1644650584292683045,
627+
trace_id=_encode_trace_id(
628+
212592107417388365804938480559624925566
629+
),
630+
span_id=_encode_span_id(
631+
6077757853989569466,
632+
),
633+
flags=int(TraceFlags(0x01)),
634+
severity_text=None,
635+
severity_number=None,
636+
body=None,
637+
attributes=None,
638+
),
639+
],
640+
),
596641
],
597642
),
598643
]

0 commit comments

Comments
 (0)