freckle-app 1.6.0.2 → 1.6.0.3
raw patch · 4 files changed
+14/−15 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- CHANGELOG.md +10/−1
- freckle-app.cabal +1/−1
- library/Freckle/App/Bugsnag.hs +2/−12
- package.yaml +1/−1
CHANGELOG.md view
@@ -1,4 +1,13 @@-## [_Unreleased_](https://github.com/freckle/freckle-app/compare/v1.6.0.2...main)+## [_Unreleased_](https://github.com/freckle/freckle-app/compare/v1.6.0.3...main)++## [v1.6.0.3](https://github.com/freckle/freckle-app/compare/v1.6.0.2...v1.6.0.3)++- Revert regrouping of `SqlError` by `url`++ Consider `/foos/1` vs `/foos/2`: grouping naively by `url` makes these two+ errors when we wanted them to be one. This can't be solved without knowledge+ of the routing system, so we can't do it from within this library as-is.+ Therefore, we've reverted the feature for now. ## [v1.6.0.2](https://github.com/freckle/freckle-app/compare/v1.6.0.1...v1.6.0.2)
freckle-app.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.18 name: freckle-app-version: 1.6.0.2+version: 1.6.0.3 license: MIT license-file: LICENSE maintainer: Freckle Education
library/Freckle/App/Bugsnag.hs view
@@ -29,7 +29,6 @@ import Data.Bugsnag.Settings import qualified Data.ByteString.Char8 as BS8 import Data.List (isInfixOf)-import qualified Data.Text as T import Database.PostgreSQL.Simple (SqlError(..)) import Database.PostgreSQL.Simple.Errors import qualified Freckle.App.Env as Env@@ -91,11 +90,9 @@ void $ liftIO $ forkIO $ Bugsnag.notifyBugsnagWith f settings ex asSqlError :: SqlError -> BeforeNotify-asSqlError err@SqlError {..} =- setGroupingHashBy (groupTimeoutByRequestUrl err)- <> setGroupingHashBy (const $ sqlErrorGroupingHash err)- <> toSqlException+asSqlError err@SqlError {..} = toSqlGrouping <> toSqlException where+ toSqlGrouping = maybe mempty setGroupingHash (sqlErrorGroupingHash err) toSqlException = updateExceptions $ \ex -> ex { exception_errorClass = decodeUtf8 $ "SqlError-" <> sqlState , exception_message =@@ -108,13 +105,6 @@ <> sqlErrorHint <> ")" }--groupTimeoutByRequestUrl :: SqlError -> Event -> Maybe Text-groupTimeoutByRequestUrl SqlError {..} event = do- guard $ sqlState == "57014"- req <- event_request event- url <- request_url req- pure $ "SQL-Timeout-In-" <> T.takeWhile (/= '?') url sqlErrorGroupingHash :: SqlError -> Maybe Text sqlErrorGroupingHash err = do
package.yaml view
@@ -1,6 +1,6 @@ --- name: freckle-app-version: 1.6.0.2+version: 1.6.0.3 maintainer: Freckle Education category: Utils github: freckle/freckle-app