Skip to content

Commit 1a97462

Browse files
committed
fix 8.6 build
1 parent 41ada2a commit 1a97462

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

Diff for: ghcide/src/Development/IDE/Core/Tracing.hs

+8-6
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ import OpenTelemetry.Eventlog (SpanInFlight (..), addEvent,
5858
mkValueObserver, observe,
5959
setTag, withSpan, withSpan_)
6060

61+
#if MIN_VERSION_ghc(8,8,0)
62+
otTracedProvider :: MonadUnliftIO m => PluginId -> ByteString -> m a -> m a
63+
otTracedGarbageCollection :: (MonadMask f, MonadIO f, Show a) => ByteString -> f [a] -> f [a]
64+
#else
65+
otTracedProvider :: MonadUnliftIO m => PluginId -> String -> m a -> m a
66+
otTracedGarbageCollection :: (MonadMask f, MonadIO f, Show a) => String -> f [a] -> f [a]
67+
#endif
68+
6169
-- | Trace a handler using OpenTelemetry. Adds various useful info into tags in the OpenTelemetry span.
6270
otTracedHandler
6371
:: MonadUnliftIO m
@@ -109,7 +117,6 @@ otTracedAction key file mode result act
109117
(const act)
110118
| otherwise = act
111119

112-
otTracedGarbageCollection :: (MonadMask f, MonadIO f, Show a) => ByteString -> f [a] -> f [a]
113120
otTracedGarbageCollection label act
114121
| userTracingEnabled = fst <$>
115122
generalBracket
@@ -123,11 +130,6 @@ otTracedGarbageCollection label act
123130
(const act)
124131
| otherwise = act
125132

126-
#if MIN_VERSION_ghc(8,8,0)
127-
otTracedProvider :: MonadUnliftIO m => PluginId -> ByteString -> m a -> m a
128-
#else
129-
otTracedProvider :: MonadUnliftIO m => PluginId -> String -> m a -> m a
130-
#endif
131133
otTracedProvider (PluginId pluginName) provider act
132134
| userTracingEnabled = do
133135
runInIO <- askRunInIO

0 commit comments

Comments
 (0)