Merge branch 'master' into major/3.0

Author: sentrivana

sentry_sdk/consts.py

@@ -1282,7 +1282,7 @@ def __init__(
         profile_lifecycle: 'Literal["manual", "trace"]' = "manual",
         profile_session_sample_rate: "Optional[float]" = None,
         auto_enabling_integrations: bool = True,
-        disabled_integrations: "Optional[Sequence[sentry_sdk.integrations.Integration]]" = None,
+        disabled_integrations: "Optional[Sequence[Union[sentry_sdk.integrations.Integration, type[sentry_sdk.integrations.Integration]]]]" = None,
         auto_session_tracking: bool = True,
         send_client_reports: bool = True,
         _experiments: "Experiments" = {},  # noqa: B006

sentry_sdk/integrations/bottle.py

@@ -73,6 +73,19 @@ def setup_once() -> None:
         version = parse_version(BOTTLE_VERSION)
         _check_minimum_version(BottleIntegration, version)
 
+        # Bottle's Route.__repr__ might lead to a never-terminating while True
+        # loop when attach_stacktrace=True.
+        def _sentry_route_repr(self: "Route") -> str:
+            cb = self.callback
+            return "<%s %s -> %s:%s>" % (
+                self.method,
+                self.rule,
+                getattr(cb, "__module__", "?"),
+                getattr(cb, "__name__", "?"),
+            )
+
+        Route.__sentry_repr__ = _sentry_route_repr
+
         old_app = Bottle.__call__
 
         @ensure_integration_enabled(BottleIntegration, old_app)

sentry_sdk/serializer.py

@@ -43,8 +43,8 @@
 
 # Maximum depth and breadth of databags. Excess data will be trimmed. If
 # max_request_body_size is "always", request bodies won't be trimmed.
-MAX_DATABAG_DEPTH = 5
-MAX_DATABAG_BREADTH = 10
+MAX_DATABAG_DEPTH: int = 5
+MAX_DATABAG_BREADTH: int = 10
 CYCLE_MARKER = "<cyclic>"
 
 

tests/integrations/bottle/test_bottle.py

@@ -103,6 +103,39 @@ def index():
         assert len(event["request"]["data"]["foo"]["bar"]) == 1034
 
 
+def test_attach_stacktrace_doesnt_hang(sentry_init, capture_events, app, get_client):
+    sentry_init(
+        integrations=[BottleIntegration()],
+        max_request_body_size="always",
+        attach_stacktrace=True,
+    )
+
+    data = {"foo": {"bar": "a" * (1024)}}
+
+    @app.route("/", method="POST")
+    def index():
+        import bottle
+
+        assert bottle.request.json == data
+        assert bottle.request.body.read() == json.dumps(data).encode("ascii")
+        capture_message("hi")
+        return "ok"
+
+    events = capture_events()
+
+    client = get_client()
+    response = client.get("/")
+
+    response = client.post("/", content_type="application/json", data=json.dumps(data))
+    assert response[1] == "200 OK"
+
+    (event,) = events
+
+    # As long as this test finishes, we're good. It's just making sure we don't
+    # hang.
+    assert event["request"]["data"]
+
+
 @pytest.mark.parametrize("data", [{}, []], ids=["empty-dict", "empty-list"])
 def test_empty_json_request(sentry_init, capture_events, app, data, get_client):
     sentry_init(integrations=[BottleIntegration()])