telegraf 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1992e9545cbbf54646dec6c4830190258a5756d1c536b71a42378ca5c7717eed
-  data.tar.gz: 6e00f1a167a6ac9663903623317fe1d896b882feb5d866eb52385da54603ed09
+  metadata.gz: 132cb999b16a37b5dbb280da213c44c1a227165c0f28a4dcb568a42c6d149033
+  data.tar.gz: 511605f1d7ed94572d4cce1431cc7c48c82b502154d19a1de63ec098b026c177
 SHA512:
-  metadata.gz: 949c16ce2e986feef4362d1060290b64efd01ed08a08222129a59577f22c3a4d643dc80324ede1f27f10dee63fcf0519f4c3386547c67c435418e68634644627
-  data.tar.gz: 8eafa264491cff6861f7b346e3548bf51ef5b570f2779a7b3d31e02dc62c2d8c011c9eeaeda6fc6b0e64ff79fba7ccb839615bb43101fa73f0d177600e18f216
+  metadata.gz: 570b4cafae14dab8ed1d43072366c4df5a4e2ea37862e3643ebd96cc7f556f7a644c9aa60afb2ce7e3b00d1ec8bee78cd8c525390bcd30d64c310ac79769410e
+  data.tar.gz: f595be285d5edaf4c84ba6ed97be15f6097ba747ea493f6f4fef5f15fa604f9a44392b7794c979da06751df081599cd06b3aee5ec54d328c0067e80e4e1320a2

data/.github/workflows/lint.yml

@@ -1,5 +1,4 @@
-name: Lint
-on: [push]
+on: [push, pull_request]
 jobs:
   rubocop:
     name: rubocop
@@ -14,7 +13,7 @@ jobs:
       - uses: actions/checkout@master
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.0
           bundler-cache: true
 
       - run: bundle exec rubocop --parallel --color

data/.github/workflows/test.yml

@@ -1,5 +1,4 @@
-name: Test
-on: [push]
+on: [push, pull_request]
 jobs:
   test:
     name: Ruby ${{ matrix.ruby }} / ${{ matrix.gemfile }}
@@ -8,6 +7,7 @@ jobs:
     strategy:
       matrix:
         ruby:
+          - '3.0'
           - '2.7'
           - '2.6'
           - '2.5'
@@ -18,6 +18,9 @@ jobs:
           - rack_2.0.gemfile
           - rack_2.1.gemfile
           - rack_2.2.gemfile
+        exclude:
+          - ruby: '3.0'
+            gemfile: rails_5.2.gemfile
       fail-fast: false
 
     env:

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [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)
@@ -30,7 +34,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 - Remove `influxdb` not unnecessarily restrict users needing a specific influxdb client.
 
-[Unreleased]: https://github.com/jgraichen/telegraf-ruby/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/jgraichen/telegraf-ruby/compare/v2.0.0...HEAD
+[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
 [0.8.0]: https://github.com/jgraichen/telegraf-ruby/compare/v0.7.0...v0.8.0
 [0.7.0]: https://github.com/jgraichen/telegraf-ruby/compare/v0.6.1...v0.7.0

data/README.md

@@ -78,7 +78,7 @@ require "telegraf/rails"
 
 class MyApplication > ::Rails::Application
   # Configure receiver
-  config.telegraf.connect = "udp://localhost:9084"
+  config.telegraf.connect = "udp://localhost:8094"
 
   # Global tags added to all events. These will override
   # any local tag with the same name.
@@ -125,7 +125,7 @@ require "telegraf/active_job"
 agent = ::Telegraf::Agent.new
 ActiveSupport::Notifications.subscribe(
   'perform.active_job',
-  Telegraf::ActiveJob.new(agent: agent, series: 'background', tags: {global: 'tag'})
+  Telegraf::ActiveJob.new(agent: agent, series: 'active_job', tags: {global: 'tag'})
 )
 ```
 
@@ -139,7 +139,7 @@ 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: 'background', tags: {global: 'tag'}
+    chain.add ::Telegraf::Sidekiq::Middleware, agent: agent, series: 'sidekiq', tags: {global: 'tag'}
   end
 end
 ```

data/lib/telegraf/railtie.rb

@@ -70,12 +70,11 @@ module Telegraf
     config.telegraf.sidekiq.tags = {}
 
     initializer 'telegraf.agent' do |app|
-      app.config.telegraf.agent ||= begin
+      app.config.telegraf.agent ||= \
         ::Telegraf::Agent.new \
           app.config.telegraf.connect,
           logger: Rails.logger,
           tags: app.config.telegraf.tags
-      end
     end
 
     initializer 'telegraf.rack' do |app|
@@ -127,9 +126,11 @@ module Telegraf
       ::Sidekiq.configure_server do |config|
         config.server_middleware do |chain|
           chain.add Telegraf::Sidekiq::Middleware, \
-            agent: app.config.telegraf.agent,
-            series: app.config.telegraf.sidekiq.series,
-            tags: app.config.telegraf.sidekiq.tags
+            app.config.telegraf.agent,
+            {
+              series: app.config.telegraf.sidekiq.series,
+              tags: app.config.telegraf.sidekiq.tags
+            }
         end
       end
     end

data/lib/telegraf/sidekiq.rb

@@ -37,10 +37,10 @@ module Telegraf
     #     Only present for "normal" (async) jobs (with tag `type` of "job").
     #
     class Middleware
-      def initialize(agent:, series: 'sidekiq', tags: {})
+      def initialize(agent, options = {})
         @agent = agent
-        @series = series.to_s.freeze
-        @tags = tags.freeze
+        @series = options.fetch(:series, 'sidekiq').to_str.freeze
+        @tags = options.fetch(:tags, {}).to_hash.freeze
       end
 
       def call(worker, job, queue)

data/lib/telegraf/version.rb

@@ -2,7 +2,7 @@
 
 module Telegraf
   module VERSION
-    MAJOR = 1
+    MAJOR = 2
     MINOR = 0
     PATCH = 0
     STAGE = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegraf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Metric Reporter to local telegraf agent