evil-metrics-prometheus 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 509ebad673a4851d59c6bde88eb28d2860e428a6c30c813fd70a5dc66aa9b0bb
-  data.tar.gz: 45a02c6c00f18ec88111a81045a305a38f4a747db1157e6f6a689f21091ccf11
+  metadata.gz: aa32c629dfbb01f9e0239b1fea8a17a05a568791d13283a38cab13442a60e05a
+  data.tar.gz: e7b189a0e79b27bdcf3d758fd3a30b62216776a40a2eecb6dcd589ba69b0bf23
 SHA512:
-  metadata.gz: 844dc54dc3d846964487612ce86d12d7df53fcc07b9c2ab812369df4a0e1c739861a3f0e793769edbd974fcc4f342e08695bdaabd569241ddc7cce6f2f7b6335
-  data.tar.gz: 34d17c7a862223e6bfc029535297ef3199042830d426c04ac8efb30ade055784f1e7f74b0a07be1e2e6cf801059a4c10e6aa007a17e6ac72ede397667a7862da
+  metadata.gz: be379ea0f300113c3757ddb9d8169237e614399e93cfe66ace6f7e2b076e1c23a04cdd4d301f4abf395d9db158c893d37ec5a100ad27a0fdcbb315161dd6bc94
+  data.tar.gz: 06ff68b060f460b4379299bb914858ec37c17b39b0c431da0a114e6b22017f061a663408c1ff7ccfb933aa97811d24f2283cc3706ab769a4d4d3df86fa663c87

data/evil-metrics-prometheus.gemspec

@@ -6,7 +6,7 @@ require "evil/metrics/prometheus/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "evil-metrics-prometheus"
-  spec.version       = "0.1.0"
+  spec.version       = Evil::Metrics::Prometheus::VERSION
   spec.authors       = ["Andrey Novikov"]
   spec.email         = ["envek@envek.name"]
 

data/lib/evil/metrics/prometheus/adapter.rb

@@ -3,6 +3,9 @@
 require "prometheus/client"
 require "evil/metrics/base_adapter"
 
+require_relative "./counter_wrapper"
+require_relative "./gauge_wrapper"
+
 module Evil
   module Metrics
     class Prometheus::Adapter < BaseAdapter
@@ -12,20 +15,20 @@ module Evil
 
       def register_counter!(metric)
         validate_metric!(metric)
-        registry.counter(build_name(metric), metric.comment)
+        registry.register(Prometheus::CounterWrapper.new(metric))
       end
 
-      def perform_counter_increment!(metric, tags, increment)
-        registry.get(build_name(metric)).increment(tags, increment)
+      def perform_counter_increment!(*)
+        # Do nothing. Prometheus will read current value from evil metric
       end
 
       def register_gauge!(metric)
         validate_metric!(metric)
-        registry.gauge(build_name(metric), metric.comment)
+        registry.register(Prometheus::GaugeWrapper.new(metric))
       end
 
-      def perform_gauge_set!(metric, tags, increment)
-        registry.get(build_name(metric)).set(tags, increment)
+      def perform_gauge_set!(*)
+        # Do nothing. Prometheus will read current value from evil metric
       end
 
       def register_histogram!(metric)

data/lib/evil/metrics/prometheus/counter_wrapper.rb

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

data/lib/evil/metrics/prometheus/gauge_wrapper.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative "./metric_wrapper"
+
+module Evil
+  module Metrics
+    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
+end

data/lib/evil/metrics/prometheus/metric_wrapper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require "prometheus/client/metric"
+
+module Evil
+  module Metrics
+    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
+end

data/lib/evil/metrics/prometheus/version.rb

@@ -3,7 +3,7 @@
 module Evil
   module Metrics
     module Prometheus
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evil-metrics-prometheus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Andrey Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evil-metrics
@@ -100,7 +100,10 @@ files:
 - evil-metrics-prometheus.gemspec
 - lib/evil/metrics/prometheus.rb
 - lib/evil/metrics/prometheus/adapter.rb
+- lib/evil/metrics/prometheus/counter_wrapper.rb
 - lib/evil/metrics/prometheus/exporter.rb
+- lib/evil/metrics/prometheus/gauge_wrapper.rb
+- lib/evil/metrics/prometheus/metric_wrapper.rb
 - lib/evil/metrics/prometheus/version.rb
 homepage: https://github.com/evil-metrics/evil-metrics-prometheus
 licenses: