-
Notifications
You must be signed in to change notification settings - Fork 48
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
jarnura
wants to merge
1
commit into
fimad:master
Choose a base branch
from
jarnura:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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))]] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
|
@@ -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 | ||
|
@@ -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 | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.