yabeda-prometheus 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1922a6edd3de4513c03bb3405280060973cfe6c0004b56be0bf0c923934eb82f
-  data.tar.gz: acc3a06038a5cf9f972406b0edd466ae04f49643d2ad784d0c9e2565919a7308
+  metadata.gz: cf7f044078d39963972005e5dab30c8fa8d908ca9b1d667ce60fc36295e7fb91
+  data.tar.gz: bd89b7fa736a501e417345951c642d601af60dd537a8c03a80a11678990e61d1
 SHA512:
-  metadata.gz: ed6e18d43df3f06ad848c6b6965e7093a71ba36d4c34e3e3bfb93f43eda220bf738436604f0db3ae63e026e53bd6eccfe6ec9f60d667a4cb0687f7ac2a9ce5bb
-  data.tar.gz: 2b77cc35bc3f5e72033aa624371630d6221ba54dc5d3ea5c222db62a12bddca589c5c5bf7bc5925e76de0d5d38083fe5ae7c754bcb913492a2af34b8c9970753
+  metadata.gz: 2caa793706298308666cd8355eb8a04d7b56fd810fbd6ca57705246845e1cc229ce664fd70c284147fe998cf1e464580c7743af8e7aec28d569ec1f9a42c8fe8
+  data.tar.gz: 8fcf2724292390d4115c2872c4bc1de2fc2f6d5435a9fb6a26eec06444b6b3a4428cee18fbf8cb7b4af14a61e175fc0aea9e46f9639acfc268259a1396496526

data/CHANGELOG.md

@@ -5,6 +5,12 @@ 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.1.5 - 2019-10-15
+
+### Fixed
+
+ - Issue [#7](https://github.com/yabeda-rb/yabeda-prometheus/issues/7) with counters and gauges when using prometheus-client-mmap gem. Fixed in [#8](https://github.com/yabeda-rb/yabeda-prometheus/pull/8) by [@alexander37137]
+
 
 ## 0.1.4 - 2018-11-06
 
@@ -57,3 +63,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## 0.1.0 - 2018-10-03
 
  - Initial release of evil-metrics-prometheus gem. @Envek
+
+[@alexander37137]: https://github.com/alexander37137 "Alexander Andreev"

data/lib/yabeda/prometheus/adapter.rb

@@ -3,9 +3,6 @@
 require "prometheus/client"
 require "yabeda/base_adapter"
 
-require_relative "./counter_wrapper"
-require_relative "./gauge_wrapper"
-
 module Yabeda
   class Prometheus::Adapter < BaseAdapter
     def registry
@@ -14,20 +11,20 @@ module Yabeda
 
     def register_counter!(metric)
       validate_metric!(metric)
-      registry.register(Prometheus::CounterWrapper.new(metric))
+      registry.counter(build_name(metric), metric.comment)
     end
 
-    def perform_counter_increment!(*)
-      # Do nothing. Prometheus will read current value from evil metric
+    def perform_counter_increment!(metric, tags, value)
+      registry.get(build_name(metric)).increment(tags, value)
     end
 
     def register_gauge!(metric)
       validate_metric!(metric)
-      registry.register(Prometheus::GaugeWrapper.new(metric))
+      registry.gauge(build_name(metric), metric.comment)
     end
 
-    def perform_gauge_set!(*)
-      # Do nothing. Prometheus will read current value from evil metric
+    def perform_gauge_set!(metric, tags, value)
+      registry.get(build_name(metric)).set(tags, value)
     end
 
     def register_histogram!(metric)
@@ -41,13 +38,13 @@ module Yabeda
     end
 
     def build_name(metric)
-      [metric.group, metric.name, metric.unit].compact.join("_").to_sym
+      [metric.group, metric.name, metric.unit].compact.join('_').to_sym
     end
 
     def validate_metric!(metric)
       return if metric.comment
 
-      raise ArgumentError, "Prometheus require metrics to have comments"
+      raise ArgumentError, 'Prometheus require metrics to have comments'
     end
 
     Yabeda.register_adapter(:prometheus, new)

data/lib/yabeda/prometheus/version.rb

@@ -2,6 +2,6 @@
 
 module Yabeda
   module Prometheus
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yabeda-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yabeda
@@ -86,10 +86,7 @@ files:
 - bin/setup
 - lib/yabeda/prometheus.rb
 - lib/yabeda/prometheus/adapter.rb
-- lib/yabeda/prometheus/counter_wrapper.rb
 - lib/yabeda/prometheus/exporter.rb
-- lib/yabeda/prometheus/gauge_wrapper.rb
-- lib/yabeda/prometheus/metric_wrapper.rb
 - lib/yabeda/prometheus/version.rb
 - yabeda-prometheus.gemspec
 homepage: https://github.com/yabeda-rb/yabeda-prometheus
@@ -117,8 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Extensible Prometheus exporter for your application

data/lib/yabeda/prometheus/counter_wrapper.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "./metric_wrapper"
-
-module Yabeda
-  class Prometheus::CounterWrapper < Prometheus::MetricWrapper
-    def type
-      :counter
-    end
-
-    def increment(labels = {}, by = 1)
-      metric.increment(labels, by: by)
-    end
-  end
-end

data/lib/yabeda/prometheus/gauge_wrapper.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "./metric_wrapper"
-
-module Yabeda
-  class Prometheus::GaugeWrapper < Prometheus::MetricWrapper
-    def type
-      :gauge
-    end
-
-    def set(labels, value)
-      unless value.is_a?(Numeric)
-        raise ArgumentError, 'value must be a number'
-      end
-
-      metric.set(labels, value)
-    end
-  end
-end

data/lib/yabeda/prometheus/metric_wrapper.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-require "prometheus/client/metric"
-
-module Yabeda
-  class Prometheus::MetricWrapper < ::Prometheus::Client::Metric
-    attr_reader :metric
-
-    def initialize(metric, base_labels = {})
-      @metric = metric
-
-      @validator = ::Prometheus::Client::LabelSetValidator.new
-      @base_labels = base_labels
-
-      validate_name(self.name)
-      validate_docstring(self.docstring)
-      @validator.valid?(base_labels)
-    end
-
-    def name
-      @name ||=
-        [metric.group, metric.name, metric.unit].compact.join("_").to_sym
-    end
-
-    def docstring
-      metric.comment
-    end
-
-    def get(labels = {})
-      @validator.valid?(labels)
-
-      metric.get(labels)
-    end
-
-    def values
-      metric.values
-    end
-  end
-end