telegraf 3.1.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a3db63f503d4b63bc67c09e19f56ea31ad51a3e11fd6e96bb7d4238c09bc98b
-  data.tar.gz: 8389b82b7ab525740074463d83c835fde5ca5b14934705d990b18cbb1cf321fe
+  metadata.gz: 7d7c2f55b121766ee4dcb043ab90c60b24f122485ff8b258f9a74670fbc698ea
+  data.tar.gz: e964b04492e9f17a3760a42304f7feb7cb3880cfcaf99c4a1318b4c98cc4be13
 SHA512:
-  metadata.gz: e8e5fa0337d5b0e6754bf7434b875c6e21f330220f9c0a9d7d75a23d1c2dcb86395fdf40279203bab633703247e3152e717d9209a96736c880040ec064716196
-  data.tar.gz: db3bb1afce88c9ab71e4b3f5c10da06abbf7883553a59fcd9db0252d063c047656588afcffda0a79d94fe08dd9b73a2a3090dfe93926ba401e64b921bda8bdc2
+  metadata.gz: a5e8c04e244d3994fda138e4c1af64cfef701c515506803509f080c476e8179e0cf0d67efd9ea7c84657f06ec1fb592c37a26e2c7231ab8fbc0f34b35f4a4f0b
+  data.tar.gz: e957dd0d408335e13cc6bd604b3ed03ccd5e611d1921aa5f464cd0e7a4980edb7072b40b9ebd277b5d3a9ba4b72e8db39fc586e9accee22069f30f17e0b963c2

data/.github/workflows/test.yml

@@ -30,6 +30,7 @@ jobs:
           - rack_2.0.gemfile
           - sidekiq_6.gemfile
           - sidekiq_7.gemfile
+          - sidekiq_8.gemfile
         exclude:
           - ruby: "3.4"
             gemfile: rails_7.0.gemfile
@@ -41,6 +42,8 @@ jobs:
             gemfile: rack_2.0.gemfile
           - ruby: "3.1"
             gemfile: rails_8.0.gemfile
+          - ruby: "3.1"
+            gemfile: sidekiq_8.gemfile
       fail-fast: false
 
     env:

data/Appraisals

@@ -65,3 +65,9 @@ appraise 'sidekiq-7' do
     gem 'sidekiq', '~> 7.0'
   end
 end
+
+appraise 'sidekiq-8' do
+  group :test do
+    gem 'sidekiq', '~> 8.0'
+  end
+end

data/CHANGELOG.md

