Skip to content

Commit f0c3b66

Browse files
committed
This was more of a can of worms than I realized.
Revert "Do not require a DSN to be set to use the envelope pretty print transport" This reverts commit 5205418.
1 parent 5205418 commit f0c3b66

1 file changed

Lines changed: 14 additions & 27 deletions

File tree

sentry_sdk/transport.py

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,21 +1084,16 @@ def _make_pool(
10841084

10851085

10861086
class _EnvelopePrinterTransport(Transport):
1087-
"""Prints envelope contents to the SDK debug logger, optionally wrapping another transport."""
1087+
"""Wraps another transport, printing envelope contents to the SDK debug logger before sending."""
10881088

1089-
def __init__(self, transport: "Optional[Transport]" = None) -> None:
1090-
if transport is not None:
1091-
Transport.__init__(self, options=transport.options)
1092-
self.parsed_dsn = transport.parsed_dsn
1093-
else:
1094-
Transport.__init__(self)
1089+
def __init__(self, transport: "Transport") -> None:
1090+
Transport.__init__(self, options=transport.options)
10951091
self._inner = transport
1092+
self.parsed_dsn = transport.parsed_dsn
10961093

10971094
@property # type: ignore[misc]
10981095
def __class__(self) -> type:
1099-
if self._inner is not None:
1100-
return self._inner.__class__
1101-
return _EnvelopePrinterTransport
1096+
return self._inner.__class__
11021097

11031098
def capture_envelope(self, envelope: "Envelope") -> None:
11041099
try:
@@ -1127,20 +1122,17 @@ def capture_envelope(self, envelope: "Envelope") -> None:
11271122
except Exception:
11281123
pass
11291124

1130-
if self._inner is not None:
1131-
self._inner.capture_envelope(envelope)
1125+
self._inner.capture_envelope(envelope)
11321126

11331127
def flush(
11341128
self,
11351129
timeout: float,
11361130
callback: "Optional[Any]" = None,
11371131
) -> "Any":
1138-
if self._inner is not None:
1139-
return self._inner.flush(timeout, callback)
1132+
return self._inner.flush(timeout, callback)
11401133

11411134
def kill(self) -> "Any":
1142-
if self._inner is not None:
1143-
return self._inner.kill()
1135+
return self._inner.kill()
11441136

11451137
def record_lost_event(
11461138
self,
@@ -1150,20 +1142,13 @@ def record_lost_event(
11501142
*,
11511143
quantity: int = 1,
11521144
) -> None:
1153-
if self._inner is not None:
1154-
self._inner.record_lost_event(
1155-
reason, data_category, item, quantity=quantity
1156-
)
1145+
self._inner.record_lost_event(reason, data_category, item, quantity=quantity)
11571146

11581147
def is_healthy(self) -> bool:
1159-
if self._inner is not None:
1160-
return self._inner.is_healthy()
1161-
return True
1148+
return self._inner.is_healthy()
11621149

11631150
def __getattr__(self, name: str) -> "Any":
1164-
if self._inner is not None:
1165-
return getattr(self._inner, name)
1166-
raise AttributeError(name)
1151+
return getattr(self._inner, name)
11671152

11681153

11691154
class _FunctionTransport(Transport):
@@ -1252,7 +1237,9 @@ def make_transport(options: "Dict[str, Any]") -> "Optional[Transport]":
12521237
if transport is None and options["dsn"]:
12531238
transport = transport_cls(options)
12541239

1255-
if os.environ.get("SENTRY_PRINT_ENVELOPES", "").lower() in ("1", "true", "yes"):
1240+
if transport is not None and os.environ.get(
1241+
"SENTRY_PRINT_ENVELOPES", ""
1242+
).lower() in ("1", "true", "yes"):
12561243
transport = _EnvelopePrinterTransport(transport)
12571244

12581245
return transport

0 commit comments

Comments
 (0)