telegraf 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2ee7281b9a2894ca1b68ad84e14cf0ddaf1668d6203df4173438d8c137048c4
-  data.tar.gz: 87b415ca608c3c6d70495f1c7cc013a5720361d68d1baaf86b5366180891d92a
+  metadata.gz: 3b39e326a00f3b9cfd52b4de13a300f662faa5be10e4ccdded8b0c9dc936700a
+  data.tar.gz: 9805358e5520df9ef662646e1eaece6f2236a0794b2a2ef854016829b06cb0d9
 SHA512:
-  metadata.gz: b5fb0d9e6572edee60f78b3ff9ed6e4345be20fd3440dfdcc5b7b983caaa74ef087014d10395aac65034aac071e7d65e886d3f49ac58e5bb50e69352e1e9199d
-  data.tar.gz: c38898a38963a56f148a43a05e9a29ae42072e434ed48c3e741ef2c834940cb2524ede03734ec66078b3c036b52a37f2dfc4059994fc29416e333bc943f14d63
+  metadata.gz: 24fbee3ab6231d5880a181de884adc59a7b7d90295a9a256d4eff06b8943f143977e5828e8fec5ee0845a72bf4aff2fb0e7e84fa23bd916ccb3f15106e843809
+  data.tar.gz: 3cca86f680123b2021e186ba5b09d34a09eb6e9be712a5269989ce230305d1bede1421de161e6cda4ae5a63278ecfbf033d3708f9f3e6dba7cab39a5469ecb26

data/.github/workflows/test.yml

@@ -1,19 +1,23 @@
 # vim: ft=yaml
 name: test
-on: [push, pull_request]
+
+on:
+  - push
+  - pull_request
+
 jobs:
   rspec:
     name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:
         ruby:
+          - "3.3"
+          - "3.2"
           - "3.1"
           - "3.0"
           - "2.7"
-          - "2.6"
-          - "2.5"
         gemfile:
           - rails_5.2.gemfile
           - rails_6.0.gemfile
@@ -22,15 +26,17 @@ jobs:
           - rack_2.0.gemfile
           - rack_2.1.gemfile
           - rack_2.2.gemfile
+          - sidekiq_6.gemfile
+          - sidekiq_7.gemfile
         exclude:
+          - ruby: "3.3"
+            gemfile: rails_5.2.gemfile
+          - ruby: "3.2"
+            gemfile: rails_5.2.gemfile
           - ruby: "3.1"
             gemfile: rails_5.2.gemfile
           - ruby: "3.0"
             gemfile: rails_5.2.gemfile
-          - ruby: "2.6"
-            gemfile: rails_7.0.gemfile
-          - ruby: "2.5"
-            gemfile: rails_7.0.gemfile
       fail-fast: false
 
     env:
@@ -51,7 +57,7 @@ jobs:
 
   rubocop:
     name: rubocop
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     env:
       BUNDLE_WITHOUT: development
@@ -62,7 +68,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: '3.3'
           bundler-cache: true
 
       - run: bundle exec rubocop --parallel --color

data/.rubocop.yml

@@ -1,10 +1,10 @@
 # vim: ft=yaml
 
 inherit_gem:
-  my-rubocop: default.yml
+  rubocop-config: default.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   SuggestExtensions: False
 
 RSpec/FilePath:

data/Appraisals

@@ -41,3 +41,15 @@ appraise 'rack-2.2' do
     gem 'rack', '~> 2.2.0'
   end
 end
+
+appraise 'sidekiq-6' do
+  group :test do
+    gem 'sidekiq', '~> 6.0'
+  end
+end
+
+appraise 'sidekiq-7' do
+  group :test do
+    gem 'sidekiq', '~> 7.0'
+  end
+end

data/CHANGELOG.md

@@ -1,45 +1,80 @@
+<!-- markdownlint-disable-file MD024 -->
+
 # Changelog
