|
| 1 | +import io |
1 | 2 | import json
|
2 | 3 | import logging
|
3 | 4 | import unittest
|
4 | 5 | from unittest import mock
|
5 | 6 |
|
| 7 | +from dockerflow.logging import request_id_context |
6 | 8 | from pyramid import testing
|
7 | 9 |
|
8 |
| -from kinto.core import DEFAULT_SETTINGS, JsonLogFormatter, initialization |
| 10 | +from kinto.core import ( |
| 11 | + DEFAULT_SETTINGS, |
| 12 | + JsonLogFormatter, |
| 13 | + StreamHandlerWithRequestID, |
| 14 | + initialization, |
| 15 | +) |
9 | 16 |
|
10 | 17 | from .support import BaseWebTest
|
11 | 18 |
|
@@ -162,3 +169,20 @@ def test_logger_name(self):
|
162 | 169 | self.assertEqual(logged["Type"], "app.log")
|
163 | 170 | # See https://github.com/mozilla/mozilla-cloud-services-logger/issues/2
|
164 | 171 | self.assertEqual(logged["Fields"]["msg"], "coucou")
|
| 172 | + |
| 173 | + |
| 174 | +class RequestIdFilter(BaseWebTest, unittest.TestCase): |
| 175 | + def test_stream_logs_rid_field(self): |
| 176 | + log_buffer = io.StringIO() # In-memory log capture |
| 177 | + stream_handler = StreamHandlerWithRequestID(log_buffer) |
| 178 | + stream_handler.setFormatter(JsonLogFormatter()) |
| 179 | + logger = logging.getLogger(__name__) |
| 180 | + logger.addHandler(stream_handler) |
| 181 | + |
| 182 | + request_id_context.set("abc") # As done in `kinto.core.initalization`. |
| 183 | + logger.error("Some message") |
| 184 | + |
| 185 | + captured = log_buffer.getvalue() |
| 186 | + |
| 187 | + logged = json.loads(captured) |
| 188 | + self.assertEqual(logged["Fields"]["rid"], "abc") |
0 commit comments