Bottle never calls response.close()

Author: antonpirker

sentry_sdk/integrations/bottle.py

@@ -138,6 +138,9 @@ def wrapped_callback(*args, **kwargs):
                 ):
                     _capture_exception(res, handled=True)
 
+                # Manually close the transaction because Bottle does not call `close()` on the WSGI response
+                sentry_sdk.get_current_scope().transaction.__exit__(None, None, None)
+
                 return res
 
             return wrapped_callback

sentry_sdk/integrations/wsgi.py

@@ -269,6 +269,12 @@ def __iter__(self):
 
             yield chunk
 
+        # Close the Sentry transaction (it could be that response.close() is never called by the framework)
+        # This is done here to make sure the Transaction stays
+        # open until all streaming responses are done.
+        if self._transaction is not None:
+            self._transaction.__exit__(None, None, None)
+
     def close(self):
         # type: () -> None
         with use_isolation_scope(self._isolation_scope):
@@ -279,9 +285,8 @@ def close(self):
                     # Close the Sentry transaction
                     # This is done here to make sure the Transaction stays
                     # open until all streaming responses are done.
-                    # Of course this here works also for non streaming responses.
                     if self._transaction is not None:
-                        self._transaction.__exit__(None, None, None)                    
+                        self._transaction.__exit__(None, None, None)
                 except AttributeError:
                     pass
                 except BaseException: