Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
kakkun61 committed Jan 31, 2023
1 parent 0d75a90 commit d5134dd
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 42 deletions.
16 changes: 9 additions & 7 deletions examples/yesod-subsite/src/Subsite.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TemplateHaskell #-}

-- an option for Template Haskell stage restriction
{-# OPTIONS_GHC -Wno-orphans #-}

Expand All @@ -11,15 +10,18 @@ module Subsite (
) where

import Subsite.Data (
Subsite(Subsite),
getSubHomeR,
Route (FooR, SubHomeR),
Subsite (Subsite),
getFooR,
getSubHomeR,
resourcesSubsite,
routeToPattern,
routeToRenderer,
resourcesSubsite,
Route(FooR,SubHomeR))
import Yesod.Core
( mkYesodSubDispatch, YesodSubDispatch(yesodSubDispatch ), )
)
import Yesod.Core (
YesodSubDispatch (yesodSubDispatch),
mkYesodSubDispatch,
)


instance YesodSubDispatch Subsite master where
Expand Down
22 changes: 13 additions & 9 deletions examples/yesod-subsite/src/Subsite/Data.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,26 @@
{-# LANGUAGE TypeFamilies #-}

module Subsite.Data (
Subsite(Subsite),
Subsite (Subsite),
getSubHomeR,
getFooR,
routeToPattern,
routeToRenderer,
resourcesSubsite,
Route(FooR,SubHomeR))where
Route (FooR, SubHomeR),
) where

import Data.Text (Text)
import OpenTelemetry.Instrumentation.Yesod
( mkRouteToPattern, mkRouteToRenderer )
import Yesod.Core
( mkYesodSubData,
parseRoutes,
SubHandlerFor,
RenderRoute(renderRoute) )
import OpenTelemetry.Instrumentation.Yesod (
mkRouteToPattern,
mkRouteToRenderer,
)
import Yesod.Core (
RenderRoute (renderRoute),
SubHandlerFor,
mkYesodSubData,
parseRoutes,
)
import Yesod.Core.Types (Route)


Expand Down
36 changes: 18 additions & 18 deletions examples/yesod-subsite/src/main.hs
Original file line number Diff line number Diff line change
@@ -1,43 +1,45 @@
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE InstanceSigs #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TemplateHaskell #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE InstanceSigs #-}

-- an option for Template Haskell
{-# OPTIONS_GHC -Wno-unused-top-binds #-}

import qualified Data.Map as M
import Data.Text (Text, pack)
import Network.Wai.Handler.Warp (run)
import OpenTelemetry.Instrumentation.Wai ( newOpenTelemetryWaiMiddleware' )
import OpenTelemetry.Instrumentation.Yesod
( mkRouteToPattern,
mkRouteToRenderer,
openTelemetryYesodMiddleware,
RouteRenderer(RouteRenderer),
YesodOpenTelemetryTrace(getTracerProvider) )
import OpenTelemetry.Trace
( TracerProvider,
shutdownTracerProvider,
initializeTracerProvider )
import OpenTelemetry.Instrumentation.Wai (newOpenTelemetryWaiMiddleware')
import OpenTelemetry.Instrumentation.Yesod (
RouteRenderer (RouteRenderer),
YesodOpenTelemetryTrace (getTracerProvider),
mkRouteToPattern,
mkRouteToRenderer,
openTelemetryYesodMiddleware,
)
import OpenTelemetry.Trace (
TracerProvider,
initializeTracerProvider,
shutdownTracerProvider,
)
import Subsite (Subsite (Subsite))
import qualified Subsite
import UnliftIO ( bracket )
import UnliftIO (bracket)
import Yesod.Core (
RenderRoute (renderRoute),
Yesod (yesodMiddleware,errorHandler),
Yesod (errorHandler, yesodMiddleware),
defaultYesodMiddleware,
mkYesod,
parseRoutes,
toWaiApp,
)
import Yesod.Core.Handler ( provideRep, selectRep )
import Yesod.Core.Handler (provideRep, selectRep)
import Yesod.Routes.TH.Types (ResourceTree)


-- | This is my data type. There are many like it, but this one is mine.
data Site = Site
{ tracerProvider :: TracerProvider
Expand Down Expand Up @@ -66,7 +68,6 @@ instance Yesod Site where
errorHandler err = selectRep $ provideRep $ pure $ pack $ show err



instance YesodOpenTelemetryTrace Site where
getTracerProvider = tracerProvider

Expand All @@ -75,7 +76,6 @@ getRootR :: Handler Text
getRootR = pure "GET /"



main :: IO ()
main = do
bracket
Expand Down
15 changes: 7 additions & 8 deletions instrumentation/yesod/src/OpenTelemetry/Instrumentation/Yesod.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
{-# LANGUAGE TemplateHaskell #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}

-- | This module makes it easier to use hs-opentelemetry-sdk with yesod.
module OpenTelemetry.Instrumentation.Yesod (
{-
{- | This module makes it easier to use hs-opentelemetry-sdk with yesod.
Let @Site@ be following to use in examples:
@
newtype Site = Site { siteTracerProvider :: TracerProvider }
@
-}
module OpenTelemetry.Instrumentation.Yesod (
openTelemetryYesodMiddleware,
RouteRenderer (..),
mkRouteToRenderer,
Expand Down Expand Up @@ -58,12 +58,13 @@ import Language.Haskell.TH (
varE,
varP,
wildP,
)

#if MIN_VERSION_template_haskell(2, 17, 0)
Quote (newName),
import Language.Haskell.TH (Quote (newName))
#else
newName,
import Language.Haskell.TH (newName)
#endif
)
import Lens.Micro (Lens', lens)
import Network.Wai (Request (vault), requestHeaders)
import qualified OpenTelemetry.Context as Context
Expand Down Expand Up @@ -117,8 +118,6 @@ import Yesod.Routes.TH.Types (
)




handlerEnvL :: Lens' (HandlerData child site) (RunHandlerEnv child site)
handlerEnvL = lens handlerEnv (\h e -> h {handlerEnv = e})
{-# INLINE handlerEnvL #-}
Expand Down

0 comments on commit d5134dd

Please sign in to comment.