fix: Fix race condition on WaiSpec test (Copilot 🤖)

flake.nix

@@ -1,10 +1,15 @@
 {
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
   };
 
-  outputs = { self, flake-utils, nixpkgs }:
+  outputs =
+    {
+      self,
+      flake-utils,
+      nixpkgs,
+    }:
     flake-utils.lib.simpleFlake {
       inherit self nixpkgs;
       name = "rollbar-haskell";

rollbar-wai/ChangeLog.md

@@ -9,3 +9,8 @@ All notable changes to this project will be documented in this file.
 - Changed `text` dependency upper bound: we now support `text-2.0.X.X`.
 
 ## Unreleased changes
+
+### Changed
+- `rollbarOnExceptionWith` now takes a fork function of type `IO () -> IO ()`.
+- All tests are now synchronous and no longer use `threadDelay`.
+- Updated `rollbarOnException` and all usages to match the new signature.

rollbar-wai/package.yaml

@@ -1,5 +1,5 @@
 name: rollbar-wai
-version: 1.1.1
+version: 1.2.0
 github: "stackbuilders/rollbar-haskell"
 license: MIT
 author: "Stack Builders Inc."

rollbar-wai/rollbar-wai.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           rollbar-wai
-version:        1.1.1
+version:        1.2.0
 synopsis:       Provides error reporting capabilities to WAI based applications through Rollbar API.
 
 description:    Please see the README on GitHub at

rollbar-wai/src/Rollbar/Wai.hs

@@ -50,21 +50,22 @@ rollbarOnException
   -> Maybe W.Request
   -> SomeException
   -> m ()
-rollbarOnException = rollbarOnExceptionWith (void . createItem)
+rollbarOnException = rollbarOnExceptionWith (void . forkIO) (void . createItem)
 
 -- | Similar to 'rollbarOnExceptionWith', but it allows customize the function
 -- used to send the 'Item' to Rollbar.
 --
 -- @since 0.1.0
 rollbarOnExceptionWith
   :: MonadIO m
-  => (Item -> Rollbar ())
+  => (IO () -> IO ()) -- ^ fork function (returns unit)
+  -> (Item -> Rollbar ())
   -> Settings
   -> Maybe W.Request
   -> SomeException
   -> m ()
-rollbarOnExceptionWith f settings waiRequest ex =
-  void $ liftIO $ forkIO $ runRollbar settings $ do
+rollbarOnExceptionWith fork f settings waiRequest ex =
+  void $ liftIO $ fork $ runRollbar settings $ do
     item <- mkItem $ PayloadTrace $ Trace [] $ mkException ex
     request <- mapM mkRequest waiRequest
     f item

rollbar-wai/test/Rollbar/WaiSpec.hs

@@ -10,7 +10,6 @@ import qualified Data.Text as T
 import qualified Network.Wai as W
 import qualified Network.Wai.Handler.Warp as W
 
-import Control.Concurrent (threadDelay)
 import Control.Monad (join)
 import Control.Monad.IO.Class
 import Data.Aeson
@@ -33,7 +32,6 @@ spec = before getSettingsAndItemRef $
             (req GET url NoReqBody bsResponse $ port warpPort)
           responseStatusCode response `shouldBe` 200
           responseBody response `shouldBe` "OK"
-          threadDelay 500
           readIORef itemRef `shouldReturn` Nothing
 
     context "when the response status code is not 200" $
@@ -44,7 +42,6 @@ spec = before getSettingsAndItemRef $
             (defaultHttpConfig { httpConfigCheckResponse = \_ _ _ -> Nothing })
             (req GET url NoReqBody bsResponse $ port warpPort)
           response `shouldBe` "Something went wrong"
-          threadDelay 500
           let portAsText = T.pack $ show warpPort
           join . fmap itemRequest <$> readIORef itemRef `shouldReturn` Just
             ( Request
@@ -75,7 +72,7 @@ withApp
   -> IO a
 withApp f (settings, itemRef) = do
   let waiSettings = W.setOnException
-        (rollbarOnExceptionWith (createItemFake itemRef) settings)
+        (rollbarOnExceptionWith id (createItemFake itemRef) settings)
         W.defaultSettings
   W.withApplicationSettings waiSettings (return app) $ f itemRef
 

rollbar-yesod/package.yaml

@@ -1,5 +1,5 @@
 name: rollbar-yesod
-version: 1.1.1
+version: 1.1.2
 github: "stackbuilders/rollbar-haskell"
 license: MIT
 author: "Stack Builders Inc."
@@ -41,7 +41,7 @@ library:
   source-dirs: src
   dependencies:
     - rollbar-client >= 1.0 && < 2
-    - rollbar-wai >= 1.0 && < 2
+    - rollbar-wai >= 1.2 && < 2
     - unliftio >= 0.2 && < 1
     - wai >= 3.2 && < 4
     - yesod-core >= 1.6 && < 2

rollbar-yesod/rollbar-yesod.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           rollbar-yesod
-version:        1.1.1
+version:        1.1.2
 synopsis:       Provides error reporting capabilities to Yesod applications through Rollbar API.
 
 description:    Please see the README on GitHub at
@@ -45,7 +45,7 @@ library
   build-depends:
       base >=4.18 && <5
     , rollbar-client >=1.0 && <2
-    , rollbar-wai >=1.0 && <2
+    , rollbar-wai >=1.2 && <2
     , unliftio >=0.2 && <1
     , wai >=3.2 && <4
     , yesod-core >=1.6 && <2

rollbar-yesod/src/Rollbar/Yesod.hs

@@ -17,6 +17,7 @@ module Rollbar.Yesod
 
 import qualified Network.Wai as W
 
+import Control.Concurrent (forkIO)
 import Control.Exception (Exception(..), SomeException)
 import Control.Monad (unless, void)
 import Rollbar.Client
@@ -40,7 +41,7 @@ rollbarYesodMiddleware
   => m a
   -> m a
 rollbarYesodMiddleware = rollbarYesodMiddlewareWith $ \settings request ex ->
-  rollbarOnExceptionWith handler settings (Just request) ex
+  rollbarOnExceptionWith (void . forkIO) handler settings (Just request) ex
   where
     handler item = void $ createItem item { itemFramework = Just "yesod" }