support annotations, update stack, add nix

Author: chris-martin

.github/workflows/ci.yml

@@ -14,6 +14,7 @@ jobs:
         stack-yaml:
           - stack.yaml
           - stack-nightly.yaml
+          - stack-lts-20.26.yaml
           - stack-lts-18.28.yaml
           - stack-lts-16.31.yaml
           - stack-lts-14.27.yaml

bugsnag/CHANGELOG.md

@@ -1,7 +1,16 @@
-## [_Unreleased_](https://github.com/pbrisbin/bugsnag-haskell/compare/bugsnag-v1.0.0.1...main)
+## [_Unreleased_](https://github.com/pbrisbin/bugsnag-haskell/compare/bugsnag-v1.0.1.0...main)
 
 - None
 
+## [v1.0.1.0](https://github.com/pbrisbin/bugsnag-haskell/compare/bugsnag-v1.0.0.0...bugsnag-v1.0.1.0)
+
+- Adds some support for the `annotated-exception` package.
+  `updateEventFromOriginalException` now catches either `e` or `AnnotatedException e`.
+  (This is technically a breaking change, but either it doesn't affect you
+  or is most likely the behavior you want.)
+  The new `updateEventFromOriginalAnnotatedException` utility can be used to inspect
+  the original exception's annotations.
+
 ## [v1.0.0.1](https://github.com/pbrisbin/bugsnag-haskell/compare/bugsnag-v1.0.0.0...bugsnag-v1.0.0.1)
 
 - Support GHCs 9.0 and 9.2

bugsnag/bugsnag.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.18
 -- see: https://github.com/sol/hpack
 
 name:           bugsnag
-version:        1.0.0.1
+version:        1.0.1.0
 synopsis:       Bugsnag error reporter for Haskell
 description:    Please see README.md
 category:       Web
@@ -69,6 +69,7 @@ library
       TypeFamilies
   build-depends:
       Glob >=0.9.0
+    , annotated-exception
     , base >=4.11.0 && <5
     , bugsnag-hs
     , bytestring

bugsnag/package.yaml

@@ -1,5 +1,5 @@
 name: bugsnag
-version: 1.0.0.1
+version: 1.0.1.0
 synopsis: Bugsnag error reporter for Haskell
 description: Please see README.md
 homepage: https://github.com/pbrisbin/bugsnag-haskell#readme
@@ -48,6 +48,7 @@ library:
   source-dirs: src
   dependencies:
     - Glob >= 0.9.0
+    - annotated-exception
     - bugsnag-hs
     - bytestring
     - containers

bugsnag/src/Network/Bugsnag/BeforeNotify.hs

@@ -16,6 +16,7 @@ module Network.Bugsnag.BeforeNotify
     -- * Modifying the Event
     , updateEvent
     , updateEventFromOriginalException
+    , updateEventFromOriginalAnnotatedException
     , setGroupingHash
     , setGroupingHashBy
     , setDevice
@@ -29,6 +30,8 @@ module Network.Bugsnag.BeforeNotify
 import Prelude
 
 import qualified Control.Exception as Exception
+import Control.Exception.Annotated (AnnotatedException)
+import qualified Control.Exception.Annotated as Annotated
 import Data.Bugsnag
 import Data.Maybe (isJust)
 import Data.Text (Text, unpack)
@@ -123,9 +126,22 @@ updateEvent f = beforeNotify $ \_e event -> f event
 --
 -- If the cast fails, the event is unchanged.
 --
+-- The cast will match either @e@ or @'AnnotatedException' e@.
+--
 updateEventFromOriginalException
     :: forall e . Exception.Exception e => (e -> BeforeNotify) -> BeforeNotify
-updateEventFromOriginalException f = beforeNotify $ \e event ->
+updateEventFromOriginalException f =
+    updateEventFromOriginalAnnotatedException (f . Annotated.exception)
+
+-- | Like 'updateEventFromOriginalException', but gives the result
+--   as an 'AnnotatedException'
+--
+-- If the original exception was not wrapped in 'AnnotatedException', it
+-- will match as an 'AnnotatedException' with an empty annotation list.
+updateEventFromOriginalAnnotatedException
+    :: forall e . Exception.Exception e
+    => (AnnotatedException e -> BeforeNotify) -> BeforeNotify
+updateEventFromOriginalAnnotatedException f = beforeNotify $ \e event ->
     let bn = maybe mempty f $ Exception.fromException $ Exception.toException e
     in runBeforeNotify bn e event
 

cabal.project

@@ -0,0 +1 @@
+packages: bugsnag, bugsnag-wai, bugsnag-yesod