7d3130a · typeable/katip

git.iko.soy/typeable/katip

Update dependencies, drop ListT instance

ListT is deprecated in newer versions and I have no problem removing an instance that was probably broken anyways. I've verified that when using bloodhound 0.16.0.0, it works with the latest aeson and async.

commit7d3130ac5b87f9a7b9b93ea0a3eddf78f4fd0b51 authorMichael Xavier <michael@michaelxavier.net> dateFri 22 Jun 2018, 14:29 (8 years ago) parent21dd4a8

10 files changed+18−28

compare with master

unifiedsplit

katip-elasticsearch/katip-elasticsearch.cabal+2−2 katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Annotations.hs+2−2 katip-elasticsearch/test/Main.hs+2−2 katip/katip.cabal+1−1 katip/src/Katip/Core.hs+2−2 katip/src/Katip/Monadic.hs−8 katip/src/Katip/Scribes/Handle.hs+2−2 katip/test/Katip/Tests.hs+2−2 katip/test/Katip/Tests/Scribes/Handle.hs+3−3 stack.yaml+2−4

katip-elasticsearch/katip-elasticsearch.cabal+2−2

@@ -36,9 +36,9 @@ library

3636 build-depends:

3737 base >=4.6 && <5

3838 , katip >= 0.2.0.0 && < 0.6

39− , bloodhound >= 0.13.0.0 && < 0.16

39+ , bloodhound >= 0.16.0.0 && < 0.17

4040 , uuid >= 1.3.12 && < 1.4

41− , aeson >=0.6 && <1.4

41+ , aeson >=0.6

4242 , stm >= 2.4.3 && < 2.5

4343 , stm-chans >= 3.0.0.2 && < 3.1

4444 , async >= 2.0.1.0 && < 3.0

katip-elasticsearch/src/Katip/Scribes/ElasticSearch/Annotations.hs+2−2

@@ -12,7 +12,7 @@ import Data.Aeson

1212import qualified Data.Foldable as FT

1313import qualified Data.HashMap.Strict as HM

1414import Data.Maybe

15−import Data.Monoid

15+import Data.Monoid as M

1616import Data.Scientific (isFloating)

1717import Data.Text (Text)

1818import qualified Data.Text as T

@@ -65,7 +65,7 @@ annotateKeys = HM.fromList . map go . HM.toList

6565 where

6666 go (k, Object o) = (k, Object $ annotateKeys o)

6767 go (k, Array a) = (k, Array (annotateValue <$> a))

68− go (k, s@(String _)) = (k <> stringAnn, s)

68+ go (k, s@(String _)) = (k M.<> stringAnn, s)

6969 go (k, n@(Number sci)) = if isFloating sci

7070 then (k <> doubleAnn, n)

7171 else (k <> longAnn, n)

katip-elasticsearch/test/Main.hs+2−2

@@ -26,7 +26,7 @@ import Data.Aeson.Lens

2626import Data.Aeson.Types

2727import Data.ByteString.Lazy (ByteString)

2828import qualified Data.HashMap.Strict as HM

29−import Data.Monoid

29+import Data.Monoid as M

3030import Data.Scientific

3131import Data.Tagged

3232import Data.Text (Text)

@@ -230,7 +230,7 @@ esTests

230230esTests prx = testGroup "elasticsearch scribe"

231231 [

232232 withSearch' (\c -> c { essIndexSharding = NoIndexSharding}) prx $ \setup -> testCase "it flushes to elasticsearch" $ withTestLogging prx setup $ \done -> do

233− $(logT) (ExampleCtx True) mempty InfoS "A test message"

233+ $(logT) (ExampleCtx True) M.mempty InfoS "A test message"

234234 liftIO $ do

235235 void done

236236 logs <- getLogs prx

katip/katip.cabal+1−1

@@ -54,7 +54,7 @@ library

5454 OverloadedStrings

5555

5656 build-depends: base >=4.5 && <5

57− , aeson >=0.6 && <1.4

57+ , aeson >=0.6

5858 , async < 3.0.0.0

5959 , auto-update >= 0.1 && < 0.2

6060 , bytestring >= 0.9 && < 0.11

katip/src/Katip/Core.hs+2−2

@@ -56,7 +56,7 @@ import Data.Foldable as FT

5656import qualified Data.HashMap.Strict as HM

5757import Data.List

5858import qualified Data.Map.Strict as M

59−import Data.Semigroup

59+import Data.Semigroup as SG

6060import Data.String

6161import Data.String.Conv

6262import Data.Text (Text)

@@ -98,7 +98,7 @@ readMay s = case [x | (x,t) <- reads s, ("","") <- lex t] of

9898-- IsString/OverloadedStrings, so "foo" will result in Namespace

9999-- ["foo"].

100100newtype Namespace = Namespace { unNamespace :: [Text] }

101− deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,Semigroup,Monoid)

101+ deriving (Eq,Show,Read,Ord,Generic,ToJSON,FromJSON,SG.Semigroup,Monoid)

102102

