Skip to content

Commit 20810e8

Browse files
committed
Properly fix compat
1 parent cb68bc3 commit 20810e8

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

tests/test_apm.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import logging
2525
import structlog
2626
import pytest
27-
from io import BytesIO
27+
from io import StringIO
2828

2929

3030
def test_elasticapm_structlog_log_correlation_ecs_fields(spec_validator, apm):
31-
stream = BytesIO()
31+
stream = StringIO()
3232
logger = structlog.PrintLogger(stream)
3333
logger = structlog.wrap_logger(
3434
logger, processors=[structlog_processor, ecs_logging.StructlogFormatter()]
@@ -60,7 +60,7 @@ def test_elasticapm_structlog_log_correlation_ecs_fields(spec_validator, apm):
6060

6161

6262
def test_elastic_apm_stdlib_no_filter_log_correlation_ecs_fields(apm):
63-
stream = BytesIO()
63+
stream = StringIO()
6464
logger = logging.getLogger("apm-logger")
6565
handler = logging.StreamHandler(stream)
6666
handler.setFormatter(
@@ -103,7 +103,7 @@ def test_elastic_apm_stdlib_no_filter_log_correlation_ecs_fields(apm):
103103

104104

105105
def test_elastic_apm_stdlib_with_filter_log_correlation_ecs_fields(apm):
106-
stream = BytesIO()
106+
stream = StringIO()
107107
logger = logging.getLogger("apm-logger")
108108
handler = logging.StreamHandler(stream)
109109
handler.setFormatter(
@@ -147,7 +147,7 @@ def test_elastic_apm_stdlib_with_filter_log_correlation_ecs_fields(apm):
147147

148148

149149
def test_elastic_apm_stdlib_exclude_fields(apm):
150-
stream = BytesIO()
150+
stream = StringIO()
151151
logger = logging.getLogger("apm-logger")
152152
handler = logging.StreamHandler(stream)
153153
handler.setFormatter(

tests/test_stdlib_formatter.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import random
2525
import sys
2626
import ecs_logging
27-
from io import BytesIO
27+
from io import StringIO
2828

2929

3030
@pytest.fixture(scope="function")
@@ -87,7 +87,7 @@ def format_to_ecs(self, record):
8787

8888

8989
def test_can_be_set_on_handler():
90-
stream = BytesIO()
90+
stream = StringIO()
9191
handler = logging.StreamHandler(stream)
9292
handler.setFormatter(ecs_logging.StdlibFormatter(exclude_fields=["process"]))
9393

@@ -104,7 +104,7 @@ def test_can_be_set_on_handler():
104104
def test_extra_is_merged(time, logger):
105105
time.return_value = 1584720997.187709
106106

107-
stream = BytesIO()
107+
stream = StringIO()
108108
handler = logging.StreamHandler(stream)
109109
handler.setFormatter(
110110
ecs_logging.StdlibFormatter(exclude_fields=["process", "tls.client"])
@@ -154,7 +154,7 @@ def g():
154154
def h():
155155
raise ValueError("error!")
156156

157-
stream = BytesIO()
157+
stream = StringIO()
158158
handler = logging.StreamHandler(stream)
159159
handler.setFormatter(ecs_logging.StdlibFormatter(**kwargs))
160160
logger.addHandler(handler)
@@ -172,7 +172,7 @@ def h():
172172

173173
@pytest.mark.parametrize("stack_trace_limit", [0, False])
174174
def test_stack_trace_limit_disabled(stack_trace_limit, logger):
175-
stream = BytesIO()
175+
stream = StringIO()
176176
handler = logging.StreamHandler(stream)
177177
handler.setFormatter(
178178
ecs_logging.StdlibFormatter(stack_trace_limit=stack_trace_limit)
@@ -193,7 +193,7 @@ def test_stack_trace_limit_disabled(stack_trace_limit, logger):
193193

194194

195195
def test_exc_info_false_does_not_raise(logger):
196-
stream = BytesIO()
196+
stream = StringIO()
197197
handler = logging.StreamHandler(stream)
198198
handler.setFormatter(ecs_logging.StdlibFormatter())
199199
logger.addHandler(handler)
@@ -217,7 +217,7 @@ def g():
217217
def h():
218218
raise ValueError("error!")
219219

220-
stream = BytesIO()
220+
stream = StringIO()
221221
handler = logging.StreamHandler(stream)
222222
handler.setFormatter(ecs_logging.StdlibFormatter(stack_trace_limit=2))
223223
logger.addHandler(handler)
@@ -308,7 +308,7 @@ def test_exclude_fields_type_and_values():
308308

309309

310310
def test_stack_info(logger):
311-
stream = BytesIO()
311+
stream = StringIO()
312312
handler = logging.StreamHandler(stream)
313313
handler.setFormatter(ecs_logging.StdlibFormatter())
314314
logger.addHandler(handler)
@@ -324,7 +324,7 @@ def test_stack_info(logger):
324324

325325
@pytest.mark.parametrize("exclude_fields", [["error"], ["error.stack_trace"]])
326326
def test_stack_info_excluded(logger, exclude_fields):
327-
stream = BytesIO()
327+
stream = StringIO()
328328
handler = logging.StreamHandler(stream)
329329
handler.setFormatter(ecs_logging.StdlibFormatter(exclude_fields=exclude_fields))
330330
logger.addHandler(handler)

tests/test_structlog_formatter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import ecs_logging
1919
import structlog
2020
import mock
21-
from io import BytesIO
21+
from io import StringIO
2222

2323
import pytest
2424

@@ -64,7 +64,7 @@ def test_event_dict_formatted(time, spec_validator):
6464
def test_can_be_set_as_processor(time, spec_validator):
6565
time.return_value = 1584720997.187709
6666

67-
stream = BytesIO()
67+
stream = StringIO()
6868
structlog.configure(
6969
processors=[ecs_logging.StructlogFormatter()],
7070
wrapper_class=structlog.BoundLogger,

0 commit comments

Comments
 (0)