prometheus_exporter 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90eab18dd3dce6c0862b9bc14bf42f905a2a06516dfb023a4a081ce1ecb9a5d3
-  data.tar.gz: 22fb28a7ab4f7dacfe28c1267b4158783d9c44de8bd5a798df122a6112b51090
+  metadata.gz: e93d3054e02dcc5bc4dc87df3be0b87ce3715850d4d116465f31ee525bb9c9f6
+  data.tar.gz: 681a91ab3490d12b095b5bde5a9eb303202e5c6b688cf57afe38752e49b2d9d4
 SHA512:
-  metadata.gz: 4adae339d6e3ddb430f1615aa6077a83fd87cc90aaed6eb2fd3c2e4392834c3864dcac22929825f46c55a8e45e3bf7b5228b852a09731925a9a03223de0cc04d
-  data.tar.gz: 53a1f43c7ebc8e5f7891d1784f5a41381c785beda2e0172bbc25202ee5a703c60bbab7c00d85f03c6bbe39f6dac4ef722a6959bae678b5e21da7325dc1d4f5fe
+  metadata.gz: b4b875a1d7799aab1ec0c6ec69570a070a730774cd58cd7a61e54d19bf4f327ddf0f47e6fa10e33084b86fbdcbd407a0e0e715bb190f9bf412b59ce17b9963dd
+  data.tar.gz: 1face6bafbf0da750d2b88f3d5ed010cb136fad3da776928f7a327db20cc81fd972208f7cbfeb298dd72492489a8838c76429cbe448b87d478dfff79292c2f00

data/.gitignore

@@ -7,3 +7,5 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
+
+.rubocop-https---raw-githubusercontent-com-discourse-discourse-master--rubocop-yml

data/.rubocop.yml

@@ -1,113 +1 @@
-AllCops:
-  TargetRubyVersion: 2.4
-  DisabledByDefault: true
-  Exclude:
-    - 'db/schema.rb'
-    - 'bundle/**/*'
-    - 'vendor/**/*'
-    - 'node_modules/**/*'
-    - 'public/**/*'
-
-# Prefer &&/|| over and/or.
-Style/AndOr:
-  Enabled: true
-
-# Do not use braces for hash literals when they are the last argument of a
-# method call.
-Style/BracesAroundHashParameters:
-  Enabled: true
-
-# Align `when` with `case`.
-Layout/CaseIndentation:
-  Enabled: true
-
-# Align comments with method definitions.
-Layout/CommentIndentation:
-  Enabled: true
-
-# No extra empty lines.
-Layout/EmptyLines:
-  Enabled: true
-
-# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
-Style/HashSyntax:
-  Enabled: true
-
-# Two spaces, no tabs (for indentation).
-Layout/IndentationWidth:
-  Enabled: true
-
-Layout/SpaceAfterColon:
-  Enabled: true
-
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundKeyword:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeFirstArg:
-    Enabled: true
-
-# Defining a method with parameters needs parentheses.
-Style/MethodDefParentheses:
-  Enabled: true
-
-# Use `foo {}` not `foo{}`.
-Layout/SpaceBeforeBlockBraces:
-  Enabled: true
-
-# Use `foo { bar }` not `foo {bar}`.
-Layout/SpaceInsideBlockBraces:
-  Enabled: true
-
-# Use `{ a: 1 }` not `{a:1}`.
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: true
-
-Layout/SpaceInsideParens:
-  Enabled: true
-
-# Detect hard tabs, no hard tabs.
-Layout/Tab:
-  Enabled: true
-
-# Blank lines should not have any spaces.
-Layout/TrailingBlankLines:
-  Enabled: true
-
-# No trailing whitespace.
-Layout/TrailingWhitespace:
-  Enabled: true
-
-Lint/Debugger:
-  Enabled: true
-
-Lint/BlockAlignment:
-  Enabled: true
-
-# Align `end` with the matching keyword or starting expression except for
-# assignments, where it should be aligned with the LHS.
-Lint/EndAlignment:
-  Enabled: true
-  EnforcedStyleAlignWith: variable
-
-# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
-Lint/RequireParentheses:
-  Enabled: true
-
-Layout/MultilineMethodCallIndentation:
-  Enabled: true
-  EnforcedStyle: indented
-
-Layout/AlignHash:
-  Enabled: true
-
-Bundler/OrderedGems:
-  Enabled: false
+inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.4.3 - 11-02-2019
+
+- Feature: Add alias for Gauge #observe called #set, this makes it a bit easier to migrate from prom
+- Feature: Add increment and decrement to Counter
+
 0.4.2 - 30-11-2018
 
 - Fix/Feature: setting a Gauge to nil will remove Gauge (setting to non numeric will raise)

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in prometheus_exporter.gemspec
 gemspec