103103instance IsString Namespace where

104104 fromString s = Namespace [fromString s]

katip/src/Katip/Monadic.hs−8

@@ -54,7 +54,6 @@ import Control.Monad.Trans.Either (EitherT, mapEitherT)

5454#endif

5555import Control.Monad.Trans.Except (ExceptT, mapExceptT)

5656import Control.Monad.Trans.Identity (IdentityT, mapIdentityT)

57−import Control.Monad.Trans.List (ListT, mapListT)

5857import Control.Monad.Trans.Maybe (MaybeT, mapMaybeT)

5958import Control.Monad.Trans.Resource (ResourceT, transResourceT)

6059import Control.Monad.Trans.RWS (RWST, mapRWST)

@@ -166,13 +165,6 @@ instance (KatipContext m, Katip (EitherT e m)) => KatipContext (EitherT e m) whe

166165#endif

167166

168167

169−instance (KatipContext m, Katip (ListT m)) => KatipContext (ListT m) where

170− getKatipContext = lift getKatipContext

171− localKatipContext = mapListT . localKatipContext

172− getKatipNamespace = lift getKatipNamespace

173− localKatipNamespace = mapListT . localKatipNamespace

174−

175−

176168instance (KatipContext m, Katip (ReaderT r m)) => KatipContext (ReaderT r m) where

177169 getKatipContext = lift getKatipContext

178170 localKatipContext = mapReaderT . localKatipContext

katip/src/Katip/Scribes/Handle.hs+2−2

@@ -9,7 +9,7 @@ import Control.Exception (bracket_, finally)

99import Control.Monad

1010import Data.Aeson

1111import qualified Data.HashMap.Strict as HM

12−import Data.Monoid

12+import Data.Monoid as M

1313import Data.Scientific as S

1414import Data.Text (Text)

1515import Data.Text.Lazy.Builder

@@ -23,7 +23,7 @@ import Katip.Format.Time (formatAsLogTime)

2323

2424-------------------------------------------------------------------------------

2525brackets :: Builder -> Builder

26−brackets m = fromText "[" <> m <> fromText "]"

26+brackets m = fromText "[" M.<> m <> fromText "]"

2727

2828

2929-------------------------------------------------------------------------------

katip/test/Katip/Tests.hs+2−2

@@ -19,7 +19,7 @@ import Control.Exception.Safe

1919import Data.Aeson

2020import qualified Data.HashMap.Strict as HM

2121import qualified Data.Map.Strict as M

22−import Data.Monoid

22+import Data.Monoid as Monoid

2323import Data.Text (Text)

2424import qualified Data.Text.Lazy.Builder as B

2525import Data.Time

@@ -128,7 +128,7 @@ loggingTests = testGroup "logging"

128128 where

129129 recordingEnv :: IO (LogEnv, TVar [Item Object])

130130 recordingEnv = do

131− items <- newTVarIO mempty

131+ items <- newTVarIO Monoid.mempty

132132 let scribe = Scribe

133133 { liPush = \i -> atomically (modifyTVar' items (<> [toObject <$> i]))

134134 , scribeFinalizer = return ()

katip/test/Katip/Tests/Scribes/Handle.hs+3−3

@@ -6,9 +6,9 @@ module Katip.Tests.Scribes.Handle

66-------------------------------------------------------------------------------

77import Control.Monad

88import Data.Aeson

9−import qualified Data.ByteString.Lazy as BL

109import qualified Data.ByteString.Char8 as B

11−import Data.Monoid

10+import qualified Data.ByteString.Lazy as BL

11+import Data.Monoid as M

1212import Data.Text (Text)

1313import qualified Data.Text as T

1414import qualified Data.Text.Encoding as T

@@ -41,7 +41,7 @@ tests = testGroup "Katip.Scribes.Handle"

4141 res <- readFile path

4242 let pat = "\\[[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} [[:digit:]]{2}:[[:digit:]]{2}:[[:digit:]]{2}\\]\\[katip-test.test\\]\\[Info\\]\\[.+\\]\\[[[:digit:]]+\\]\\[ThreadId [[:digit:]]+\\]\\[note.deep:some note\\] test message" :: String

4343 let matches = res =~ pat

44− assertBool (show res <> " did not match") matches

44+ assertBool (show res M.<> " did not match") matches

4545 , withResource setupFile (const (return ())) $ \setupScribe -> testCase "logs correct data to a file" $ do

4646 (path, fin, le) <- setupScribe

4747 runKatipT le $ logItem dummyLogItem "test" Nothing InfoS "test message"

stack.yaml+2−4

@@ -1,12 +1,10 @@

1−resolver: lts-10.4

1+resolver: lts-11.14

22packages:

33 - katip

44 - katip-elasticsearch

55extra-deps:

66 # These can be dropped probably as soon as they hit an LTS

7− - bloodhound-0.15.0.2

8− - http-types-0.12

9− - unliftio-core-0.1.1.0

7+ - bloodhound-0.16.0.0

108flags:

119 katip:

1210 lib-Werror: true