Skip to content

Commit 545f69d

Browse files
committed
fix created, _ in gauge_histogram
1 parent 979c011 commit 545f69d

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/Simplex/Messaging/Server/Prometheus.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -442,22 +442,22 @@ prometheusMetrics sm rtm ts =
442442
\simplex_smp_delivered_clients_total " <> mshow (subClientsCount deliveredSubs) <> "\n# delivered.subClientsCount\n\
443443
\\n\
444444
\# HELP simplex_smp_delivery_ack_time Times to confirm message delivery, including pending confirmation\n\
445-
\# TYPE simplex_smp_delivery_ack_time gaugehistogram\n\
445+
\# TYPE simplex_smp_delivery_ack_time gauge_histogram\n\
446446
\simplex_smp_delivery_ack_time_gsum " <> mshow (sumTime _msgRecvAckTimes + sumTime deliveredTimes) <> "\n# delivered.sumTime\n\
447447
\simplex_smp_delivery_ack_time_gcount " <> mshow (_msgRecv + _msgRecvGet + subsCount deliveredSubs) <> "\n# delivered.subsCount\n"
448448
<> showTimeBuckets "simplex_smp_delivery_ack_time" (IM.unionWith (+) (timeBuckets _msgRecvAckTimes) (timeBuckets deliveredTimes))
449449
<> showTimeBucket "simplex_smp_delivery_ack_time" "+Inf" (_msgRecv + _msgRecvGet + subsCount deliveredSubs)
450450
<> "\n\
451451
\# HELP simplex_smp_delivery_ack_confirmed_time Times to confirm message delivery, only confirmed deliveries\n\
452452
\# TYPE simplex_smp_delivery_ack_confirmed_time histogram\n\
453-
\simplex_smp_delivery_ack_confirmed_time_created " <> mshow (createdAt _msgRecvAckTimes) <> "\n# delivered.createdAt\n\
453+
\simplex_smp_delivery_ack_confirmed_time_created " <> tsEpoch (createdAt _msgRecvAckTimes) <> " " <> tsEpoch ts <> "\n# delivered.createdAt\n\
454454
\simplex_smp_delivery_ack_confirmed_time_sum " <> mshow (sumTime _msgRecvAckTimes) <> "\n# delivered.sumTime\n\
455455
\simplex_smp_delivery_ack_confirmed_time_count " <> mshow (_msgRecv + _msgRecvGet) <> "\n# delivered.subsCount\n"
456456
<> showTimeBuckets "simplex_smp_delivery_ack_confirmed_time" (timeBuckets _msgRecvAckTimes)
457457
<> showTimeBucket "simplex_smp_delivery_ack_confirmed_time" "+Inf" (_msgRecv + _msgRecvGet)
458458
<> "\n\
459459
\# HELP simplex_smp_delivery_ack_pending_time Times to confirm message delivery, only pending confirmations\n\
460-
\# TYPE simplex_smp_delivery_ack_pending_time gaugehistogram\n\
460+
\# TYPE simplex_smp_delivery_ack_pending_time gauge_histogram\n\
461461
\simplex_smp_delivery_ack_pending_time_gsum " <> mshow (sumTime deliveredTimes) <> "\n# delivered.sumTime\n\
462462
\simplex_smp_delivery_ack_pending_time_gcount " <> mshow (subsCount deliveredSubs) <> "\n# delivered.subsCount\n"
463463
<> showTimeBuckets "simplex_smp_delivery_ack_pending_time" (timeBuckets deliveredTimes)
@@ -527,9 +527,9 @@ prometheusMetrics sm rtm ts =
527527
<> "# TYPE " <> metric <> " gauge\n"
528528
<> T.concat (map (\(port, ss) -> metric <> "{port=\"" <> T.pack port <> "\"} " <> mshow (sel ss) <> "\n") socketStats)
529529
<> "\n"
530-
mstr a = a <> " " <> tsEpoch
530+
mstr a = a <> " " <> tsEpoch ts
531531
mshow :: Show a => a -> Text
532532
mshow = mstr . tshow
533-
tsEpoch = tshow @Int64 $ floor @Double $ realToFrac (ts `diffUTCTime` epoch) * 1000
533+
tsEpoch t = tshow @Int64 $ floor @Double $ realToFrac (t `diffUTCTime` epoch) * 1000
534534
epoch = UTCTime systemEpochDay 0
535535
{-# FOURMOLU_ENABLE\n#-}

0 commit comments

Comments
 (0)