sidekiq-influxdb 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 692630f32205c66fd6e128130b5287f683e5d4da
-  data.tar.gz: 413d701195b97631f683d6c1706fca6436a49218
+  metadata.gz: 94d367f4606ba44ae8492818c3fc276c2de1e514
+  data.tar.gz: 5da84f0c6189a1827b8c8ad8a62348eccb1b6dcb
 SHA512:
-  metadata.gz: a8097a92929fc14d7eaecbb93d3695cbe2a0b39ad20c710167e13b14a2868248f6eddabaee7b5efd2c4b449096b3a3574bf9d17849911d28d3eec964220b9615
-  data.tar.gz: 479455da95330526bf9116cf942502bd02dd8c6a6e54309fe393c4f7aefbdfd41c525edc7bc9460180332f06e9c4b4734c216b3b28bc48f959beffcfdd3913c7
+  metadata.gz: 0e205ff73a6f9d598fb9d3bd86dca34af5087256dbae23f0ff40b861e51a4b11f7db0b10398ea5ce81fb2fb82dc0c77b30e1ecb1a5402877aad1b6cff5b78e6f
+  data.tar.gz: 84236d2ee7522b8b3f67e4c587d80c53e31ef6fb496186b26ca551607d9b8a6e87a3d441f5c08954a765ec7cf704036d768a5230ecb05804fbadeb272dcc5833

data/README.md

@@ -27,7 +27,7 @@ require "sidekiq/influxdb/server_middleware"
 
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
-    chain.add Sidekiq::InfluxDB::ServerMiddleware,
+    chain.add Sidekiq::Middleware::Server::InfluxDB,
                 influxdb_client: InfluxDB::Client.new(options), # REQUIRED
                 series_name: 'sidekiq_jobs',                    # optional, default shown
                 retention_policy: nil,                          # optional, default nil

data/lib/sidekiq/influxdb.rb

@@ -1,2 +1,2 @@
 require "sidekiq/influxdb/version"
-require "sidekiq/influxdb/server_middleware"
+require "sidekiq/middleware/server/influxdb"

data/lib/sidekiq/influxdb/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module InfluxDB
-    VERSION = "0.4.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/sidekiq/middleware/server/influxdb.rb

@@ -0,0 +1,82 @@
+require 'set'
+require 'influxdb'
+
+module Sidekiq
+  module Middleware
+    module Server
+      class InfluxDB
+
+        def initialize(
+          influxdb_client:,
+          series_name: 'sidekiq_jobs',
+          retention_policy: nil,
+          start_events: true,
+          tags: {},
+          except: []
+        )
+          @influxdb = influxdb_client
+          @series = series_name
+          @retention = retention_policy
+          @start_events = start_events
+          @tags = tags
+          @secret_agents = Set.new(except)
+        end
+
+        def call(worker, msg, queue)
+          if @secret_agents.include?(worker.class)
+            yield
+            return
+          end
+          t = Time.now.to_f
+          data = {
+            tags: {
+              class: worker.class.name,
+              queue: queue,
+              event: 'start',
+            }.merge(@tags),
+            values: {
+              jid:           msg['jid'],
+              creation_time: msg['created_at'],
+              waited:    t - msg['created_at'],
+            },
+            timestamp: in_correct_precision(t)
+          }
+          save(data) if @start_events
+          begin
+            yield
+            data[:tags][:event] = 'finish'
+          rescue => e
+            data[:tags][:event] = 'error'
+            data[:tags][:error] = e.class.name
+          end
+          tt = Time.now.to_f
+          data[:values][:worked] = tt - t
+          data[:values][:total]  = tt - msg['created_at']
+          data[:timestamp] = in_correct_precision(tt)
+          save(data)
+          raise e if e
+        end
+
+        private
+
+        def save(data)
+          @influxdb.write_point(@series, data, precision, @retention)
+        end
+
+        def precision
+          @influxdb.config.time_precision
+        end
+
+        def in_correct_precision(t)
+          case precision
+            # In order of probability in real-world setups
+            when 'ms' then (t * 1000).to_i
+            when 's'  then  t.to_i
+            when 'u'  then (t * 1000000).to_i
+          end
+        end
+
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ilya Vassilevsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -81,8 +81,8 @@ files:
 - README.md
 - Rakefile
 - lib/sidekiq/influxdb.rb
-- lib/sidekiq/influxdb/server_middleware.rb
 - lib/sidekiq/influxdb/version.rb
+- lib/sidekiq/middleware/server/influxdb.rb
 - sidekiq-influxdb.gemspec
 homepage: https://github.com/vassilevsky/sidekiq-influxdb
 licenses: []

data/lib/sidekiq/influxdb/server_middleware.rb

@@ -1,78 +0,0 @@
-require 'set'
-require 'influxdb'
-
-module Sidekiq
-  module InfluxDB
-    class ServerMiddleware
-      def initialize(
-        influxdb_client:,
-        series_name: 'sidekiq_jobs',
-        retention_policy: nil,
-        start_events: true,
-        tags: {},
-        except: []
-      )
-        @influxdb = influxdb_client
-        @series = series_name
-        @retention = retention_policy
-        @start_events = start_events
-        @tags = tags
-        @secret_agents = Set.new(except)
-      end
-
-      def call(worker, msg, queue)
-        if @secret_agents.include?(worker.class)
-          yield
-          return
-        end
-        t = Time.now.to_f
-        data = {
-          tags: {
-            class: worker.class.name,
-            queue: queue,
-            event: 'start',
-          }.merge(@tags),
-          values: {
-            jid:           msg['jid'],
-            creation_time: msg['created_at'],
-            waited:    t - msg['created_at'],
-          },
-          timestamp: in_correct_precision(t)
-        }
-        save(data) if @start_events
-        begin
-          yield
-          data[:tags][:event] = 'finish'
-        rescue => e
-          data[:tags][:event] = 'error'
-          data[:tags][:error] = e.class.name
-        end
-        tt = Time.now.to_f
-        data[:values][:worked] = tt - t
-        data[:values][:total]  = tt - msg['created_at']
-        data[:timestamp] = in_correct_precision(tt)
-        save(data)
-        raise e if e
-      end
-
-      private
-
-      def save(data)
-        @influxdb.write_point(@series, data, precision, @retention)
-      end
-
-      def precision
-        @influxdb.config.time_precision
-      end
-
-      def in_correct_precision(t)
-        case precision
-          # In order of probability in real-world setups
-          when 'ms' then (t * 1000).to_i
-          when 's'  then  t.to_i
-          when 'u'  then (t * 1000000).to_i
-        end
-      end
-    end
-  end
-end