Call notify_honeybadger in finally block

stckme · Jul 25, 2024 · 28f24f8 · 28f24f8
1 parent d299efe
commit 28f24f8
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 20 deletions.
diff --git a/apphelpers/rest/common.py b/apphelpers/rest/common.py
@@ -43,6 +43,8 @@ def notify_honeybadger(honeybadger, error, func, args, kwargs):
             },
         )
     except HTTPError as e:
-        if e.response.status_code != 403:
+        if e.response.status_code == 403:
             # Ignore 403 Forbidden errors. We get alerted by HB anyway.
+            pass
+        else:
             raise e
diff --git a/apphelpers/rest/fastapi.py b/apphelpers/rest/fastapi.py
@@ -58,40 +58,53 @@ def wrapper(f):
 
             @wraps(f)
             async def async_f_wrapped(*args, **kw):
+                err_to_report = None
                 try:
                     return await f(*args, **kw)
                 except BaseError as e:
                     if e.report:
-                        notify_honeybadger(
-                            honeybadger=hb, error=e, func=f, args=args, kwargs=kw
-                        )
+                        err_to_report = e
                     raise e
                 except Exception as e:
-                    notify_honeybadger(
-                        honeybadger=hb, error=e, func=f, args=args, kwargs=kw
-                    )
+                    err_to_report = e
                     raise e
+                finally:
+                    if err_to_report:
+                        notify_honeybadger(
+                            honeybadger=hb,
+                            error=err_to_report,
+                            func=f,
+                            args=args,
+                            kwargs=kw,
+                        )
 
             return async_f_wrapped
 
         else:
 
             @wraps(f)
             def f_wrapped(*args, **kw):
+                err_to_report = None
                 try:
                     return f(*args, **kw)
                 except BaseError as e:
                     if e.report:
-                        notify_honeybadger(
-                            honeybadger=hb, error=e, func=f, args=args, kwargs=kw
-                        )
+                        err_to_report = e
                     raise e
                 except Exception as e:
-                    notify_honeybadger(
-                        honeybadger=hb, error=e, func=f, args=args, kwargs=kw
-                    )
+                    err_to_report = e
                     raise e
 
+                finally:
+                    if err_to_report:
+                        notify_honeybadger(
+                            honeybadger=hb,
+                            error=err_to_report,
+                            func=f,
+                            args=args,
+                            kwargs=kw,
+                        )
+
             return f_wrapped
 
     return wrapper

diff --git a/apphelpers/rest/hug.py b/apphelpers/rest/hug.py
@@ -45,20 +45,25 @@ def honeybadger_wrapper(hb):
     def wrapper(f):
         @wraps(f)
         def f_wrapped(*args, **kw):
+            err_to_report = None
             try:
                 return f(*args, **kw)
             except BaseError as e:
                 if e.report:
-                    notify_honeybadger(
-                        honeybadger=hb, error=e, func=f, args=args, kwargs=kw
-                    )
+                    err_to_report = e
                 raise e
-
             except Exception as e:
-                notify_honeybadger(
-                    honeybadger=hb, error=e, func=f, args=args, kwargs=kw
-                )
+                err_to_report = e
                 raise e
+            finally:
+                if err_to_report:
+                    notify_honeybadger(
+                        honeybadger=hb,
+                        error=err_to_report,
+                        func=f,
+                        args=args,
+                        kwargs=kw,
+                    )
 
         return f_wrapped
 

diff --git a/fastapi_tests/test_rest.py b/fastapi_tests/test_rest.py
@@ -367,3 +367,11 @@ async def worst_endpoint(foo):
     with pytest.raises(RuntimeError):
         asyncio.run(wrapped_worst_endpoint(1))
     assert mocked_honeybadger.notify.call_count == 2
+
+    mocked_honeybadger.notify.side_effect = requests.exceptions.HTTPError(
+        response=mock.MagicMock(status_code=403)
+    )
+    with pytest.raises(RuntimeError) as e:
+        asyncio.run(wrapped_worst_endpoint(1))
+        assert "HttpError" in str(e)
+    assert mocked_honeybadger.notify.call_count == 3
diff --git a/tests/test_rest.py b/tests/test_rest.py
@@ -364,3 +364,11 @@ def worst_endpoint(foo):
     with pytest.raises(RuntimeError):
         wrapped_worst_endpoint(1)
     assert mocked_honeybadger.notify.call_count == 2
+
+    mocked_honeybadger.notify.side_effect = requests.exceptions.HTTPError(
+        response=mock.MagicMock(status_code=403)
+    )
+    with pytest.raises(RuntimeError) as e:
+        wrapped_worst_endpoint(1)
+        assert "HttpError" in str(e)
+    assert mocked_honeybadger.notify.call_count == 3