From 2ae43c4a48207d9c8780b2b16be9f70cc6f0cd13 Mon Sep 17 00:00:00 2001 From: Phil Freeman Date: Tue, 8 Sep 2020 10:14:10 -0700 Subject: [PATCH] Fix error after merge --- server/src-lib/Hasura/Eventing/EventTrigger.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src-lib/Hasura/Eventing/EventTrigger.hs b/server/src-lib/Hasura/Eventing/EventTrigger.hs index 0770eb993db..dc66d221fb2 100644 --- a/server/src-lib/Hasura/Eventing/EventTrigger.hs +++ b/server/src-lib/Hasura/Eventing/EventTrigger.hs @@ -248,7 +248,8 @@ processEventQueue logger logenv httpMgr pool getSchemaCache eeCtx@EventEngineCtx cache <- liftIO getSchemaCache tracingCtx <- liftIO (Tracing.extractEventContext (eEvent e)) - let runTraceT = maybe + let spanName eti = "Event trigger: " <> unNonEmptyText (unTriggerName (etiName eti)) + runTraceT = maybe Tracing.runTraceT Tracing.runTraceTInContext tracingCtx @@ -264,7 +265,7 @@ processEventQueue logger logenv httpMgr pool getSchemaCache eeCtx@EventEngineCtx -- For such an event, we unlock the event and retry after a minute setRetry e (addUTCTime 60 currentTime) >>= flip onLeft logQErr - Right eti -> do + Right eti -> runTraceT (spanName eti) do let webhook = T.unpack $ wciCachedValue $ etiWebhookInfo eti retryConf = etiRetryConf eti timeoutSeconds = fromMaybe defaultTimeoutSeconds (rcTimeoutSec retryConf)