upgrade Blammo to 2.1 (#187)

freckle · Aug 9, 2024 · 882d012 · 882d012
1 parent 1e42dd7
commit 882d012
Show file tree

Hide file tree

Showing 30 changed files with 68 additions and 49 deletions.
diff --git a/freckle-app/CHANGELOG.md b/freckle-app/CHANGELOG.md
@@ -1,4 +1,8 @@
-## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.0.0...main)
+## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.0.1...main)
+
+## [v1.20.0.1](https://github.com/freckle/freckle-app/compare/freckle-app-v1.20.0.0...freckle-app-v1.20.0.1)
+
+- Upgrade `Blammo` to 2.1
 
 ## [v1.20.0.0](https://github.com/freckle/freckle-app/compare/freckle-app-v1.19.0.0...freckle-app-v1.20.0.0)
 

diff --git a/freckle-app/freckle-app.cabal b/freckle-app/freckle-app.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.22
 -- see: https://github.com/sol/hpack
 
 name:           freckle-app
-version:        1.20.0.0
+version:        1.20.0.1
 synopsis:       Haskell application toolkit used at Freckle
 description:    Please see README.md
 category:       Utils
@@ -94,7 +94,7 @@ library
       TypeFamilies
   ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-local-signatures -Wno-missing-safe-haskell-mode -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-safe -Wno-unsafe
   build-depends:
-      Blammo >=2.0.0.0
+      Blammo
     , Blammo-wai
     , Glob
     , MonadRandom

diff --git a/freckle-app/library/Freckle/App.hs b/freckle-app/library/Freckle/App.hs
@@ -181,7 +181,9 @@ module Freckle.App
 
 import Freckle.App.Prelude
 
-import Blammo.Logging
+import Blammo.Logging (MonadLogger, MonadLoggerIO)
+import Blammo.Logging.Setup (WithLogger (..))
+import Blammo.Logging.ThreadContext (MonadMask)
 import Control.Lens (view)
 import Control.Monad.Catch (MonadCatch, MonadThrow)
 import Control.Monad.Primitive (PrimMonad (..))

diff --git a/freckle-app/library/Freckle/App/Async.hs b/freckle-app/library/Freckle/App/Async.hs
@@ -10,8 +10,9 @@ module Freckle.App.Async
 
 import Freckle.App.Prelude
 
-import Blammo.Logging (Message (..), MonadLogger, MonadMask, logError, (.=))
-import Blammo.Logging qualified as Blammo
+import Blammo.Logging (Message (..), MonadLogger, logError, (.=))
+import Blammo.Logging.ThreadContext (MonadMask)
+import Blammo.Logging.ThreadContext qualified as Blammo
 import Control.Immortal qualified as Immortal
 import Control.Monad (forever)
 import Data.Aeson (Value)

diff --git a/freckle-app/library/Freckle/App/Bugsnag/MetaData.hs b/freckle-app/library/Freckle/App/Bugsnag/MetaData.hs
@@ -15,7 +15,7 @@ module Freckle.App.Bugsnag.MetaData
 
 import Freckle.App.Prelude
 
-import Blammo.Logging (myThreadContext)
+import Blammo.Logging.ThreadContext (myThreadContext)
 import Control.Lens (Lens', lens, to, view, (<>~))
 import Data.Aeson (Value (..))
 import Data.Aeson.KeyMap qualified as KeyMap

diff --git a/freckle-app/library/Freckle/App/Stats.hs b/freckle-app/library/Freckle/App/Stats.hs
@@ -36,7 +36,7 @@ module Freckle.App.Stats
 
 import Freckle.App.Prelude
 
-import Blammo.Logging
+import Blammo.Logging.ThreadContext (MonadMask, withThreadContext)
 import Control.Lens (Lens', lens, to, view, (&), (.~), (<>~))
 import Control.Monad.Except (runExceptT)
 import Control.Monad.Reader (local)

diff --git a/freckle-app/library/Freckle/App/Test.hs b/freckle-app/library/Freckle/App/Test.hs
@@ -33,7 +33,9 @@ import Test.Hspec as X
   )
 import Test.Hspec.Expectations.Lifted as X hiding (expectationFailure)
 
-import Blammo.Logging
+import Blammo.Logging (MonadLogger, MonadLoggerIO)
+import Blammo.Logging.Setup (WithLogger (..))
+import Blammo.Logging.ThreadContext (MonadMask)
 import Control.Lens (view)
 import Control.Monad.Base
 import Control.Monad.Catch (ExitCase (..), MonadCatch, MonadThrow, mask)

diff --git a/freckle-app/library/Freckle/App/Test/Yesod.hs b/freckle-app/library/Freckle/App/Test/Yesod.hs
@@ -73,7 +73,7 @@ where
 
 import Freckle.App.Prelude
 
-import Blammo.Logging (LoggingT)
+import Blammo.Logging.Setup (LoggingT)
 import Control.Monad.Except (ExceptT)
 import Control.Monad.State (StateT)
 import Control.Monad.Trans.Maybe (MaybeT)

diff --git a/freckle-app/library/Network/Wai/Middleware/Stats.hs b/freckle-app/library/Network/Wai/Middleware/Stats.hs
@@ -5,7 +5,7 @@ module Network.Wai.Middleware.Stats
 
 import Freckle.App.Prelude
 
-import Blammo.Logging (Pair, withThreadContext)
+import Blammo.Logging.ThreadContext (Pair, withThreadContext)
 import Control.Lens ((^.))
 import Control.Monad.Reader (runReaderT)
 import Data.Aeson ((.=))

diff --git a/freckle-app/package.yaml b/freckle-app/package.yaml
@@ -1,5 +1,5 @@
 name: freckle-app
-version: 1.20.0.0
+version: 1.20.0.1
 maintainer: Freckle Education
 category: Utils
 github: freckle/freckle-app
@@ -69,7 +69,7 @@ library:
     - Freckle.App.Test.Http
     - Freckle.App.Test.Http.MatchRequest
   dependencies:
-    - Blammo >= 2.0.0.0
+    - Blammo
     - Blammo-wai
     - Glob
     - MonadRandom

diff --git a/freckle-app/tests/Freckle/App/AsyncSpec.hs b/freckle-app/tests/Freckle/App/AsyncSpec.hs
@@ -5,7 +5,7 @@ module Freckle.App.AsyncSpec
 import Freckle.App.Prelude
 
 import Blammo.Logging
-import Blammo.Logging qualified as Blammo
+import Blammo.Logging.ThreadContext qualified as Blammo
 import Control.Concurrent.Async (wait)
 import Data.Aeson.KeyMap qualified as KeyMap
 import Freckle.App.Async (async)

diff --git a/freckle-app/tests/Freckle/App/Bugsnag/MetaDataSpec.hs b/freckle-app/tests/Freckle/App/Bugsnag/MetaDataSpec.hs
@@ -4,7 +4,7 @@ module Freckle.App.Bugsnag.MetaDataSpec
 
 import Freckle.App.Test
 
-import Blammo.Logging
+import Blammo.Logging.ThreadContext qualified as Blammo
 import Data.Aeson
 import Data.Bugsnag
 import Freckle.App.Bugsnag
@@ -20,7 +20,7 @@ spec = do
 
       withStatsClient settings $ \client -> flip runReaderT client $ do
         Stats.tagged [("baz", "bat")] $ do
-          withThreadContext ["quix" .= ("quip" :: Text)] $ do
+          Blammo.withThreadContext ["quix" .= ("quip" :: Text)] $ do
             collected <- collectMetaData
 
             let expected =

diff --git a/freckle-http/freckle-http.cabal b/freckle-http/freckle-http.cabal
@@ -58,7 +58,7 @@ library
       TypeFamilies
   ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-local-signatures -Wno-missing-safe-haskell-mode -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-safe -Wno-unsafe
   build-depends:
-      Blammo >=2.0.0.0
+      Blammo
     , Glob
     , aeson
     , annotated-exception

diff --git a/freckle-http/package.yaml b/freckle-http/package.yaml
@@ -58,7 +58,7 @@ library:
   source-dirs: library
   dependencies:
     - Glob
-    - Blammo >= 2.0.0.0
+    - Blammo
     - aeson
     - annotated-exception
     - bytestring

diff --git a/freckle-kafka/freckle-kafka.cabal b/freckle-kafka/freckle-kafka.cabal
@@ -47,7 +47,7 @@ library
       TypeFamilies
   ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-local-signatures -Wno-missing-safe-haskell-mode -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-safe -Wno-unsafe
   build-depends:
-      Blammo >=2.0.0.0
+      Blammo
     , aeson
     , annotated-exception
     , base <5

diff --git a/freckle-kafka/package.yaml b/freckle-kafka/package.yaml
@@ -54,7 +54,7 @@ default-extensions:
 library:
   source-dirs: library
   dependencies:
-    - Blammo >= 2.0.0.0
+    - Blammo
     - aeson
     - annotated-exception
     - bytestring

diff --git a/freckle-memcached/CHANGELOG.md b/freckle-memcached/CHANGELOG.md
@@ -1,4 +1,8 @@
-## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-memcached-v0.0.0.1...main)
+## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-memcached-v0.0.0.2...main)
+
+## [v0.0.0.2](https://github.com/freckle/freckle-app/compare/freckle-memcached-v0.0.0.1...freckle-memcached-v0.0.0.2)
+
+Upgrade `Blammo` to 2.1
 
 ## [v0.0.0.1](https://github.com/freckle/freckle-app/compare/freckle-memcached-v0.0.0.0...freckle-memcached-v0.0.0.1)
 

diff --git a/freckle-memcached/freckle-memcached.cabal b/freckle-memcached/freckle-memcached.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.18
 -- see: https://github.com/sol/hpack
 
 name:           freckle-memcached
-version:        0.0.0.1
+version:        0.0.0.2
 synopsis:       ..
 description:    Please see README.md
 category:       Database
@@ -51,7 +51,7 @@ library
       TypeFamilies
   ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-local-signatures -Wno-missing-safe-haskell-mode -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-safe -Wno-unsafe
   build-depends:
-      Blammo >=2.0.0.0
+      Blammo
     , aeson
     , annotated-exception
     , base <5

diff --git a/freckle-memcached/package.yaml b/freckle-memcached/package.yaml
@@ -1,5 +1,5 @@
 name: freckle-memcached
-version: 0.0.0.1
+version: 0.0.0.2
 maintainer: Freckle Education
 category: Database
 github: freckle/freckle-app
@@ -55,7 +55,7 @@ default-extensions:
 library:
   source-dirs: library
   dependencies:
-    - Blammo >= 2.0.0.0
+    - Blammo
     - aeson
     - annotated-exception
     - bytestring

diff --git a/freckle-memcached/tests/AppExample.hs b/freckle-memcached/tests/AppExample.hs
@@ -6,7 +6,8 @@ module AppExample
 
 import Prelude
 
-import Blammo.Logging
+import Blammo.Logging (MonadLogger, MonadLoggerIO)
+import Blammo.Logging.Setup (WithLogger (..))
 import Control.Lens (view)
 import Control.Monad.Catch
 import Control.Monad.Reader (MonadReader, ReaderT (..))

diff --git a/freckle-otel/CHANGELOG.md b/freckle-otel/CHANGELOG.md
@@ -1,4 +1,8 @@
-## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-otel-v0.0.0.0...main)
+## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-otel-v0.0.0.2...main)
+
+## [v0.0.0.2](https://github.com/freckle/freckle-app/compare/freckle-otel-v0.0.0.1...freckle-otel-v0.0.0.2)
+
+Update `Blammo` to 2.1
 
 ## [v0.0.0.1](https://github.com/freckle/freckle-app/compare/freckle-otel-v0.0.0.0...freckle-otel-v0.0.0.1)
 

diff --git a/freckle-otel/freckle-otel.cabal b/freckle-otel/freckle-otel.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.18
 -- see: https://github.com/sol/hpack
 
 name:           freckle-otel
-version:        0.0.0.1
+version:        0.0.0.2
 synopsis:       ...
 description:    Please see README.md
 category:       OpenTelemetry, Telemetry, Monitoring, Observability, Metrics
@@ -49,7 +49,7 @@ library
       TypeFamilies
   ghc-options: -fignore-optim-changes -fwrite-ide-info -Weverything -Wno-all-missed-specialisations -Wno-missing-exported-signatures -Wno-missing-import-lists -Wno-missing-kind-signatures -Wno-missing-local-signatures -Wno-missing-safe-haskell-mode -Wno-monomorphism-restriction -Wno-prepositive-qualified-module -Wno-safe -Wno-unsafe
   build-depends:
-      Blammo >=2.0.0.0
+      Blammo
     , aeson
     , base <5
     , bytestring

diff --git a/freckle-otel/library/Freckle/App/OpenTelemetry/ThreadContext.hs b/freckle-otel/library/Freckle/App/OpenTelemetry/ThreadContext.hs
@@ -6,7 +6,7 @@ module Freckle.App.OpenTelemetry.ThreadContext
 
 import Prelude
 
-import Blammo.Logging (MonadMask, withThreadContext)
+import Blammo.Logging.ThreadContext (MonadMask, withThreadContext)
 import Control.Monad.IO.Class (MonadIO)
 import Data.Aeson ((.=))
 import Data.Aeson.Key qualified as Key

diff --git a/freckle-otel/package.yaml b/freckle-otel/package.yaml
@@ -1,5 +1,5 @@
 name: freckle-otel
-version: 0.0.0.1
+version: 0.0.0.2
 maintainer: Freckle Education
 category: OpenTelemetry, Telemetry, Monitoring, Observability, Metrics
 github: freckle/freckle-app
@@ -55,7 +55,7 @@ default-extensions:
 library:
   source-dirs: library
   dependencies:
-    - Blammo >= 2.0.0.0
+    - Blammo
     - aeson
     - bytestring
     - case-insensitive

diff --git a/freckle-otel/tests/Freckle/App/OpenTelemetry/ContextSpec.hs b/freckle-otel/tests/Freckle/App/OpenTelemetry/ContextSpec.hs
@@ -5,8 +5,9 @@ module Freckle.App.OpenTelemetry.ContextSpec
 import Prelude
 
 import AppExample
-import Blammo.Logging
-import Blammo.Logging.Logger (newTestLogger)
+import Blammo.Logging.LogSettings (defaultLogSettings)
+import Blammo.Logging.Logger (Logger, newTestLogger)
+import Blammo.Logging.Setup (HasLogger (..))
 import Control.Lens (lens)
 import Control.Monad.IO.Class (MonadIO)
 import Data.List qualified as List

diff --git a/stack-lts-20.26.yaml b/stack-lts-20.26.yaml
@@ -1,7 +1,7 @@
 resolver: lts-20.26
 extra-deps:
-  - Blammo-2.0.0.0
-  - Blammo-wai-0.0.0.0
+  - Blammo-2.1.0.0
+  - Blammo-wai-0.0.0.2
   - bugsnag-1.1.0.0
   - fast-logger-3.2.3
   - monad-validate-1.3.0.0

diff --git a/stack-lts-21.25.yaml b/stack-lts-21.25.yaml
@@ -1,7 +1,7 @@
 resolver: lts-21.25
 extra-deps:
-  - Blammo-2.0.0.0
-  - Blammo-wai-0.0.0.0
+  - Blammo-2.1.0.0
+  - Blammo-wai-0.0.0.2
   - bugsnag-1.1.0.0
   - fast-logger-3.2.3
   - monad-validate-1.3.0.0

diff --git a/stack-lts-21.25.yaml.lock b/stack-lts-21.25.yaml.lock
@@ -5,19 +5,19 @@
 
 packages:
 - completed:
-    hackage: Blammo-2.0.0.0@sha256:874b1572232d974b234ee8b2655b74ff15e3759abd2c1874d57ca35fe07002d4,4689
+    hackage: Blammo-2.1.0.0@sha256:cb974555dfe850cbc4f174a0a4443883b776b1e93c1d4b37249fb6081cb286de,4755
     pantry-tree:
-      sha256: 6dece91d00f9a022a62eaa39bacc6ae34bce07cae77830edb2c2b8ad25061099
-      size: 1647
+      sha256: 3c36d6a62cc32b5f80f0573a50205b71874570e6d55e0af5a7b72795f8c1b3b7
+      size: 1788
   original:
-    hackage: Blammo-2.0.0.0
+    hackage: Blammo-2.1.0.0
 - completed:
-    hackage: Blammo-wai-0.0.0.0@sha256:4eab73c27798edec02d5398cd709e2a24200f5dad14954e6a6d1314e117dfcd8,2845
+    hackage: Blammo-wai-0.0.0.2@sha256:b5d5c665d5ff919b229ff0d5ee4eea9021a848fcdbecb7dd7b17bbe64c073f21,2883
     pantry-tree:
-      sha256: f0e79a1e18bb9fc5741b402133d78cf039f02736089ac68752d31462a29f4b54
+      sha256: d018b595cf33757c7c197bd91743b4a0727569d7d9bcb828e24acb83b88dbfc7
       size: 338
   original:
-    hackage: Blammo-wai-0.0.0.0
+    hackage: Blammo-wai-0.0.0.2
 - completed:
     hackage: bugsnag-1.1.0.0@sha256:9723af13b09e7aed7e5855fcbcd7f89a904df80324f21d32480f01aabd8d035b,4565
     pantry-tree:

diff --git a/stack-nightly.yaml b/stack-nightly.yaml
@@ -1,7 +1,7 @@
 resolver: nightly-2024-06-12
 extra-deps:
-  - Blammo-2.0.0.0
-  - Blammo-wai-0.0.0.0
+  - Blammo-2.1.0.0
+  - Blammo-wai-0.0.0.2
   - bcp47-0.2.0.6
   - fast-logger-3.2.3
   - monad-validate-1.3.0.0

diff --git a/stack.yaml b/stack.yaml
@@ -1,7 +1,7 @@
 resolver: lts-22.13
 extra-deps:
-  - Blammo-2.0.0.0
-  - Blammo-wai-0.0.0.0
+  - Blammo-2.1.0.0
+  - Blammo-wai-0.0.0.2
   - fast-logger-3.2.3
   - monad-validate-1.3.0.0
   - hs-opentelemetry-api-0.1.0.0