@@ -6,6 +6,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+### Added
+
+- Support for integer timestamps in X-Request-Start by @leshik (#37)
+
+## [3.2.0] - 2025-03-08
+
+### Added
+
+- Support for Sidekiq 8
+
 ## [3.1.0] - 2025-01-31
 
 ### Added
@@ -78,7 +88,8 @@ All notable changes to this project will be documented in this file.
 
 - Remove `influxdb` not unnecessarily restrict users needing a specific influxdb client.
 
-[Unreleased]: https://github.com/jgraichen/telegraf-ruby/compare/v3.1.0...HEAD
+[Unreleased]: https://github.com/jgraichen/telegraf-ruby/compare/v3.2.0...HEAD
+[3.2.0]: https://github.com/jgraichen/telegraf-ruby/compare/v3.1.0...v3.2.0
 [3.1.0]: https://github.com/jgraichen/telegraf-ruby/compare/v3.0.0...v3.1.0
 [3.0.0]: https://github.com/jgraichen/telegraf-ruby/compare/v2.1.1...v3.0.0
 [2.1.1]: https://github.com/jgraichen/telegraf-ruby/compare/v2.1.0...v2.1.1

data/Gemfile

@@ -11,12 +11,13 @@ gem 'rake-release', '~> 1.2'
 gem 'rspec', '~> 3.8'
 gem 'rspec-github', require: false
 
-gem 'rubocop-config', github: 'jgraichen/rubocop-config', tag: 'v13'
+gem 'rubocop-config', github: 'jgraichen/rubocop-config', tag: 'v14'
 
 group :test do
   gem 'rack'
   gem 'rails'
   gem 'sidekiq'
+  gem 'timecop'
 end
 
 group :development do

data/README.md

@@ -51,7 +51,7 @@ It further includes plugins for Rack, Rails, ActiveJob and Sidekiq to collect re
 ## Installation
 
 ```ruby
-gem 'telegraf'
+gem 'telegraf', '~> 3.3'
 ```
 
 And then execute:
@@ -194,7 +194,7 @@ See middleware [class documentation](lib/telegraf/sidekiq.rb) for more details.
 
 ## License
 
-Copyright (C) 2017-2024 Jan Graichen
+Copyright (C) 2017-2025 Jan Graichen
 
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 

data/gemfiles/rack_2.0.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack", "~> 2.0.0"
   gem "rails"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/rack_2.1.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack", "~> 2.1.0"
   gem "rails"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/rack_2.2.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack", "~> 2.2.0"
   gem "rails"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/rack_3.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack", "~> 3.0"
   gem "rails"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack"
   gem "rails", "~> 6.1.0"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack"
   gem "rails", "~> 7.0.0"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/rails_7.1.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack"
   gem "rails", "~> 7.1.0"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/rails_7.2.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack"
   gem "rails", "~> 7.2.0"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/rails_8.0.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack"
   gem "rails", "~> 8.0.0"
   gem "sidekiq"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/sidekiq_6.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack"
   gem "rails"
   gem "sidekiq", "~> 6.0"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/sidekiq_7.gemfile

@@ -3,19 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
 gem "rspec-github", require: false
-gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v13"
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack"
   gem "rails"
   gem "sidekiq", "~> 7.0"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/gemfiles/{rails_5.2.gemfile → sidekiq_8.gemfile}

@@ -3,18 +3,20 @@
 source "https://rubygems.org"
 
 gem "rake"
+gem "rake-release", "~> 1.2"
 gem "rspec", "~> 3.8"
-gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
+gem "rspec-github", require: false
+gem "rubocop-config", github: "jgraichen/rubocop-config", tag: "v14"
 
 group :test do
   gem "rack"
-  gem "rails", "~> 5.2.0"
-  gem "sidekiq"
+  gem "rails"
+  gem "sidekiq", "~> 8.0"
+  gem "timecop"
 end
 
 group :development do
   gem "appraisal"
-  gem "rake-release", "~> 1.2"
 end
 
 gemspec path: "../"

data/lib/telegraf/rack.rb

@@ -2,6 +2,9 @@
 
 require 'rack'
 
+require 'bigdecimal'
+require 'bigdecimal/util'
+
 module Telegraf
   # Telegraf::Rack
   #
@@ -38,7 +41,8 @@ module Telegraf
   # * `queue_ms`:
   #     Queue time calculated from a `X-Request-Start` header if present. The
   #     header is expected to be formatted like this `t=<timestamp>` and
-  #     contain a floating point timestamp in seconds.
+  #     contain either a floating point timestamp in seconds, or an integer
+  #     timestamp in milliseconds or microseconds or nanoseconds.
   #
   class Rack
     include ::Telegraf::Plugin
@@ -100,7 +104,10 @@ module Telegraf
       return unless env.key?('HTTP_X_REQUEST_START')
 
       if (m = HEADER_REGEX.match(env['HTTP_X_REQUEST_START']))
-        ::Time.at(m[1].to_f).utc
+        # TODO: This code works because the current timestamp in seconds
+        # has 11 characters, and will break on 2286-11-20 17:46:40.
+        value = m[2].nil? ? "#{m[1][0, 10]}.#{m[1][10, 13]}" : m[1]
+        ::Time.at(value.to_d).utc
       end
     rescue FloatDomainError
       # Ignore obscure floats in Time.at (e.g. infinity)

data/lib/telegraf/sidekiq.rb

@@ -68,7 +68,14 @@ module Telegraf
         # The "enqueued_at" key is not present for scheduled jobs.
         # See https://github.com/mperham/sidekiq/wiki/Job-Format.
         if job.key?('enqueued_at')
-          enqueued_at = ::Time.at(job['enqueued_at'].to_f).utc
+          enqueued_at = Time.at(
+            if defined?(::Sidekiq::MAJOR) && ::Sidekiq::MAJOR >= 8
+              job['enqueued_at'].to_f / 1000
+            else
+              job['enqueued_at'].to_f
+            end,
+          ).utc
+
           point.values[:queue_ms] = (job_start - enqueued_at) * 1000 # milliseconds
         end
 

data/lib/telegraf/version.rb

@@ -3,7 +3,7 @@
 module Telegraf
   module VERSION
     MAJOR = 3
-    MINOR = 1
+    MINOR = 3
     PATCH = 0
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].compact.join('.').freeze

data/telegraf.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.7'
+
+  spec.add_dependency 'bigdecimal'
 end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: telegraf
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Jan Graichen
 bindir: exe
 cert_chain: []
-date: 2025-01-31 00:00:00.000000000 Z
-dependencies: []
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Metric Reporter to local telegraf agent
 email:
 - jgraichen@altimos.de
@@ -44,8 +58,6 @@ files:
 - gemfiles/rack_2.1.gemfile
 - gemfiles/rack_2.2.gemfile
 - gemfiles/rack_3.gemfile
-- gemfiles/rails_5.2.gemfile
-- gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
@@ -53,6 +65,7 @@ files:
 - gemfiles/rails_8.0.gemfile
 - gemfiles/sidekiq_6.gemfile
 - gemfiles/sidekiq_7.gemfile
+- gemfiles/sidekiq_8.gemfile
 - lib/telegraf.rb
 - lib/telegraf/active_job.rb
 - lib/telegraf/agent.rb
@@ -85,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Metric Reporter to local telegraf agent
 test_files: []

data/gemfiles/rails_6.0.gemfile

@@ -1,20 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake"
-gem "rspec", "~> 3.8"
-gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
-
-group :test do
-  gem "rack"
-  gem "rails", "~> 6.0.0"
-  gem "sidekiq"
-end
-
-group :development do
-  gem "appraisal"
-  gem "rake-release", "~> 1.2"
-end
-
-gemspec path: "../"