Skip to content

Commit 0dfb3d7

Browse files
committed
Fix console exporter
1 parent 5b8d79c commit 0dfb3d7

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

opentelemetry-sdk/src/opentelemetry/sdk/_logs/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515

1616
from opentelemetry.sdk._logs._internal import (
17+
BytesEncoder,
1718
LogData,
1819
LogDroppedAttributesWarning,
1920
Logger,
@@ -25,6 +26,7 @@
2526
)
2627

2728
__all__ = [
29+
"BytesEncoder",
2830
"LogData",
2931
"Logger",
3032
"LoggerProvider",

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515

1616
import abc
1717
import atexit
18+
import base64
1819
import concurrent.futures
1920
import json
2021
import logging
2122
import threading
2223
import traceback
23-
import base64
2424
import warnings
2525
from os import environ
2626
from threading import Lock
@@ -61,6 +61,7 @@
6161
_DEFAULT_OTEL_ATTRIBUTE_COUNT_LIMIT = 128
6262
_ENV_VALUE_UNSET = ""
6363

64+
6465
class BytesEncoder(json.JSONEncoder):
6566
def default(self, o):
6667
if isinstance(o, bytes):

opentelemetry-sdk/tests/logs/test_log_record.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
from opentelemetry._logs.severity import SeverityNumber
2020
from opentelemetry.attributes import BoundedAttributes
2121
from opentelemetry.sdk._logs import (
22+
BytesEncoder,
2223
LogDroppedAttributesWarning,
2324
LogLimits,
2425
LogRecord,
25-
BytesEncoder,
2626
)
2727
from opentelemetry.sdk.resources import Resource
2828

@@ -31,7 +31,7 @@ class TestLogRecord(unittest.TestCase):
3131
def test_log_record_to_json(self):
3232
expected = json.dumps(
3333
{
34-
"body": {'key': 'logLine', 'bytes': b'123'},
34+
"body": {"key": "logLine", "bytes": b"123"},
3535
"severity_number": None,
3636
"severity_text": None,
3737
"attributes": {
@@ -57,7 +57,7 @@ def test_log_record_to_json(self):
5757
actual = LogRecord(
5858
timestamp=0,
5959
observed_timestamp=0,
60-
body={'key': 'logLine', 'bytes': b'123'},
60+
body={"key": "logLine", "bytes": b"123"},
6161
resource=Resource({"service.name": "foo"}),
6262
attributes={
6363
"mapping": {"key": "value"},
@@ -70,7 +70,7 @@ def test_log_record_to_json(self):
7070
self.assertEqual(expected, actual.to_json(indent=4))
7171
self.assertEqual(
7272
actual.to_json(indent=None),
73-
'{"body": "a log line", "severity_number": null, "severity_text": null, "attributes": {"mapping": {"key": "value"}, "none": null, "sequence": [1, 2], "str": "string"}, "dropped_attributes": 0, "timestamp": "1970-01-01T00:00:00.000000Z", "observed_timestamp": "1970-01-01T00:00:00.000000Z", "trace_id": "", "span_id": "", "trace_flags": null, "resource": {"attributes": {"service.name": "foo"}, "schema_url": ""}}',
73+
'{"body": {"key": "logLine", "bytes": "MTIz"}, "severity_number": null, "severity_text": null, "attributes": {"mapping": {"key": "value"}, "none": null, "sequence": [1, 2], "str": "string"}, "dropped_attributes": 0, "timestamp": "1970-01-01T00:00:00.000000Z", "observed_timestamp": "1970-01-01T00:00:00.000000Z", "trace_id": "", "span_id": "", "trace_flags": null, "resource": {"attributes": {"service.name": "foo"}, "schema_url": ""}}',
7474
)
7575

7676
def test_log_record_to_json_serializes_severity_number_as_int(self):

0 commit comments

Comments
 (0)