-All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [3.0.0] - 2024-03-11
+
+### Added
+
+- New standalone Influx line protocol serializer
+- `before_send` filter option for agent and all plugins (#27)
+
+### Changed
+
+- Require Ruby 2.7+
+
+## [2.1.1] - 2022-08-23
+
+### Fixed
+
+- Possible RuntimeError: can't add a new key into hash during iteration (@MrSerth)
+
 ## [2.1.0] - 2022-01-24
+
 ### Added
+
 - Support for Rails 7.0 and Ruby 3.1
 - Grape API instrumentation (#17)
 
 ## [2.0.0] - 2021-09-30
+
 ### Changed
+
 - The sidekiq middleware does not use keyword arguments as sidekiq does not handle them correctly on Ruby 3.0 (#14)
 
 ## [1.0.0] - 2021-01-26
+
 ### Added
+
 - Global tags (#6)
 
 ## [0.8.0] - 2020-12-02
+
 ### Added
+
 - ActiveJob instrumentation (#10)
 
 ## [0.7.0] - 2020-05-07
+
 ### Added
+
 - Sidekiq middleware (#8)
 
 ## [0.6.1] - 2020-04-01
+
 ### Fixed
+
 - Fix type in instrumentation option (#7)
 
 ## [0.6.0] - 2020-03-31
+
 ### Added
+
 - New Rack middleware and Rails plugin to collect request events (#5)
 
 ## 0.5.0 - undefined
+
 ### Changed
+
 - Remove `influxdb` not unnecessarily restrict users needing a specific influxdb client.
 
-[Unreleased]: https://github.com/jgraichen/telegraf-ruby/compare/v2.1.0...HEAD
+[Unreleased]: https://github.com/jgraichen/telegraf-ruby/compare/v3.0.0...HEAD
+[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
 [2.1.0]: https://github.com/jgraichen/telegraf-ruby/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/jgraichen/telegraf-ruby/compare/v1.0.0...v2.0.0
 [1.0.0]: https://github.com/jgraichen/telegraf-ruby/compare/v0.8.0...v1.0.0

data/Gemfile

@@ -5,14 +5,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in telegraf.gemspec
 gemspec
 
-gem 'my-rubocop', github: 'jgraichen/my-rubocop', ref: 'v6'
 gem 'rake'
 gem 'rspec', '~> 3.8'
+gem 'rubocop-config', github: 'jgraichen/rubocop-config', ref: 'v11'
 
 group :test do
   gem 'rack'
   gem 'rails'
-  gem 'sidekiq', '~> 6.0'
+  gem 'sidekiq'
 end
 
 group :development do

data/README.md

@@ -1,11 +1,12 @@
 # Telegraf
 
+[![Gem Version](https://img.shields.io/gem/v/telegraf?logo=ruby)](https://rubygems.org/gems/telegraf)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/jgraichen/telegraf-ruby/test.yml?logo=github)](https://github.com/jgraichen/telegraf-ruby/actions)
+
 Send events to a local [Telegraf](https://github.com/influxdata/telegraf) agent or anything that can receive the InfluxDB line protocol.
 
 It further includes plugins for Rack, Rails, ActiveJob and Sidekiq to collect request events. See plugin usage details below.
 
-This gem only uses the line protocol from the `influxdb` gem and does not depend on any specific version. This may break in the future but does not restrict you in using a your preferred `influxdb` gem version.
-
 ## Installation
 
 ```ruby
@@ -14,20 +15,23 @@ gem 'telegraf'
 
 And then execute:
 
-    $ bundle
+```console
+bundle
+```
 
 Or install it yourself as:
 
-    $ gem install telegraf
+```ruby
+gem install telegraf
+```
 
 ## Usage as a library
 
 Configure telegraf socket listener e.g.:
 
-```
+```toml
 [[inputs.socket_listener]]
   service_address = "udp://localhost:8094"
-
 ```
 
 ```ruby
@@ -45,13 +49,13 @@ telegraf.write([{
 }])
 ```
 
-There is not buffer or batch handling, nor connection pooling or keep alive. Each `#write` creates a new connection (unless it's a datagram connection).
+There is no buffer or batch handling, nor connection pooling or keep alive. Each `#write` creates a new connection (unless it's a datagram connection).
 
 There is no exception handling.
 
 ## Using the Rack and Rails plugins
 
-This gem include a Rails plugin and middlewares / adapters for Rack, ActiveJob and Sidekiq to collect request and background worker events. They need to be explicitly required to be used:
+This gem includes a Rails plugin and middlewares / adapters for Rack, ActiveJob and Sidekiq, to collect request and background worker events. You need to require them explicitly:
 
 ### Rack
 
@@ -107,11 +111,12 @@ end
 
 Received event example:
 
-```
+```text
 requests,action=index,controller=TestController,instance=TestController#index,method=GET,status=200 db_ms=0.0,view_ms=2.6217450003969134,action_ms=2.702335,app_ms=4.603561000294576,send_ms=0.09295000018028077,request_ms=4.699011000411701,queue_ms=0.00003000028323014
 ```
 
 See the various classes' documentation for more details on the collected tags and values:
+
 - [Rack middleware](lib/telegraf/rack.rb)
 - [Rails plugin](lib/telegraf/railtie.rb)
 - [ActiveJob plugin](lib/telegraf/active_job.rb)
@@ -139,17 +144,16 @@ require "telegraf/sidekiq"
 agent = ::Telegraf::Agent.new
 Sidekiq.configure_server do |config|
   config.server_middleware do |chain|
-    chain.add ::Telegraf::Sidekiq::Middleware, agent: agent, series: 'sidekiq', tags: {global: 'tag'}
+    chain.add ::Telegraf::Sidekiq::Middleware, agent, series: 'sidekiq', tags: {global: 'tag'}
   end
 end
 ```
 
 See middleware [class documentation](lib/telegraf/sidekiq.rb) for more details.
 
-
 ## License
 
-Copyright (C) 2017-2020 Jan Graichen
+Copyright (C) 2017-2024 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

@@ -4,13 +4,12 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~> 3.8"
-gem "rubocop", "~> 1.7"
-gem "rubocop-rspec", "~> 1.41"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
 
 group :test do
   gem "rack", "~> 2.0.0"
   gem "rails"
-  gem "sidekiq", "~> 6.0"
+  gem "sidekiq"
 end
 
 group :development do

data/gemfiles/rack_2.1.gemfile

@@ -4,13 +4,12 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~> 3.8"
-gem "rubocop", "~> 1.7"
-gem "rubocop-rspec", "~> 1.41"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
 
 group :test do
   gem "rack", "~> 2.1.0"
   gem "rails"
-  gem "sidekiq", "~> 6.0"
+  gem "sidekiq"
 end
 
 group :development do

data/gemfiles/rack_2.2.gemfile

@@ -4,13 +4,12 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~> 3.8"
-gem "rubocop", "~> 1.7"
-gem "rubocop-rspec", "~> 1.41"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
 
 group :test do
   gem "rack", "~> 2.2.0"
   gem "rails"
-  gem "sidekiq", "~> 6.0"
+  gem "sidekiq"
 end
 
 group :development do

data/gemfiles/rails_5.2.gemfile

@@ -4,13 +4,12 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~> 3.8"
-gem "rubocop", "~> 1.7"
-gem "rubocop-rspec", "~> 1.41"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
 
 group :test do
   gem "rack"
   gem "rails", "~> 5.2.0"
-  gem "sidekiq", "~> 6.0"
+  gem "sidekiq"
 end
 
 group :development do

data/gemfiles/rails_6.0.gemfile

@@ -4,13 +4,12 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~> 3.8"
-gem "rubocop", "~> 1.7"
-gem "rubocop-rspec", "~> 1.41"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
 
 group :test do
   gem "rack"
   gem "rails", "~> 6.0.0"
-  gem "sidekiq", "~> 6.0"
+  gem "sidekiq"
 end
 
 group :development do

data/gemfiles/rails_6.1.gemfile

@@ -4,13 +4,12 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~> 3.8"
-gem "rubocop", "~> 1.7"
-gem "rubocop-rspec", "~> 1.41"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
 
 group :test do
   gem "rack"
   gem "rails", "~> 6.1.0"
-  gem "sidekiq", "~> 6.0"
+  gem "sidekiq"
 end
 
 group :development do

data/gemfiles/rails_7.0.gemfile

@@ -4,13 +4,12 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "rspec", "~> 3.8"
-gem "rubocop", "~> 1.7"
-gem "rubocop-rspec", "~> 1.41"
+gem "rubocop-config", github: "jgraichen/rubocop-config", ref: "v11"
 
 group :test do
   gem "rack"
   gem "rails", "~> 7.0.0"
-  gem "sidekiq", "~> 6.0"
+  gem "sidekiq"
 end
 
 group :development do

data/gemfiles/sidekiq_6.gemfile

@@ -0,0 +1,20 @@
+# 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"
+  gem "sidekiq", "~> 6.0"
+end
+
+group :development do
+  gem "appraisal"
+  gem "rake-release", "~> 1.2"
+end
+
+gemspec path: "../"

data/gemfiles/sidekiq_7.gemfile

@@ -0,0 +1,20 @@
+# 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"
+  gem "sidekiq", "~> 7.0"
+end
+
+group :development do
+  gem "appraisal"
+  gem "rake-release", "~> 1.2"
+end
+
+gemspec path: "../"

data/lib/telegraf/active_job.rb

@@ -24,17 +24,16 @@ module Telegraf
   #     Total job processing time.
   #
   class ActiveJob
-    def initialize(agent:, series: 'active_job', tags: {})
-      @agent = agent
-      @series = series.to_s.freeze
-      @tags = tags.freeze
+    include Plugin
+
+    def initialize(series: 'active_job', **kwargs)
+      super(series: series, **kwargs)
     end
 
     def call(_name, start, finish, _id, payload)
       job = payload[:job]
 
-      @agent.write(
-        @series,
+      point = Point.new(
         tags: {
           **@tags,
           job: job.class.name,
@@ -45,6 +44,8 @@ module Telegraf
           app_ms: ((finish - start) * 1000.0), # milliseconds
         },
       )
+
+      _write(point, before_send_kwargs: {payload: payload})
     end
   end
 end

data/lib/telegraf/agent.rb

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
+require 'uri'
+require 'telegraf/serializer'
+
 module Telegraf
   class Agent
     DEFAULT_CONNECTION = 'udp://localhost:8094'
 
     attr_reader :uri, :logger, :tags
 
-    def initialize(uri = nil, logger: nil, tags: {})
+    def initialize(uri = nil, logger: nil, tags: {}, before_send: nil)
       @uri = URI.parse(uri || DEFAULT_CONNECTION)
       @tags = tags
       @logger = logger
+      @serializer = Serializer.new
+      @before_send = before_send
     end
 
     def write(*args, **kwargs)
@@ -24,23 +29,22 @@ module Telegraf
       tags = tags.merge(@tags) unless @tags.empty?
 
       if values
-        data = [{series: series || data.to_s, tags: tags, values: values}]
+        data = [{series: series || data.to_s, tags: tags, values: values.dup}]
+      end
+
+      if @before_send
+        data = @before_send.call(data)
+        return unless data
       end
 
       socket = connect @uri
-      socket.write dump data
+      socket.write(@serializer.dump_all(data))
     ensure
       socket&.close
     end
 
     private
 
-    def dump(data)
-      data.each.map do |point|
-        ::InfluxDB::PointValue.new(point).dump
-      end.join("\n")
-    end
-
     def connect(uri)
       case uri.scheme.downcase
         when 'unix'

data/lib/telegraf/plugin.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'rack'
+
+module Telegraf
+  module Plugin
+    # Warning: `:values` member overrides `Struct#values` and it may be
+    # unexpected, but nothing we can change here as this is an import public API
+    # right now.
+    #
+    # rubocop:disable Lint/StructNewOverride
+    Point = Struct.new(:tags, :values, keyword_init: true) do
+      def initialize(tags: {}, values: {})
+        super
+      end
+    end
+    # rubocop:enable Lint/StructNewOverride
+
+    def initialize(agent:, series:, tags: {}, before_send: nil, **)
+      @agent = agent
+
+      @tags = tags.freeze
+      @series = String(series).freeze
+      @before_send = before_send
+    end
+
+    def _write(point, before_send_kwargs: {})
+      if @before_send
+        point = @before_send.call(point, **before_send_kwargs)
+        return unless point
+      end
+
+      @agent.write(@series, tags: point.tags, values: point.values)
+    end
+  end
+end

data/lib/telegraf/rack.rb

@@ -41,22 +41,15 @@ module Telegraf
   #     contain a floating point timestamp in seconds.
   #
   class Rack
+    include ::Telegraf::Plugin
+
     FIELD_NAME = 'telegraf.rack.point'
     HEADER_REGEX = /t=(\d+(\.\d+)?)/.freeze
 
-    # Warning: `:values` member overrides `Struct#values` and it may be
-    # unexpected, but nothing we can change here as this is an import public API
-    # right now.
-    #
-    # rubocop:disable Lint/StructNewOverride
-    Point = Struct.new(:tags, :values)
-    # rubocop:enable Lint/StructNewOverride
+    def initialize(app, agent:, series: 'rack', tags: {}, logger: nil, before_send: nil) # rubocop:disable Metrics/ParameterLists
+      super(agent: agent, series: series, tags: tags, before_send: before_send)
 
-    def initialize(app, agent:, series: 'rack', tags: {}, logger: nil)
       @app = app
-      @tags = tags.freeze
-      @agent = agent
-      @series = series.to_s.freeze
       @logger = logger
     end
 
@@ -66,7 +59,7 @@ module Telegraf
       end
 
       rack_start = ::Rack::Utils.clock_time
-      point = env[FIELD_NAME] = Point.new(@tags.dup, {})
+      point = env[FIELD_NAME] = Point.new(tags: @tags.dup)
       point.values[:queue_ms] = queue_ms if queue_ms
 
       begin
@@ -98,7 +91,7 @@ module Telegraf
       point.values[:request_ms] = \
         (::Rack::Utils.clock_time - rack_start) * 1000 # milliseconds
 
-      @agent.write(@series, tags: point.tags, values: point.values)
+      _write(point, before_send_kwargs: {request: ::Rack::Request.new(env)})
     rescue StandardError => e
       (@logger || env[::Rack::RACK_LOGGER])&.error(e)
     end

data/lib/telegraf/railtie.rb

@@ -48,12 +48,14 @@ module Telegraf
     # Connect URI or tuple
     config.telegraf.connect = ::Telegraf::Agent::DEFAULT_CONNECTION
     config.telegraf.tags = {}
+    config.telegraf.before_send = nil
 
     # Install Rack middlewares
     config.telegraf.rack = ::ActiveSupport::OrderedOptions.new
     config.telegraf.rack.enabled = true
     config.telegraf.rack.series = 'requests'
     config.telegraf.rack.tags = {}
+    config.telegraf.rack.before_send = nil
 
     # Install request instrumentation
     config.telegraf.instrumentation = true
@@ -67,29 +69,37 @@ module Telegraf
     config.telegraf.active_job.enabled = defined?(::ActiveJob)
     config.telegraf.active_job.series = 'active_job'
     config.telegraf.active_job.tags = {}
+    config.telegraf.active_job.before_send = nil
 
     # Install Sidekiq middleware
     config.telegraf.sidekiq = ::ActiveSupport::OrderedOptions.new
     config.telegraf.sidekiq.enabled = defined?(::Sidekiq)
     config.telegraf.sidekiq.series = 'sidekiq'
     config.telegraf.sidekiq.tags = {}
+    config.telegraf.sidekiq.before_send = nil
 
     initializer 'telegraf.agent' do |app|
       app.config.telegraf.agent ||= \
-        ::Telegraf::Agent.new \
+        ::Telegraf::Agent.new(
           app.config.telegraf.connect,
+          before_send: app.config.telegraf.before_send,
           logger: Rails.logger,
-          tags: app.config.telegraf.tags
+          tags: app.config.telegraf.tags,
+        )
     end
 
     initializer 'telegraf.rack' do |app|
       next unless app.config.telegraf.rack.enabled
 
-      app.config.middleware.insert 0, Telegraf::Rack, \
+      app.config.middleware.insert(
+        0,
+        Telegraf::Rack,
         agent: app.config.telegraf.agent,
+        before_send: app.config.telegraf.rack.before_send,
+        logger: Rails.logger,
         series: app.config.telegraf.rack.series,
         tags: app.config.telegraf.rack.tags,
-        logger: Rails.logger
+      )
     end
 
     initializer 'telegraf.instrumentation' do |app|
@@ -128,6 +138,7 @@ module Telegraf
         'perform.active_job',
         Telegraf::ActiveJob.new(
           agent: app.config.telegraf.agent,
+          before_send: app.config.telegraf.active_job.before_send,
           series: app.config.telegraf.active_job.series,
           tags: app.config.telegraf.active_job.tags,
         ),
@@ -142,6 +153,7 @@ module Telegraf
           chain.add Telegraf::Sidekiq::Middleware, \
             app.config.telegraf.agent,
             {
+              before_send: app.config.telegraf.sidekiq.before_send,
               series: app.config.telegraf.sidekiq.series,
               tags: app.config.telegraf.sidekiq.tags,
             }

data/lib/telegraf/serializer.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Telegraf
+  class Serializer
+    QUOTE_SERIES = /[ ,]/.freeze
+    QUOTE_TAG_KEY = /[ ,=]/.freeze
+    QUOTE_TAG_VALUE = /[ ,=]/.freeze
+    QUOTE_FIELD_KEY = /[ ,="]/.freeze
+    QUOTE_FIELD_VALUE = /[\\"]/.freeze
+    QUOTE_REPLACE = /[\t\r\n]+/.freeze
+
+    def dump_all(points)
+      points
+        .each
+        .filter_map {|point| dump(point) }
+        .join("\n")
+    end
+
+    def dump(point)
+      series = quote(point[:series], QUOTE_SERIES)
+      return '' if series.empty?
+
+      values = point.fetch(:values).filter_map do |key, value|
+        k = quote(key.to_s, QUOTE_FIELD_KEY)
+        v = encode_value(value)
+        next if k.empty? || v.nil?
+
+        "#{k}=#{v}"
+      end
+      return '' if values.empty?
+
+      tags = point[:tags]&.filter_map do |key, value|
+        k = quote(key.to_s, QUOTE_TAG_KEY)
+        v = quote(value.to_s, QUOTE_TAG_VALUE)
+        next if k.empty? || v.empty?
+
+        "#{k}=#{v}"
+      end
+
+      StringIO.new.tap do |io|
+        io << series
+        io << ',' << tags.sort.join(',') if !tags.nil? && tags.any?
+        io << ' ' << values.sort.join(',')
+      end.string
+    end
+
+    private
+
+    def encode_value(val)
+      if val.nil?
+        nil
+      elsif val.is_a?(Integer)
+        "#{val}i"
+      elsif val.is_a?(Numeric)
+        if val.nan? || val.infinite?
+          nil
+        else
+          val.to_s
+        end
+      else
+        "\"#{quote(val.to_s, QUOTE_FIELD_VALUE)}\""
+      end
+    end
+
+    def quote(str, rule)
+      str
+        .encode('UTF-8', 'UTF-8', invalid: :replace, undef: :replace, replace: '')
+        .gsub(QUOTE_REPLACE, ' ')
+        .gsub(rule) {|c| "\\#{c}" }
+    end
+  end
+end

data/lib/telegraf/sidekiq.rb

@@ -37,51 +37,55 @@ module Telegraf
     #     Only present for "normal" (async) jobs (with tag `type` of "job").
     #
     class Middleware
+      include ::Telegraf::Plugin
+
       def initialize(agent, options = {})
-        @agent = agent
-        @series = options.fetch(:series, 'sidekiq').to_str.freeze
-        @tags = options.fetch(:tags, {}).to_hash.freeze
+        options[:series] ||= 'sidekiq'
+
+        super(
+          **options,
+          agent: agent
+        )
       end
 
       def call(worker, job, queue)
         job_start = ::Time.now.utc
 
-        tags = {
-          **@tags,
-          type: 'job',
-          errors: true,
-          retry: job.key?('retried_at'),
-          queue: queue,
-          worker: worker.class.name,
-        }
-
-        values = {
-          retry_count: job['retry_count'],
-        }.compact
+        point = Point.new(
+          tags: {
+            **@tags,
+            type: 'job',
+            errors: true,
+            retry: job.key?('retried_at'),
+            queue: queue,
+            worker: worker.class.name,
+          },
+          values: {
+            retry_count: job['retry_count'],
+          }.compact,
+        )
 
         # 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
-          values[:queue_ms] = (job_start - enqueued_at) * 1000 # milliseconds
+          point.values[:queue_ms] = (job_start - enqueued_at) * 1000 # milliseconds
         end
 
         # The "at" key is only present for scheduled jobs.
-        tags[:type] = 'scheduled_job' if job.key?('at')
+        point.tags[:type] = 'scheduled_job' if job.key?('at')
 
         begin
           yield
 
           # If we get here, this was a successful execution
-          tags[:errors] = false
+          point.tags[:errors] = false
         ensure
           job_stop = ::Time.now.utc
 
-          values[:app_ms] = (job_stop - job_start) * 1000 # milliseconds
+          point.values[:app_ms] = (job_stop - job_start) * 1000 # milliseconds
 
-          @agent.write(
-            @series, tags: tags, values: values,
-          )
+          _write(point, before_send_kwargs: {worker: worker, job: job, queue: queue})
         end
       end
     end

data/lib/telegraf/version.rb

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

data/lib/telegraf.rb

@@ -2,8 +2,7 @@
 
 require 'telegraf/version'
 
-require 'influxdb'
-
 module Telegraf
   require 'telegraf/agent'
+  require 'telegraf/plugin'
 end

data/renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

data/telegraf.gemspec

@@ -27,7 +27,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) {|f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
-  spec.add_dependency 'influxdb'
-  spec.add_development_dependency 'bundler'
+  spec.required_ruby_version = '>= 2.7'
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: telegraf
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: influxdb
-  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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2024-03-11 00:00:00.000000000 Z
+dependencies: []
 description: Metric Reporter to local telegraf agent
 email:
 - jgraichen@altimos.de
@@ -65,15 +37,20 @@ files:
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
+- gemfiles/sidekiq_6.gemfile
+- gemfiles/sidekiq_7.gemfile
 - lib/telegraf.rb
 - lib/telegraf/active_job.rb
 - lib/telegraf/agent.rb
 - lib/telegraf/grape.rb
+- lib/telegraf/plugin.rb
 - lib/telegraf/rack.rb
 - lib/telegraf/rails.rb
 - lib/telegraf/railtie.rb
+- lib/telegraf/serializer.rb
 - lib/telegraf/sidekiq.rb
 - lib/telegraf/version.rb
+- renovate.json
 - telegraf.gemspec
 homepage: https://github.com/jgraichen/telegraf-ruby
 licenses:
@@ -88,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: Metric Reporter to local telegraf agent