Revert changes to cardano-tracer (since rtview is dead)

Author: nfrisby

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/State/Historical.hs

@@ -124,8 +124,6 @@ data DataName
   | TxsProcessedNumData
   | MempoolBytesData
   | TxsInMempoolData
-  | TxsMempoolTimeoutSoftData
-  | TxsMempoolTimeoutHardData
   deriving (Eq, Ord, Read, Show)
 
 type HistoricalData = Map DataName HistoricalPoints

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/Charts.hs

@@ -320,8 +320,6 @@ dataNameToChartId dataName =
     TxsProcessedNumData       -> TxsProcessedNumChart
     MempoolBytesData          -> MempoolBytesChart
     TxsInMempoolData          -> TxsInMempoolChart
-    TxsMempoolTimeoutSoftData -> TxsMempoolTimeoutSoftChart
-    TxsMempoolTimeoutHardData -> TxsMempoolTimeoutHardChart
 
 getSavedColorForNode
   :: TracerEnv

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/HTML/Body.hs

@@ -53,11 +53,6 @@ mkPageBody tracerEnv tracerEnvRTView networkConfig dsIxs = do
   mempoolBytesChart    <- mkChart mempoolBytesTimer    MempoolBytesData    MempoolBytesChart    "Mempool size"
   txsInMempoolChart    <- mkChart txsInMempoolTimer    TxsInMempoolData    TxsInMempoolChart    "Txs in mempool"
 
-  txsMempoolTimeoutSoftTimer <- mkChartTimer tracerEnv tHistory dsIxs TxsMempoolTimeoutSoftData TxsMempoolTimeoutSoftChart
-  txsMempoolTimeoutHardTimer <- mkChartTimer tracerEnv tHistory dsIxs TxsMempoolTimeoutHardData TxsMempoolTimeoutHardChart
-  txsMempoolTimeoutSoftChart <- mkChart txsMempoolTimeoutSoftTimer    TxsMempoolTimeoutSoftData TxsMempoolTimeoutSoftChart "Txs that soft timed out in mempool"
-  txsMempoolTimeoutHardChart <- mkChart txsMempoolTimeoutHardTimer    TxsMempoolTimeoutHardData TxsMempoolTimeoutHardChart "Txs that hard timed out in mempool"
-
   -- Resources charts.
   cpuTimer          <- mkChartTimer tracerEnv rHistory dsIxs CPUData          CPUChart
   memoryTimer       <- mkChartTimer tracerEnv rHistory dsIxs MemoryData       MemoryChart
@@ -303,8 +298,6 @@ mkPageBody tracerEnv tracerEnvRTView networkConfig dsIxs = do
                           ]
                       , UI.div #. "column" #+
                           [ element txsInMempoolChart
-                          , element txsMempoolTimeoutSoftChart
-                          , element txsMempoolTimeoutHardChart
                           ]
                       ]
                   -- Resources charts.
@@ -343,11 +336,9 @@ mkPageBody tracerEnv tracerEnvRTView networkConfig dsIxs = do
 
   Chart.prepareChartsJS
 
-  Chart.newTimeChartJS TxsProcessedNumChart       ""
-  Chart.newTimeChartJS MempoolBytesChart          "MB"
-  Chart.newTimeChartJS TxsInMempoolChart          ""
-  Chart.newTimeChartJS TxsMempoolTimeoutSoftChart ""
-  Chart.newTimeChartJS TxsMempoolTimeoutHardChart ""
+  Chart.newTimeChartJS TxsProcessedNumChart ""
+  Chart.newTimeChartJS MempoolBytesChart    "MB"
+  Chart.newTimeChartJS TxsInMempoolChart    ""
 
   Chart.newTimeChartJS CPUChart          "Percent"
   Chart.newTimeChartJS MemoryChart       "MB"
@@ -379,8 +370,6 @@ mkPageBody tracerEnv tracerEnvRTView networkConfig dsIxs = do
   UI.start txsProcessedNumTimer
   UI.start mempoolBytesTimer
   UI.start txsInMempoolTimer
-  UI.start txsMempoolTimeoutSoftTimer
-  UI.start txsMempoolTimeoutHardTimer
 
   UI.start cpuTimer
   UI.start memoryTimer
@@ -411,8 +400,6 @@ mkPageBody tracerEnv tracerEnvRTView networkConfig dsIxs = do
     UI.stop txsProcessedNumTimer
     UI.stop mempoolBytesTimer
     UI.stop txsInMempoolTimer
-    UI.stop txsMempoolTimeoutSoftTimer
-    UI.stop txsMempoolTimeoutHardTimer
 
     UI.stop cpuTimer
     UI.stop memoryTimer

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/UI/Types.hs

@@ -50,8 +50,6 @@ data ChartId
   | TxsProcessedNumChart
   | MempoolBytesChart
   | TxsInMempoolChart
-  | TxsMempoolTimeoutSoftChart
-  | TxsMempoolTimeoutHardChart
   deriving (Bounded, Enum, Generic, FromJSON, ToJSON, Show)
 
 data ChartSelectId

cardano-tracer/src/Cardano/Tracer/Handlers/RTView/Update/Transactions.hs

@@ -27,10 +27,6 @@ updateTransactionsHistory nodeId (TXHistory tHistory) metricName metricValue now
     | "txsProcessedNum" `isInfixOf` metricName -> updateTxsProcessedNum
     | "mempoolBytes" `isInfixOf` metricName    -> updateMempoolBytes
     | "txsInMempool" `isInfixOf` metricName    -> updateTxsInMempool
-    | "txsMempoolTimeoutSoft" `isInfixOf` metricName
-                                               -> updateTxsMempoolTimeoutSoft
-    | "txsMempoolTimeoutHard" `isInfixOf` metricName
-                                               -> updateTxsMempoolTimeoutHard
     | otherwise                                -> return ()
  where
   updateTxsProcessedNum =
@@ -45,9 +41,3 @@ updateTransactionsHistory nodeId (TXHistory tHistory) metricName metricValue now
       Right (mempoolBytes :: Int, _) -> do
         let !mempoolInMB = fromIntegral mempoolBytes / 1024 / 1024 :: Double
         addHistoricalData tHistory nodeId now MempoolBytesData $ ValueD mempoolInMB
-
-  updateTxsMempoolTimeoutSoft =
-    readValueI metricValue $ addHistoricalData tHistory nodeId now TxsMempoolTimeoutSoftData
-
-  updateTxsMempoolTimeoutHard =
-    readValueI metricValue $ addHistoricalData tHistory nodeId now TxsMempoolTimeoutHardData