|
45 | 45 | KEEP_ALIVE_SOCKET_OPTIONS, |
46 | 46 | AsyncHttpTransport, |
47 | 47 | HttpTransport, |
48 | | - Transport, |
49 | | - _EnvelopePrinterTransport, |
50 | 48 | _parse_rate_limits, |
51 | | - make_transport, |
52 | 49 | ) |
53 | | -from sentry_sdk.utils import Dsn |
54 | 50 |
|
55 | 51 | server = None |
56 | 52 |
|
@@ -1045,329 +1041,3 @@ async def send_message(i): |
1045 | 1041 | # New request should be dropped due to rate limiting |
1046 | 1042 | assert len(capturing_server.captured) == 0 |
1047 | 1043 | await client.close_async(timeout=2.0) |
1048 | | - |
1049 | | - |
1050 | | -# --- _EnvelopePrinterTransport tests --- |
1051 | | - |
1052 | | - |
1053 | | -class FakeTransport(Transport): |
1054 | | - def __init__(self): |
1055 | | - self.options = {"dsn": "https://foo@sentry.io/123"} |
1056 | | - self.parsed_dsn = Dsn("https://foo@sentry.io/123") |
1057 | | - self.captured_envelopes = [] |
1058 | | - self.flushed = [] |
1059 | | - self.killed = False |
1060 | | - self.lost_events = [] |
1061 | | - self._healthy = True |
1062 | | - |
1063 | | - def capture_envelope(self, envelope): |
1064 | | - self.captured_envelopes.append(envelope) |
1065 | | - |
1066 | | - def flush(self, timeout, callback=None): |
1067 | | - self.flushed.append((timeout, callback)) |
1068 | | - |
1069 | | - def kill(self): |
1070 | | - self.killed = True |
1071 | | - |
1072 | | - def record_lost_event(self, reason, data_category=None, item=None, *, quantity=1): |
1073 | | - self.lost_events.append((reason, data_category, item, quantity)) |
1074 | | - |
1075 | | - def is_healthy(self): |
1076 | | - return self._healthy |
1077 | | - |
1078 | | - |
1079 | | -def _make_json_envelope(): |
1080 | | - envelope = Envelope(headers={"event_id": "abc123"}) |
1081 | | - envelope.add_item(Item(payload='{"message": "hello"}', type="event")) |
1082 | | - return envelope |
1083 | | - |
1084 | | - |
1085 | | -def _make_binary_envelope(): |
1086 | | - envelope = Envelope(headers={"event_id": "bin456"}) |
1087 | | - envelope.add_item(Item(payload=b"\x00\x01\x02\x03", type="attachment")) |
1088 | | - return envelope |
1089 | | - |
1090 | | - |
1091 | | -class Test_EnvelopePrinterTransportDelegation: |
1092 | | - def test_capture_envelope_delegates(self): |
1093 | | - inner = FakeTransport() |
1094 | | - transport = _EnvelopePrinterTransport(inner) |
1095 | | - envelope = _make_json_envelope() |
1096 | | - |
1097 | | - transport.capture_envelope(envelope) |
1098 | | - |
1099 | | - assert inner.captured_envelopes == [envelope] |
1100 | | - |
1101 | | - def test_flush_delegates(self): |
1102 | | - inner = FakeTransport() |
1103 | | - transport = _EnvelopePrinterTransport(inner) |
1104 | | - cb = lambda: None |
1105 | | - |
1106 | | - transport.flush(10.0, cb) |
1107 | | - |
1108 | | - assert inner.flushed == [(10.0, cb)] |
1109 | | - |
1110 | | - def test_kill_delegates(self): |
1111 | | - inner = FakeTransport() |
1112 | | - transport = _EnvelopePrinterTransport(inner) |
1113 | | - |
1114 | | - transport.kill() |
1115 | | - |
1116 | | - assert inner.killed is True |
1117 | | - |
1118 | | - def test_record_lost_event_delegates(self): |
1119 | | - inner = FakeTransport() |
1120 | | - transport = _EnvelopePrinterTransport(inner) |
1121 | | - item = Item(payload='{"x": 1}', type="event") |
1122 | | - |
1123 | | - transport.record_lost_event("queue_overflow", "error", item, quantity=5) |
1124 | | - |
1125 | | - assert inner.lost_events == [("queue_overflow", "error", item, 5)] |
1126 | | - |
1127 | | - def test_is_healthy_delegates(self): |
1128 | | - inner = FakeTransport() |
1129 | | - transport = _EnvelopePrinterTransport(inner) |
1130 | | - |
1131 | | - assert transport.is_healthy() is True |
1132 | | - |
1133 | | - inner._healthy = False |
1134 | | - assert transport.is_healthy() is False |
1135 | | - |
1136 | | - def test_parsed_dsn_forwarded(self): |
1137 | | - inner = FakeTransport() |
1138 | | - transport = _EnvelopePrinterTransport(inner) |
1139 | | - |
1140 | | - assert transport.parsed_dsn is inner.parsed_dsn |
1141 | | - |
1142 | | - |
1143 | | -def _collect_debug_log_text(mock_debug): |
1144 | | - parts = [] |
1145 | | - for call in mock_debug.call_args_list: |
1146 | | - args = call[0] |
1147 | | - if len(args) == 1: |
1148 | | - parts.append(args[0]) |
1149 | | - else: |
1150 | | - parts.append(args[0] % args[1:]) |
1151 | | - return "\n".join(parts) |
1152 | | - |
1153 | | - |
1154 | | -class Test_EnvelopePrinterTransportLogging: |
1155 | | - def test_json_payload_is_pretty_printed(self): |
1156 | | - inner = FakeTransport() |
1157 | | - transport = _EnvelopePrinterTransport(inner) |
1158 | | - envelope = _make_json_envelope() |
1159 | | - |
1160 | | - with mock.patch("sentry_sdk.transport.logger") as mock_logger: |
1161 | | - transport.capture_envelope(envelope) |
1162 | | - |
1163 | | - log_text = _collect_debug_log_text(mock_logger.debug) |
1164 | | - assert '"message": "hello"' in log_text |
1165 | | - |
1166 | | - def test_binary_payload_shows_byte_count(self): |
1167 | | - inner = FakeTransport() |
1168 | | - transport = _EnvelopePrinterTransport(inner) |
1169 | | - envelope = _make_binary_envelope() |
1170 | | - |
1171 | | - with mock.patch("sentry_sdk.transport.logger") as mock_logger: |
1172 | | - transport.capture_envelope(envelope) |
1173 | | - |
1174 | | - log_text = _collect_debug_log_text(mock_logger.debug) |
1175 | | - assert "<binary 4 bytes>" in log_text |
1176 | | - |
1177 | | - def test_envelope_headers_are_logged(self): |
1178 | | - inner = FakeTransport() |
1179 | | - transport = _EnvelopePrinterTransport(inner) |
1180 | | - envelope = _make_json_envelope() |
1181 | | - |
1182 | | - with mock.patch("sentry_sdk.transport.logger") as mock_logger: |
1183 | | - transport.capture_envelope(envelope) |
1184 | | - |
1185 | | - log_text = _collect_debug_log_text(mock_logger.debug) |
1186 | | - assert "abc123" in log_text |
1187 | | - |
1188 | | - def test_item_type_and_headers_are_logged(self): |
1189 | | - inner = FakeTransport() |
1190 | | - transport = _EnvelopePrinterTransport(inner) |
1191 | | - envelope = _make_json_envelope() |
1192 | | - |
1193 | | - with mock.patch("sentry_sdk.transport.logger") as mock_logger: |
1194 | | - transport.capture_envelope(envelope) |
1195 | | - |
1196 | | - log_text = _collect_debug_log_text(mock_logger.debug) |
1197 | | - assert "Item type:" in log_text |
1198 | | - assert "event" in log_text |
1199 | | - assert "Item headers:" in log_text |
1200 | | - |
1201 | | - def test_logging_exception_does_not_propagate(self): |
1202 | | - inner = FakeTransport() |
1203 | | - transport = _EnvelopePrinterTransport(inner) |
1204 | | - envelope = _make_json_envelope() |
1205 | | - |
1206 | | - with mock.patch( |
1207 | | - "sentry_sdk.transport.json.dumps", side_effect=RuntimeError("boom") |
1208 | | - ): |
1209 | | - transport.capture_envelope(envelope) |
1210 | | - |
1211 | | - assert inner.captured_envelopes == [envelope] |
1212 | | - |
1213 | | - def test_empty_envelope_logs_headers_only(self): |
1214 | | - inner = FakeTransport() |
1215 | | - transport = _EnvelopePrinterTransport(inner) |
1216 | | - envelope = Envelope(headers={"event_id": "empty1"}) |
1217 | | - |
1218 | | - with mock.patch("sentry_sdk.transport.logger") as mock_logger: |
1219 | | - transport.capture_envelope(envelope) |
1220 | | - |
1221 | | - log_text = _collect_debug_log_text(mock_logger.debug) |
1222 | | - assert "empty1" in log_text |
1223 | | - assert "Item type:" not in log_text |
1224 | | - assert inner.captured_envelopes == [envelope] |
1225 | | - |
1226 | | - def test_multiple_items_each_logged(self): |
1227 | | - inner = FakeTransport() |
1228 | | - transport = _EnvelopePrinterTransport(inner) |
1229 | | - envelope = Envelope(headers={"event_id": "multi"}) |
1230 | | - envelope.add_item(Item(payload='{"a": 1}', type="event")) |
1231 | | - envelope.add_item(Item(payload=b"\xff", type="attachment")) |
1232 | | - |
1233 | | - with mock.patch("sentry_sdk.transport.logger") as mock_logger: |
1234 | | - transport.capture_envelope(envelope) |
1235 | | - |
1236 | | - log_text = _collect_debug_log_text(mock_logger.debug) |
1237 | | - assert '"a": 1' in log_text |
1238 | | - assert "<binary 1 bytes>" in log_text |
1239 | | - |
1240 | | - |
1241 | | -class TestMakeTransportEnvelopePrinter: |
1242 | | - def test_env_var_wraps_transport(self): |
1243 | | - options = { |
1244 | | - "dsn": "https://foo@sentry.io/123", |
1245 | | - "transport": None, |
1246 | | - "_experiments": {}, |
1247 | | - "integrations": [], |
1248 | | - "send_client_reports": True, |
1249 | | - "transport_queue_size": 100, |
1250 | | - "keep_alive": False, |
1251 | | - "socket_options": None, |
1252 | | - "ca_certs": None, |
1253 | | - "cert_file": None, |
1254 | | - "key_file": None, |
1255 | | - "http_proxy": None, |
1256 | | - "https_proxy": None, |
1257 | | - "proxy_headers": None, |
1258 | | - } |
1259 | | - with mock.patch.dict(os.environ, {"SENTRY_PRINT_ENVELOPES": "1"}): |
1260 | | - transport = make_transport(options) |
1261 | | - |
1262 | | - assert isinstance(transport, _EnvelopePrinterTransport) |
1263 | | - assert isinstance(transport._inner, HttpTransport) |
1264 | | - |
1265 | | - def test_no_env_var_returns_plain_transport(self): |
1266 | | - options = { |
1267 | | - "dsn": "https://foo@sentry.io/123", |
1268 | | - "transport": None, |
1269 | | - "_experiments": {}, |
1270 | | - "integrations": [], |
1271 | | - "send_client_reports": True, |
1272 | | - "transport_queue_size": 100, |
1273 | | - "keep_alive": False, |
1274 | | - "socket_options": None, |
1275 | | - "ca_certs": None, |
1276 | | - "cert_file": None, |
1277 | | - "key_file": None, |
1278 | | - "http_proxy": None, |
1279 | | - "https_proxy": None, |
1280 | | - "proxy_headers": None, |
1281 | | - } |
1282 | | - with mock.patch.dict(os.environ, {}, clear=False): |
1283 | | - os.environ.pop("SENTRY_PRINT_ENVELOPES", None) |
1284 | | - transport = make_transport(options) |
1285 | | - |
1286 | | - assert isinstance(transport, HttpTransport) |
1287 | | - assert not isinstance(transport, _EnvelopePrinterTransport) |
1288 | | - |
1289 | | - @pytest.mark.parametrize("value", ["0", "false", "no", ""]) |
1290 | | - def test_falsy_env_var_values_do_not_wrap(self, value): |
1291 | | - options = { |
1292 | | - "dsn": "https://foo@sentry.io/123", |
1293 | | - "transport": None, |
1294 | | - "_experiments": {}, |
1295 | | - "integrations": [], |
1296 | | - "send_client_reports": True, |
1297 | | - "transport_queue_size": 100, |
1298 | | - "keep_alive": False, |
1299 | | - "socket_options": None, |
1300 | | - "ca_certs": None, |
1301 | | - "cert_file": None, |
1302 | | - "key_file": None, |
1303 | | - "http_proxy": None, |
1304 | | - "https_proxy": None, |
1305 | | - "proxy_headers": None, |
1306 | | - } |
1307 | | - with mock.patch.dict(os.environ, {"SENTRY_PRINT_ENVELOPES": value}): |
1308 | | - transport = make_transport(options) |
1309 | | - |
1310 | | - assert isinstance(transport, HttpTransport) |
1311 | | - assert not isinstance(transport, _EnvelopePrinterTransport) |
1312 | | - |
1313 | | - def test_env_var_wraps_pre_instantiated_transport(self): |
1314 | | - inner = FakeTransport() |
1315 | | - options = { |
1316 | | - "dsn": "https://foo@sentry.io/123", |
1317 | | - "transport": inner, |
1318 | | - "_experiments": {}, |
1319 | | - "integrations": [], |
1320 | | - "send_client_reports": True, |
1321 | | - "transport_queue_size": 100, |
1322 | | - "keep_alive": False, |
1323 | | - "socket_options": None, |
1324 | | - "ca_certs": None, |
1325 | | - "cert_file": None, |
1326 | | - "key_file": None, |
1327 | | - "http_proxy": None, |
1328 | | - "https_proxy": None, |
1329 | | - "proxy_headers": None, |
1330 | | - } |
1331 | | - with mock.patch.dict(os.environ, {"SENTRY_PRINT_ENVELOPES": "1"}): |
1332 | | - transport = make_transport(options) |
1333 | | - |
1334 | | - assert isinstance(transport, _EnvelopePrinterTransport) |
1335 | | - assert transport._inner is inner |
1336 | | - |
1337 | | - |
1338 | | -class Test_EnvelopePrinterTransportIsinstance: |
1339 | | - def test_isinstance_matches_inner_transport_class(self): |
1340 | | - inner = FakeTransport() |
1341 | | - wrapper = _EnvelopePrinterTransport(inner) |
1342 | | - |
1343 | | - assert isinstance(wrapper, FakeTransport) |
1344 | | - assert isinstance(wrapper, Transport) |
1345 | | - |
1346 | | - def test_isinstance_matches_http_transport(self): |
1347 | | - options = { |
1348 | | - "dsn": "https://foo@sentry.io/123", |
1349 | | - "transport": None, |
1350 | | - "_experiments": {}, |
1351 | | - "integrations": [], |
1352 | | - "send_client_reports": True, |
1353 | | - "transport_queue_size": 100, |
1354 | | - "keep_alive": False, |
1355 | | - "socket_options": None, |
1356 | | - "ca_certs": None, |
1357 | | - "cert_file": None, |
1358 | | - "key_file": None, |
1359 | | - "http_proxy": None, |
1360 | | - "https_proxy": None, |
1361 | | - "proxy_headers": None, |
1362 | | - } |
1363 | | - with mock.patch.dict(os.environ, {"SENTRY_PRINT_ENVELOPES": "1"}): |
1364 | | - transport = make_transport(options) |
1365 | | - |
1366 | | - assert isinstance(transport, HttpTransport) |
1367 | | - |
1368 | | - def test_getattr_delegates_to_inner(self): |
1369 | | - inner = FakeTransport() |
1370 | | - inner.custom_attr = "test_value" |
1371 | | - wrapper = _EnvelopePrinterTransport(inner) |
1372 | | - |
1373 | | - assert wrapper.custom_attr == "test_value" |
0 commit comments