sidekiq-influxdb 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86db3cec30cc69e87ab0faed79f470aad55dc80bff4d9212e949cff105298bf9
-  data.tar.gz: b43207ea0256653a496c916864c15c47be36e387bc80ed2350ffa947f740886c
+  metadata.gz: 607a8f119a12166e7e1e9b266d5e8a6f15c665b2f4c3dd8d8f83dbf4485bf2ce
+  data.tar.gz: a7daceac5ae7b29a3d45b5cffaa0ee73e90bfe6b6a795659e0d465e28037a865
 SHA512:
-  metadata.gz: 24576df64619787d527e21077567d12d3d75e97639e75c9fa661aabbc2fd3daed52fae4d13f7eb8b1fb580f37e771429e662ffb2175adca2d225157ae30793fc
-  data.tar.gz: 0eb7dabd092930f40b5e359f84e18f951ead507a67310761517287cfca205ae2806a5008e64d0f327c454bdd6ea84429c977297da78c9cfca82c6609165f1a0e
+  metadata.gz: 7de72f2c1014b3eacdcfb03e15eebfe4d3521c4e2379f029ed3ab07fd97ccce6e9639977985c4a50a59dd786940f6b21452835513123847a6f7c474f1a1105e0
+  data.tar.gz: affc2415b5ed9a874e3a9804128bcfc320081d1a324bcde8bd583e6d054a72fd2f30f0ba3aeca18bfa5a00778ea80ceed48a820f33c2f9aabfbacd785ef280d1

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Sidekiq-InfluxDB Changelog
 
+## 1.4.2 (2026-06-05)
+
+* Sidekiq 8 support: convert millisecond `created_at` (Integer) to seconds for `waited`, `creation_time`, and `total`
+* Added `measurement_key` option (`:values` by default, use `:fields` for InfluxDB 2 clients)
+
+## 1.4.1 (2021-04-20)
+
+* Ruby 3 support
+
 ## 1.4.0 (2021-03-01)
 
 * Added queue sizes collection class

data/CONTRIBUTING.md

@@ -1,7 +1,13 @@
 # Sidekiq-InfluxDB
 