data/Guardfile

@@ -4,4 +4,3 @@ guard :minitest do
   watch(%r{^lib/prometheus_exporter/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
   watch(%r{^test/test_helper\.rb$})      { 'test' }
 end
-

data/Rakefile

@@ -7,4 +7,4 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList["test/**/*_test.rb"]
 end
 
-task :default => :test
+task default: :test

data/lib/prometheus_exporter/instrumentation/sidekiq.rb

@@ -15,11 +15,8 @@ module PrometheusExporter::Instrumentation
       result
     ensure
       duration = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC) - start
-      class_name = if worker.class.to_s == 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper'
-                     msg['wrapped']
-                   else
-                     worker.class.to_s
-                   end
+      class_name = worker.class.to_s == 'ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper' ?
+                     msg['wrapped'] : worker.class.to_s
 
       @client.send_json(
         type: "sidekiq",

data/lib/prometheus_exporter/metric/counter.rb

@@ -23,5 +23,15 @@ module PrometheusExporter::Metric
       @data[labels] ||= 0
       @data[labels] += increment
     end
+
+    def increment(labels = {}, value = 1)
+      @data[labels] ||= 0
+      @data[labels] += value
+    end
+
+    def decrement(labels = {}, value = 1)
+      @data[labels] ||= 0
+      @data[labels] -= value
+    end
   end
 end

data/lib/prometheus_exporter/metric/gauge.rb

@@ -30,6 +30,8 @@ module PrometheusExporter::Metric
       end
     end
 
+    alias_method :set, :observe
+
     def increment(labels = {}, value = 1)
       @data[labels] ||= 0
       @data[labels] += value

data/lib/prometheus_exporter/metric/histogram.rb

@@ -52,7 +52,7 @@ module PrometheusExporter::Metric
       @counts[labels] ||= 0
       buckets = @observations[labels]
       if buckets.nil?
-        buckets = @buckets.map{|b| [b, 0]}.to_h
+        buckets = @buckets.map { |b| [b, 0] }.to_h
         @observations[labels] = buckets
       end
       buckets
@@ -66,7 +66,7 @@ module PrometheusExporter::Metric
     end
 
     def with_bucket(labels, bucket)
-      labels.merge({"le" => bucket})
+      labels.merge("le" => bucket)
     end
 
   end

data/lib/prometheus_exporter/middleware.rb

@@ -85,6 +85,6 @@ class PrometheusExporter::Middleware
   # this method takes care to convert both into a proper second + fractions timestamp
   def convert_header_to_ms(str)
     str = str.gsub(/t=|\./, '')
-    "#{str[0,10]}.#{str[10,13]}".to_f
+    "#{str[0, 10]}.#{str[10, 13]}".to_f
   end
 end

data/lib/prometheus_exporter/server/collector.rb

@@ -48,13 +48,19 @@ module PrometheusExporter::Server
           if !metric
             metric = register_metric_unsafe(obj)
           end
+
+          keys = obj["keys"] || {}
+          if obj["custom_labels"]
+            keys = obj["custom_labels"].merge(keys)
+          end
+
           case obj["prometheus_exporter_action"]
           when 'increment'
-            metric.increment(obj["keys"], obj["value"])
+            metric.increment(keys, obj["value"])
           when 'decrement'
-            metric.decrement(obj["keys"], obj["value"])
+            metric.decrement(keys, obj["value"])
           else
-            metric.observe(obj["value"], obj["keys"])
+            metric.observe(obj["value"], keys)
           end
         end
       end

data/lib/prometheus_exporter/server/web_server.rb

@@ -47,7 +47,7 @@ module PrometheusExporter::Server
       @timeout = timeout
 
       @server.mount_proc '/' do |req, res|
-        res['ContentType'] = 'text/plain; charset=utf-8'
+        res['Content-Type'] = 'text/plain; charset=utf-8'
         if req.path == '/metrics'
           res.status = 200
           if req.header["accept-encoding"].to_s.include?("gzip")

data/lib/prometheus_exporter/version.rb

@@ -1,3 +1,3 @@
 module PrometheusExporter
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prometheus_exporter
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -208,8 +208,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.1
 signing_key: 
 specification_version: 4
 summary: Prometheus Exporter