The following:

— Bump ekg-forward.
— Read the timeseries query string from request body rather than request query param.

Author: Russoul

cabal.project

@@ -81,7 +81,7 @@ if impl (ghc >= 9.12)
 source-repository-package
    type: git
    location: https://github.com/input-output-hk/ekg-forward.git
-   tag: d06caa8f53d945b9d252c9c7a719983767926140
-   --sha256: sha256-sQj2B5a9OwgLAIVoyGxSFww7aJ81Vf0DVUkYJepA4yo=
+   tag: c72c9a29045431df7484b665bed33c12ea71d0ac
+   --sha256: sha256-b87qt8RMI4gNPF8QTrRjfS5KK2/JhbxUp5ijscn2Vf8=
    subdir:
      .

cardano-tracer/cardano-tracer.cabal

@@ -122,8 +122,8 @@ library
 
                         Cardano.Tracer.Handlers.Metrics.Monitoring
                         Cardano.Tracer.Handlers.Metrics.Prometheus
-                        Cardano.Tracer.Handlers.Metrics.TimeseriesServer
                         Cardano.Tracer.Handlers.Metrics.Servers
+                        Cardano.Tracer.Handlers.Metrics.TimeseriesServer
                         Cardano.Tracer.Handlers.Metrics.Utils
 
                         Cardano.Tracer.Handlers.Notifications.Check

cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs

@@ -43,7 +43,7 @@ import           Data.Word (Word32)
 import qualified Network.Mux as Mux
 import qualified Network.Socket as Socket
 import qualified System.Metrics.Configuration as EKGF
-import           System.Metrics.Network.Acceptor (acceptEKGMetricsInit)
+import           System.Metrics.Network.Acceptor (acceptMetricsInit)
 
 import qualified Trace.Forward.Configuration.DataPoint as DPF
 import qualified Trace.Forward.Configuration.TraceObject as TF
@@ -194,7 +194,7 @@ runEKGAcceptorInit
                      respoinderCtx
                      LBS.ByteString IO () Void
 runEKGAcceptorInit tracerEnv ekgConfig errorHandler =
-  acceptEKGMetricsInit
+  acceptMetricsInit
     ekgConfig
     (prepareMetricsStores tracerEnv . micConnectionId)
     (store tracerEnv . connIdToNodeId . micConnectionId)

cardano-tracer/src/Cardano/Tracer/Acceptors/Server.hs

@@ -5,8 +5,6 @@ module Cardano.Tracer.Acceptors.Server
   ( runAcceptorsServer
   ) where
 
-import "contra-tracer" Control.Tracer (nullTracer)
-
 import           Cardano.Logging (TraceObject)
 import qualified Cardano.Logging.Types as Net
 import           Cardano.Tracer.Acceptors.Utils
@@ -25,25 +23,25 @@ import           Ouroboros.Network.Mux (MiniProtocol (..), MiniProtocolLimits (.
                    miniProtocolNum, miniProtocolRun)
 import           Ouroboros.Network.Protocol.Handshake (Handshake, HandshakeArguments (..))
 import qualified Ouroboros.Network.Protocol.Handshake as Handshake
+import qualified Ouroboros.Network.Server.Simple as Server
 import           Ouroboros.Network.Snocket (LocalAddress, LocalSocket, Snocket,
                    localAddressFromPath, localSnocket, makeLocalBearer, makeSocketBearer,
                    socketSnocket)
-import           Ouroboros.Network.Socket (ConnectionId (..),
-                   SomeResponderApplication (..))
-import qualified Ouroboros.Network.Server.Simple as Server
+import           Ouroboros.Network.Socket (ConnectionId (..), SomeResponderApplication (..))
 
 import           Codec.CBOR.Term (Term)
 import           Control.Concurrent.Async (wait)
+import           "contra-tracer" Control.Tracer (nullTracer)
 import qualified Data.ByteString.Lazy as LBS
+import           Data.Functor (void)
 import           Data.List.NonEmpty (NonEmpty ((:|)))
 import qualified Data.Text as Text
-import           Data.Functor (void)
 import           Data.Void (Void)
 import           Data.Word (Word32)
 import qualified Network.Mux as Mux
 import qualified Network.Socket as Socket
 import qualified System.Metrics.Configuration as EKGF
-import           System.Metrics.Network.Acceptor (acceptEKGMetricsResp)
+import           System.Metrics.Network.Acceptor (acceptMetricsResp)
 
 import qualified Trace.Forward.Configuration.DataPoint as DPF
 import qualified Trace.Forward.Configuration.TraceObject as TF
@@ -180,7 +178,7 @@ runEKGAcceptor
   -> (ConnectionId addr -> IO ())
   -> RunMiniProtocol 'Mux.ResponderMode initiatorCtx (ResponderContext addr) LBS.ByteString IO Void ()
 runEKGAcceptor tracerEnv ekgConfig errorHandler =
-  acceptEKGMetricsResp
+  acceptMetricsResp
     ekgConfig
     (prepareMetricsStores tracerEnv . rcConnectionId)
     (store tracerEnv . connIdToNodeId . rcConnectionId)

cardano-tracer/src/Cardano/Tracer/Handlers/Metrics/TimeseriesServer.hs

@@ -1,5 +1,4 @@
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedRecordDot #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
@@ -18,24 +17,24 @@ import           Cardano.Tracer.Timeseries
 import           Control.Monad (guard)
 import qualified Data.ByteString.Lazy as BL
 import           Data.Maybe (fromMaybe)
-import           Data.Text (Text)
+import           Data.Text.Encoding (decodeUtf8Lenient)
 import qualified Data.Text.Encoding as T
 import           Network.HTTP.Types
 import           Network.Wai
 import           Network.Wai.Handler.Warp hiding (run)
 import           Network.Wai.Handler.WarpTLS
 import           System.Time.Extra (sleep)
 
-parseTimeseriesQuery :: Request -> Maybe Text
+-- | GET timeseries/query
+parseTimeseriesQuery :: Request -> Maybe ()
 parseTimeseriesQuery request = do
   guard (request.pathInfo == ["timeseries", "query"])
-  case queryToQueryText request.queryString of
-    [("query", Just str)] -> pure str
-    _ -> Nothing
+  guard (request.requestMethod == methodPost)
 
--- | timeseries/query?query=...
 timeseriesApp :: TimeseriesHandle -> Application
-timeseriesApp handle (parseTimeseriesQuery -> Just query) send = do
+timeseriesApp handle request@(parseTimeseriesQuery -> Just ()) send = do
+  bs <- consumeRequestBodyStrict request
+  let query = decodeUtf8Lenient (BL.toStrict bs)
   now <- getTimeMs
   execute handle (fromIntegral now) query >>= \case
     Left err -> send $
@@ -58,6 +57,7 @@ runTimeseriesServer tr tracerConfig endpoint handle = do
     { ttTimeseriesEndpoint = endpoint
     }
 
+
   let
     settings :: Settings
     settings = setEndpoint endpoint defaultSettings