+## Reference documentation
+
+* [Sidekiq middleware](https://github.com/mperham/sidekiq/wiki/Middleware)
+* [InfluxDB client](https://github.com/influxdata/influxdb-ruby)
+
 ## Contributing Guidelines
 
+1. We welcome addition of useful Sidekiq metrics and optimisations of the existing ones.
 1. All code should be covered by tests. This library is used in high load Sidekiq deployments. Failures are unacceptable.
 1. Code should be easy for an average Rubyist to understand.
 1. Each pull request should contain changes for a single goal.

data/README.md

@@ -4,7 +4,10 @@
 [![Travis CI](https://img.shields.io/travis/com/funbox/sidekiq-influxdb)](https://travis-ci.com/github/funbox/sidekiq-influxdb)
 [![Coveralls](https://img.shields.io/coveralls/funbox/sidekiq-influxdb.svg)](https://coveralls.io/github/funbox/sidekiq-influxdb)
 
-[Sidekiq](https://github.com/mperham/sidekiq/wiki) middleware that writes job lifecycle events as points to an [InfluxDB](http://docs.influxdata.com/influxdb/v1.3/) database.
+[Sidekiq](https://github.com/mperham/sidekiq/wiki) server middleware
+that writes job lifecycle events as points to an [InfluxDB](http://docs.influxdata.com/influxdb/v1.3/) database
+(or any client with a compatible `write_point` API, including [InfluxDB 2](https://github.com/influxdata/influxdb-client-ruby)).
+Also includes classes that write global Sidekiq metrics and queue metrics.
 
 ## Installation
 
@@ -16,7 +19,24 @@ bundle add sidekiq-influxdb
 
 ## Usage
 
-Add included middleware to your application's Sidekiq middleware stack:
+Add included middleware to your application's Sidekiq middleware stack.
+The following examples assume that you already have an InfluxDB client object
+in the `influxdb` variable.
+This will create a middleware with all defaults (suitable for most deployments):
+
+```ruby
+# config/initializers/sidekiq.rb
+
+require "sidekiq/middleware/server/influxdb"
+
+Sidekiq.configure_server do |config|
+  config.server_middleware do |chain|
+    chain.add Sidekiq::Middleware::Server::InfluxDB, influxdb_client: influxdb
+  end
+end
+```
+
+You can customize the middleware by passing more options:
 
 ```ruby
 # config/initializers/sidekiq.rb
@@ -26,17 +46,41 @@ require "sidekiq/middleware/server/influxdb"
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
     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
-                start_events: true,                             # optional, default true
-                tags: { application: 'MyApp' },                 # optional, default {}
-                except: [UnimportantJob1, UnimportantJob2]      # optional, default []
+                influxdb_client: influxdb,
+                series_name: 'sidekiq_jobs',  # This is the default one.
+                retention_policy: 'rp_name',  # In case you want to write metrics to a non-default RP.
+                start_events: true,           # Whether or not you want to know when jobs started. See `event` tag description below.
+                tags: {application: 'MyApp'}, # Anything you need on top. **Make sure that tag values have low cardinality!**
+                except: [UnimportantJob],     # These job classes will be executed without sending any metrics.
+                measurement_key: :values       # Use :fields for InfluxDB 2 clients. Default: :values.
   end
 end
 ```
 
-You can learn how to create a client in [InfluxDB client documentation](https://github.com/influxdata/influxdb-ruby#creating-a-client).
+### Sidekiq 8
+
+Sidekiq 8 stores `created_at` as epoch **milliseconds** (Integer).
+Earlier versions used epoch **seconds** (Float).
+The middleware detects the format automatically — no configuration change is required when upgrading Sidekiq.
+
+### InfluxDB 2
+
+The default payload key is `values` (InfluxDB 1.x and the [`influxdb`](https://github.com/influxdata/influxdb-ruby) gem).
+InfluxDB 2 clients ([`influxdb-client`](https://github.com/influxdata/influxdb-client-ruby)) expect `fields` instead:
+
+```ruby
+chain.add Sidekiq::Middleware::Server::InfluxDB,
+  influxdb_client: my_influxdb2_client,
+  measurement_key: :fields
+```
+
+Your client must implement `write_point(series_name, data, precision, retention)` and accept a hash with
+`tags`, the configured measurement key (`values` or `fields`), and `timestamp`.
+
+This library assumes that you already have an InfluxDB client object set up the way you like.
+It does not try to create one for you.
+If that is not the case, you can learn how to create a client
+in [InfluxDB client documentation](https://github.com/influxdata/influxdb-ruby#creating-a-client).
 
 **Warning:** This middleware is going to write _a lot_ of metrics.
 Set up your InfluxDB client accordingly:
@@ -44,7 +88,7 @@ Set up your InfluxDB client accordingly:
 * or install Telegraf, set up aggregation inside it, and set up InfluxDB client to send metrics to it,
 * or both.
 
-When you deploy this code, you will start getting the following series in your InfluxDB database:
+When you deploy this code, you will have the following series in your InfluxDB database:
 
 ```
 > select * from sidekiq_jobs
@@ -66,7 +110,7 @@ Tags (repetitive indexed data; for filtering and grouping by):
 * `error` — if `event=error`, this tag contains the exception class name.
 * Your own tags from the initializer.
 
-Values (unique non-indexed data; for aggregation):
+Values / fields (unique non-indexed data; for aggregation; the key name depends on `measurement_key`):
 
 * `jid` — unique job ID.
 * `creation_time` — job creation time.
@@ -95,15 +139,22 @@ Et cetera.
 
 ### Stats and Queues metrics
 
-To collect metrics for task stats and queues, you need to run the following code periodically. For example, you can use the gem `clockwork` for that. You can add settings like this to `clock.rb`:
+To collect metrics for task stats and queues, you need to run the following code periodically.
+For example, you can use [Clockwork](https://rubygems.org/gems/clockwork) for that.
+You can add settings like this to `clock.rb`:
 
 ```ruby
 require "sidekiq/metrics/stats"
 require "sidekiq/metrics/queues"
 
+influx = InfluxDB::Client.new(options)
+
+sidekiq_global_metrics = Sidekiq::Metrics::Stats.new(influxdb_client: influx)
+sidekiq_queues_metrics = Sidekiq::Metrics::Queues.new(influxdb_client: influx)
+
 every(1.minute, 'sidekiq_metrics') do
-  Sidekiq::Metrics::Stats.new(influxdb_client: InfluxDB::Client.new(options)).publish
-  Sidekiq::Metrics::Queues.new(influxdb_client: InfluxDB::Client.new(options)).publish
+  sidekiq_global_metrics.publish
+  sidekiq_queues_metrics.publish
 end
 ```
 
@@ -133,7 +184,7 @@ Sidekiq::Metrics::Queues.new(
 ).publish
 ```
 
-When you run the scripts, you will get the following series in your InfluxDB database:
+When you run the code, you will have the following series in your InfluxDB database:
 
 ```
 > select * from sidekiq_stats
@@ -159,24 +210,10 @@ time                queue             size
 
 ### Grafana
 
-You can import the ready-made dashboard from [grafana_dashboard.json](grafana_dashboard.json).
+You can import a ready-made dashboard from [grafana_dashboard.json](grafana_dashboard.json).
 
 ## Development
 
-* [Sidekiq middleware](https://github.com/mperham/sidekiq/wiki/Middleware)
-* [InfluxDB client](https://github.com/influxdata/influxdb-ruby)
-
-After checking out the repo, run `bin/setup` to install dependencies.
-You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at [github.com/funbox/sidekiq-influxdb](https://github.com/funbox/sidekiq-influxdb).
-This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-
-## Code of Conduct
-
-Everyone interacting in the `Sidekiq::InfluxDB` project’s codebases, issue trackers,
-chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/funbox/sidekiq-influxdb/blob/master/CODE_OF_CONDUCT.md).
+See [Contributing Guidelines](CONTRIBUTING.md).
 
 [![Sponsored by FunBox](https://funbox.ru/badges/sponsored_by_funbox_centered.svg)](https://funbox.ru)

data/lib/sidekiq/influxdb/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module InfluxDB
-    VERSION = "1.4.0"
+    VERSION = "1.4.2"
   end
 end

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

@@ -5,22 +5,17 @@ module Sidekiq
     module Server
       class InfluxDB
 
-        def initialize(
-          influxdb_client:,
-          series_name: 'sidekiq_jobs',
-          retention_policy: nil,
-          start_events: true,
-          tags: {},
-          except: [],
-          clock: -> { Time.now.to_f }
-        )
-          @influxdb = influxdb_client
-          @series = series_name
-          @retention = retention_policy
-          @start_events = start_events
-          @tags = tags
-          @secret_agents = class_names(except)
-          @clock = clock
+        MILLISECONDS_PER_SECOND = 1000.0
+
+        def initialize(options = {})
+          @influxdb = options.fetch(:influxdb_client)
+          @series = options.fetch(:series_name, 'sidekiq_jobs')
+          @retention = options.fetch(:retention_policy, nil)
+          @start_events = options.fetch(:start_events, true)
+          @tags = options.fetch(:tags, {})
+          @secret_agents = class_names(options.fetch(:except, []))
+          @clock = options.fetch(:clock, -> { Time.now.to_f })
+          @measurement_key = options.fetch(:measurement_key, :values)
         end
 
         def call(_worker, msg, _queue)
@@ -30,49 +25,52 @@ module Sidekiq
           end
 
           started_at = @clock.call
-          waited = started_at - msg['created_at']
-          record(started_at, msg, {event: 'start'}, {waited: waited}) if @start_events
+          waited = started_at - created_at_in_seconds(msg)
+          record(started_at, msg, { event: 'start' }, { waited: waited }) if @start_events
 
+          error = nil
           begin
             yield
-            tags = {event: 'finish'}
-          rescue => e
-            tags = {event: 'error', error: e.class.name}
+            tags = { event: 'finish' }
+          rescue StandardError => e
+            tags = { event: 'error', error: e.class.name }
+            error = e
           end
 
           finished_at = @clock.call
           worked = finished_at - started_at
-          record(finished_at, msg, tags, {waited: waited, worked: worked, total: waited + worked})
+          record(finished_at, msg, tags, { waited: waited, worked: worked, total: waited + worked })
 
-          raise e if e
+          raise error if error
         end
 
         private
 
         def class_names(except)
-          Set.new([except].flatten.map{|e| class_name(e) })
-        end
-
-        def class_name(class_or_name)
-          class_or_name.name
-        rescue NoMethodError
-          class_or_name
+          Set.new([except].flatten.map(&:to_s))
         end
 
         def job_class_name(msg)
           msg['wrapped'] || msg['class']
         end
 
-        def record(t, msg, tags, values = {})
+        def created_at_in_seconds(msg)
+          created_at = msg['created_at']
+          return created_at unless created_at.is_a?(Integer)
+
+          created_at / MILLISECONDS_PER_SECOND
+        end
+
+        def record(t, msg, tags, measurement = {})
           save(
             tags: {
               class: job_class_name(msg),
               queue: msg['queue']
             }.merge(tags).merge(@tags),
-            values: {
+            @measurement_key => {
               jid: msg['jid'],
-              creation_time: msg['created_at']
-            }.merge(values),
+              creation_time: created_at_in_seconds(msg)
+            }.merge(measurement),
             timestamp: in_correct_precision(t)
           )
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-influxdb
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Ilya Vassilevsky
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb