|
30 | 30 | ResourceLogs, |
31 | 31 | ScopeLogs, |
32 | 32 | ) |
33 | | -from opentelemetry.sdk._logs import LogData |
| 33 | +from opentelemetry.sdk._logs import ReadableLogRecord |
34 | 34 |
|
35 | 35 |
|
36 | | -def encode_logs(batch: Sequence[LogData]) -> ExportLogsServiceRequest: |
| 36 | +def encode_logs( |
| 37 | + batch: Sequence[ReadableLogRecord], |
| 38 | +) -> ExportLogsServiceRequest: |
37 | 39 | return ExportLogsServiceRequest(resource_logs=_encode_resource_logs(batch)) |
38 | 40 |
|
39 | 41 |
|
40 | | -def _encode_log(log_data: LogData) -> PB2LogRecord: |
| 42 | +def _encode_log(readable_log_record: ReadableLogRecord) -> PB2LogRecord: |
41 | 43 | span_id = ( |
42 | 44 | None |
43 | | - if log_data.log_record.span_id == 0 |
44 | | - else _encode_span_id(log_data.log_record.span_id) |
| 45 | + if readable_log_record.log_record.span_id == 0 |
| 46 | + else _encode_span_id(readable_log_record.log_record.span_id) |
45 | 47 | ) |
46 | 48 | trace_id = ( |
47 | 49 | None |
48 | | - if log_data.log_record.trace_id == 0 |
49 | | - else _encode_trace_id(log_data.log_record.trace_id) |
| 50 | + if readable_log_record.log_record.trace_id == 0 |
| 51 | + else _encode_trace_id(readable_log_record.log_record.trace_id) |
50 | 52 | ) |
51 | | - body = log_data.log_record.body |
| 53 | + body = readable_log_record.log_record.body |
52 | 54 | return PB2LogRecord( |
53 | | - time_unix_nano=log_data.log_record.timestamp, |
54 | | - observed_time_unix_nano=log_data.log_record.observed_timestamp, |
| 55 | + time_unix_nano=readable_log_record.log_record.timestamp, |
| 56 | + observed_time_unix_nano=readable_log_record.log_record.observed_timestamp, |
55 | 57 | span_id=span_id, |
56 | 58 | trace_id=trace_id, |
57 | | - flags=int(log_data.log_record.trace_flags), |
| 59 | + flags=int(readable_log_record.log_record.trace_flags), |
58 | 60 | body=_encode_value(body, allow_null=True), |
59 | | - severity_text=log_data.log_record.severity_text, |
| 61 | + severity_text=readable_log_record.log_record.severity_text, |
60 | 62 | attributes=_encode_attributes( |
61 | | - log_data.log_record.attributes, allow_null=True |
| 63 | + readable_log_record.log_record.attributes, allow_null=True |
62 | 64 | ), |
63 | | - dropped_attributes_count=log_data.log_record.dropped_attributes, |
| 65 | + dropped_attributes_count=readable_log_record.dropped_attributes, |
64 | 66 | severity_number=getattr( |
65 | | - log_data.log_record.severity_number, "value", None |
| 67 | + readable_log_record.log_record.severity_number, "value", None |
66 | 68 | ), |
67 | | - event_name=log_data.log_record.event_name, |
| 69 | + event_name=readable_log_record.log_record.event_name, |
68 | 70 | ) |
69 | 71 |
|
70 | 72 |
|
71 | | -def _encode_resource_logs(batch: Sequence[LogData]) -> List[ResourceLogs]: |
| 73 | +def _encode_resource_logs( |
| 74 | + batch: Sequence[ReadableLogRecord], |
| 75 | +) -> List[ResourceLogs]: |
72 | 76 | sdk_resource_logs = defaultdict(lambda: defaultdict(list)) |
73 | 77 |
|
74 | | - for sdk_log in batch: |
75 | | - sdk_resource = sdk_log.log_record.resource |
76 | | - sdk_instrumentation = sdk_log.instrumentation_scope or None |
77 | | - pb2_log = _encode_log(sdk_log) |
| 78 | + for readable_log in batch: |
| 79 | + sdk_resource = readable_log.resource |
| 80 | + sdk_instrumentation = readable_log.instrumentation_scope or None |
| 81 | + pb2_log = _encode_log(readable_log) |
78 | 82 |
|
79 | 83 | sdk_resource_logs[sdk_resource][sdk_instrumentation].append(pb2_log) |
80 | 84 |
|
|
0 commit comments