Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added new label instance which can handle n numbers of keys and values #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions prometheus-client/src/Prometheus/Label.hs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ type Label0 = ()
instance Label () where
labelPairs () () = []

instance Label [Text] where
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The downside to using a list is that you don't get compile time checking that the number of values match the number of labels.

labelPairs key value = Prelude.zip key value

type Label1 = Text

instance Label Text where
Expand Down
26 changes: 26 additions & 0 deletions prometheus-client/src/Prometheus/Registry.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ import Control.Applicative ((<$>))
import Control.Monad.IO.Class
import System.IO.Unsafe (unsafePerformIO)
import qualified Control.Concurrent.STM as STM
import qualified Data.Map as Map
import qualified Data.Map.Internal as Map
import Prometheus.Metric.Vector
import Prometheus.Label


-- $setup
Expand All @@ -23,11 +27,15 @@ import qualified Control.Concurrent.STM as STM
-- | A 'Registry' is a list of all registered metrics, currently represented by
-- their sampling functions.
type Registry = [IO [SampleGroup]]
type VectorRegistry l m = [IO [(l,(Vector l m))]]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does the vector registry provide that the standard registry does not?


{-# NOINLINE globalRegistry #-}
globalRegistry :: STM.TVar Registry
globalRegistry = unsafePerformIO $ STM.newTVarIO []

vectorRegistry :: STM.TVar (VectorRegistry l m)
vectorRegistry = unsafePerformIO $ STM.newTVarIO []

-- | Registers a metric with the global metric registry.
register :: MonadIO m => Metric s -> m s
register (Metric mk) = liftIO $ do
Expand All @@ -36,6 +44,18 @@ register (Metric mk) = liftIO $ do
liftIO $ STM.atomically $ STM.modifyTVar' globalRegistry addToRegistry
return metric

registerVector :: (MonadIO m,Label l) => l -> Metric mm -> m (Vector l mm)
registerVector l metric = do
cv <- collectVectors
let flag = Map.lookup l cv
case flag of
Nothing -> do
vec <- register $ vector l $ metric
let addToVecR = (pure [(l,vec)] :)
liftIO $ STM.atomically $ STM.modifyTVar' vectorRegistry addToVecR
pure vec
Just cv -> pure cv

-- | Registers a metric with the global metric registry.
registerIO :: MonadIO m => m (Metric s) -> m s
registerIO metricGen = metricGen >>= register
Expand Down Expand Up @@ -76,3 +96,9 @@ collectMetrics :: MonadIO m => m [SampleGroup]
collectMetrics = liftIO $ do
registry <- STM.atomically $ STM.readTVar globalRegistry
concat <$> sequence registry

collectVectors :: (MonadIO m, Label l) => m (Map.Map l (Vector l mm))
collectVectors = liftIO $ do
registry <- STM.atomically $ STM.readTVar vectorRegistry
(Prelude.foldl (\acc v -> Map.insert (fst v) (snd v) acc) Map.empty) <$> concat <$> sequence registry