lightstep-haskell 0.1.3 → 0.1.4

raw patch · 2 files changed

+8/−5 lines, 2 filesdep +safe-exceptionsdep −exceptions

Dependencies added: safe-exceptions

Dependencies removed: exceptions

Files

• lightstep-haskell.cabal +2/−2
• src/LightStep/HighLevel/IO.hs +6/−3

@@ -1,7 +1,7 @@ cabal-version: 2.4  name:           lightstep-haskell-version:        0.1.3+version:        0.1.4 synopsis:       LightStep OpenTracing client library description:    LightStep OpenTracing client library. Uses GRPC transport via proto-lens. category:       Tools@@ -67,7 +67,7 @@     , async     , chronos     , containers-    , exceptions+    , safe-exceptions     , http2-client     , http2-client-grpc     , lens

@@ -8,8 +8,9 @@ import Control.Concurrent.Async import Control.Concurrent.STM import Control.Lens-import Control.Monad.Catch+import Control.Exception.Safe import Control.Monad.Except+import GHC.Conc import Data.Maybe import Data.ProtoLens.Message (defMessage) import LightStep.Internal.Debug@@ -78,6 +79,8 @@ withSingletonLightStep cfg action = do   doneVar <- newEmptyMVar   race_ (action >> waitUntilDone (lsGracefulShutdownTimeoutSeconds cfg) doneVar) $ do+    tid <- myThreadId+    labelThread tid "LightStep reporter"     let work client = do           d_ "Getting more spans"           spans <- liftIO $ atomically $ do@@ -85,11 +88,11 @@             xs <- flushTBQueue globalSharedMutableSingletonState             pure (x : xs)           d_ $ "Got " <> show (length spans) <> " spans"-          reportSpansRes <- try (reportSpans client spans)+          reportSpansRes <- tryAny (reportSpans client spans)           case reportSpansRes of             Right () ->               d_ $ "Reported " <> show (length spans) <> " spans"-            Left (err :: SomeException) ->+            Left err ->               d_ $ "Error while reporting spans: " <> show err         shutdown client = do           d_ "Getting the last spans before shutdown"