yabeda-prometheus 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5e54ecad52d7b0afa0763c586097de00a8dda93c125116fb879fad20d7ce40c
-  data.tar.gz: 1f8dce2a20922f7a175191660ff5de7719893a6b741dffd8d06064867ec07cfe
+  metadata.gz: 59af7a9f1de7593f49c9d58f1f9517c15182a7000d86d1076fa06297371013e2
+  data.tar.gz: 470bb2054c3f3281754ba07c7fd3217c83213c139150c27dd52c0d5ee8577b02
 SHA512:
-  metadata.gz: b800c70319409c9d9afd4f88599c8e881f146825ccd5ed8ebd232efc16c5df78760c9adbe1b291747c6990d13f7c7703893344d0003954f5c902f119d779b672
-  data.tar.gz: c5c5f923c9a97d5633487998850dae2e1bac9a1e34ed3f0a0d679c5d414a14452fc33c910f853b09f4376e7dcf714fa58efa09cdb04cca1f062404e5f3f8dd65
+  metadata.gz: 1fef847b5af1e283109303d04b3b9df56b8439a120dcad11ab7934dc5102147cd5fca35ae2719e05dd5d06c6ff06b752bcd566a3e13dd6bf26e64b0dec83e37b
+  data.tar.gz: 25e463b8f562504d21e856c99192ec516aec2dacf6faa75b20266d78421252a09ab57e57135f529189add2a8c78fafa9a7803b91949c0a3488a00030f92a7bfb

data/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.5.0 - 2020-01-29
+
+### Added
+
+ - Support for metric aggregation when prometheus-client's Direct File Store is used. @Envek
+
+   See https://github.com/prometheus/client_ruby#aggregation-settings-for-multi-process-stores for details.
+
 ## 0.2.0 - 2020-01-14
 
 ### Changed

data/README.md

@@ -73,6 +73,19 @@ Prometheus::Client.config.data_store = Prometheus::Client::DataStores::DirectFil
 
 See more information at [prometheus-client README](https://github.com/prometheus/client_ruby#data-stores).
 
+### Aggregation settings
+
+You can specify aggregation policy in gauges declaration:
+
+```ruby
+group :some do
+  gauge :tasks do
+    comment "Number of test tasks"
+    aggregation :max
+  end
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/yabeda/prometheus/adapter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "prometheus/client"
+require 'prometheus/client/data_stores/direct_file_store'
+require 'prometheus/client/data_stores/single_threaded'
 require "yabeda/base_adapter"
 
 module Yabeda
@@ -23,7 +25,12 @@ module Yabeda
 
     def register_counter!(metric)
       validate_metric!(metric)
-      registry.counter(build_name(metric), docstring: metric.comment, labels: Array(metric.tags))
+      registry.counter(
+        build_name(metric),
+        docstring: metric.comment,
+        labels: Array(metric.tags),
+        store_settings: store_settings(metric),
+      )
     end
 
     def perform_counter_increment!(metric, tags, value)
@@ -34,7 +41,12 @@ module Yabeda
 
     def register_gauge!(metric)
       validate_metric!(metric)
-      registry.gauge(build_name(metric), docstring: metric.comment, labels: Array(metric.tags))
+      registry.gauge(
+        build_name(metric),
+        docstring: metric.comment,
+        labels: Array(metric.tags),
+        store_settings: store_settings(metric),
+      )
     end
 
     def perform_gauge_set!(metric, tags, value)
@@ -46,7 +58,13 @@ module Yabeda
     def register_histogram!(metric)
       validate_metric!(metric)
       buckets = metric.buckets || ::Prometheus::Client::Histogram::DEFAULT_BUCKETS
-      registry.histogram(build_name(metric), docstring: metric.comment, buckets: buckets, labels: Array(metric.tags))
+      registry.histogram(
+        build_name(metric),
+        docstring: metric.comment,
+        buckets: buckets,
+        labels: Array(metric.tags),
+        store_settings: store_settings(metric),
+      )
     end
 
     def perform_histogram_measure!(metric, tags, value)
@@ -65,6 +83,19 @@ module Yabeda
       raise ArgumentError, 'Prometheus require metrics to have comments'
     end
 
+    private
+
+    # @param metric [Yabeda::Metric]
+    # @return [Hash]
+    def store_settings(metric)
+      case ::Prometheus::Client.config.data_store
+      when ::Prometheus::Client::DataStores::Synchronized, ::Prometheus::Client::DataStores::SingleThreaded
+        {} # Default synchronized store doesn't allow to pass any options
+      when ::Prometheus::Client::DataStores::DirectFileStore, ::Object # Anything else
+        { aggregation: metric.aggregation }.compact
+      end
+    end
+
     Yabeda.register_adapter(:prometheus, new)
   end
 end

data/lib/yabeda/prometheus/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   module Prometheus
-    VERSION = "0.2.0"
+    VERSION = "0.5.0"
   end
 end

data/yabeda-prometheus.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.3"
 
   spec.add_dependency "prometheus-client", "~> 1.0"
-  spec.add_dependency "yabeda", "~> 0.2"
+  spec.add_dependency "yabeda", "~> 0.5"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 12.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement