sidekiq-instrumental 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a71199e63e3ff0539ef7e598490f27f0715d30b8
-  data.tar.gz: bd14c5b122c230a542cbed342e0e1e186eee2bd4
+SHA256:
+  metadata.gz: faa7a76c550d65983211b0f20bbd198d9b7995442e2995de66f24e9240f21ac7
+  data.tar.gz: 58d0d2e0d6388de6bad14c218a910769372f1e0503f1b02daf5b6746da4f3538
 SHA512:
-  metadata.gz: 509476fe83703bd76e2a4a4129c5236e63877f695125fe0cc5e8695555235781bf401230a31e90ac28d6fb8391d327913645459777c8853a2be1f62e67487498
-  data.tar.gz: 2f9a3de47b48efa0ee50a410899f5bf59bb6b21af4baec6c73afdb6dbafcb1ddc728a91bd1ce1bd7eee21aafe103642812cf58d89498b105fb7d3ef1de5467a5
+  metadata.gz: 241240850476d4200464a3b1b2d86b46242c8ed715def7122124057c94327271bf72de83a48b692203bd6170aa98d70f27797cbb714ad8cd85108efde078c736
+  data.tar.gz: ad872a46fdee9de36cd770dff16ff6ed6838b9cf9dfa9f1f14223121b51d2ae5ee17f0f677f13b62b9793703c447312429d6434dc224e70a892aaed41f2788d1

data/.circleci/config.yml

@@ -0,0 +1,132 @@
+version: 2
+
+defaults: &defaults
+  docker: &ruby_image
+    - &ruby_image
+      image: circleci/ruby:2.5-stretch
+      environment:
+        RUBYOPT: '-KU -E utf-8:utf-8'
+        BUNDLE_PATH: vendor/bundle
+        BUNDLE_VERSION: 1.17.3
+        BUNDLE_JOBS: 4
+        BUNDLE_RETRY: 3
+
+filters:
+  test: &filter_test
+    filters:
+      tags:
+        ignore: /^v.*/
+  beta: &filter_beta
+    filters:
+      branches:
+        ignore: /.*/
+      tags:
+        only: /^v[0-9]+(\.[0-9]+)+(\.[a-z].+).*/
+  release: &filter_release
+    filters:
+      branches:
+        ignore: /.*/
+      tags:
+        only: /^v[0-9]+(\.[0-9]+)+/
+
+workflows:
+  version: 2
+  build_test:
+    jobs:
+      - "Checkout":
+          <<: *filter_test
+          context: org-global
+      - "Test":
+          <<: *filter_test
+          context: org-global
+          requires:
+            - "Checkout"
+  build_test_beta:
+    jobs:
+      - "Checkout":
+          <<: *filter_beta
+          context: org-global
+      - "Test":
+          <<: *filter_beta
+          context: org-global
+          requires:
+            - "Checkout"
+      - "Publish":
+          <<: *filter_beta
+          context: org-global
+          requires:
+            - "Test"
+  build_test_release:
+    jobs:
+      - "Checkout":
+          <<: *filter_release
+          context: org-global
+      - "Test":
+          <<: *filter_release
+          context: org-global
+          requires:
+            - "Checkout"
+      - "Publish":
+          <<: *filter_release
+          context: org-global
+          requires:
+            - "Test"
+
+jobs:
+  "Checkout":
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: .
+      - checkout
+
+      - restore_cache:
+          keys:
+            - sidekiq-instrumental-bundle-v2-{{ checksum "Gemfile" }}-{{ checksum "sidekiq-instrumental.gemspec" }}
+      - run:
+          name: Install bundler
+          command: gem install bundler --version=$BUNDLE_VERSION
+      - run:
+          name: Bundle Install
+          command: |-
+            bundle _${BUNDLE_VERSION}_ check || bundle _${BUNDLE_VERSION}_ install --retry=$BUNDLE_RETRY
+      - save_cache:
+          key: sidekiq-instrumental-bundle-v2-{{ checksum "Gemfile" }}-{{ checksum "sidekiq-instrumental.gemspec" }}
+          paths:
+            - vendor/bundle
+            - Gemfile.lock
+
+      - persist_to_workspace:
+          root: .
+          paths: .
+  "Test":
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: Install bundler
+          command: gem install bundler --version=$BUNDLE_VERSION
+      - run:
+          name: RSpec
+          command: bundle exec rspec
+      - run:
+          name: Rubocop
+          command: bundle exec rubocop
+      - run:
+          name: Build gem
+          command: |-
+            gem build *.gemspec
+  "Publish":
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: .
+      - run:
+          name: Deploy to gem server
+          command: |-
+            ./bin/tag_check.sh
+            ./bin/setup-rubygems.sh
+            rm -rf pkg
+            rake build
+            gem push pkg/*.gem

data/.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  TargetRubyVersion: 2.3
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented_relative_to_receiver
+Metrics:
+  Enabled: false

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# 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).
+
+## [Next]
+### Added
+### Changed
+### Fixed
+
+## [0.3.0]
+### Fixed
+- class name calculation now uses Sidekiq's display\_class\_name to support ActiveJob jobs
+

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sidekiq-instrumental.gemspec

data/README.md

@@ -1,3 +1,5 @@
+[![Gem Version](https://badge.fury.io/rb/sidekiq-instrumental.svg)](https://badge.fury.io/rb/sidekiq-instrumental)
+
 # Sidekiq::Instrumental
 
 sidekiq-instrumental is a simple gem to record Sidekiq queue stats into [Instrumental](https://instrumentalapp.com/).

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "sidekiq/instrumental"
+require 'bundler/setup'
+require 'sidekiq/instrumental'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "sidekiq/instrumental"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/bin/setup-rubygems.sh

@@ -0,0 +1,3 @@
+mkdir ~/.gem
+echo -e "---\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
+chmod 0600 ~/.gem/credentials

data/bin/tag_check.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+tag=`git describe --tags --exact-match  HEAD 2> /dev/null`
+
+if [ $? -eq 0 ]; then
+  version=`grep VERSION lib/sidekiq/instrumental/version.rb | sed -e "s/.*'\([^']*\)'.*/\1/"`
+  
+  if [ "v$version" = "$tag" ]; then
+    echo "Revision $tag Matches $version"
+  else
+    echo "Revision $tag does not match $version"
+    exit 2
+  fi
+else
+  echo "No tag found"
+  exit 1
+fi

data/lib/sidekiq/instrumental/configuration.rb

@@ -1,17 +1,23 @@
+# frozen_string_literal: true
+
 module Sidekiq
   module Instrumental
+    # Configuration for gem
     class Configuration
-      ARRAY_OPTIONS = [:whitelist_queues, :blacklist_queues, :whitelist_classes, :blacklist_classes]
+      ARRAY_OPTIONS = %i[
+        whitelist_queues blacklist_queues
+        whitelist_classes blacklist_classes
+      ].freeze
 
       attr_accessor :instrumental_agent
       attr_accessor :enabled, *ARRAY_OPTIONS
 
-      alias_method :I, :instrumental_agent
+      alias I instrumental_agent
 
       def initialize
         @instrumental_agent = nil
         self.enabled = true
-        ARRAY_OPTIONS.each {|o| self.send("#{o}=", [])}
+        ARRAY_OPTIONS.each { |o| send("#{o}=", []) }
       end
 
       def enabled?
@@ -19,7 +25,9 @@ module Sidekiq
       end
 
       def queue_in_whitelist(queue)
-        whitelist_queues.nil? || whitelist_queues.empty? || whitelist_queues.include?(queue.to_s)
+        whitelist_queues.nil? ||
+          whitelist_queues.empty? ||
+          whitelist_queues.include?(queue.to_s)
       end
 
       def queue_in_blacklist(queue)
@@ -27,7 +35,9 @@ module Sidekiq
       end
 
       def class_in_whitelist(worker_instance)
-        whitelist_classes.nil? || whitelist_classes.empty? || whitelist_classes.include?(worker_instance.class.to_s)
+        whitelist_classes.nil? ||
+          whitelist_classes.empty? ||
+          whitelist_classes.include?(worker_instance.class.to_s)
       end
 
       def class_in_blacklist(worker_instance)
@@ -35,8 +45,11 @@ module Sidekiq
       end
 
       def allowed_to_submit(queue, worker_instance)
-        class_in_whitelist(worker_instance) && !class_in_blacklist(worker_instance) && queue_in_whitelist(queue) && !queue_in_blacklist(queue)
+        class_in_whitelist(worker_instance) &&
+          !class_in_blacklist(worker_instance) &&
+          queue_in_whitelist(queue) &&
+          !queue_in_blacklist(queue)
       end
     end
   end
-end
+end

data/lib/sidekiq/instrumental/middleware/base.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 require 'sidekiq/api'
 
 module Sidekiq
   module Instrumental
     module Middleware
+      # Shared base code for measuring stats for server and client sidekiq
       class Base
         attr_reader :config
 
@@ -10,14 +13,19 @@ module Sidekiq
           @config = config
         end
 
-        def call(worker_instance, msg, queue, redis_pool = nil)
+        def call(worker_instance, msg, queue, _redis_pool = nil)
           start_time = Time.now
           result = yield
           elapsed = (Time.now - start_time).to_f
 
           return result unless config.enabled?
 
-          track(::Sidekiq::Stats.new, worker_instance, msg, queue, elapsed)
+          track(
+            ::Sidekiq::Stats.new,
+            worker_instance,
+            ::Sidekiq::Job.new(msg),
+            queue, elapsed
+          )
 
           result
         end
@@ -25,11 +33,11 @@ module Sidekiq
         protected
 
         def increment(*args)
-          config.I.increment *args
+          config.I.increment(*args)
         end
 
         def gauge(*args)
-          config.I.gauge *args
+          config.I.gauge(*args)
         end
       end
     end

data/lib/sidekiq/instrumental/middleware/client.rb

@@ -1,22 +1,23 @@
+# frozen_string_literal: true
+
 module Sidekiq
   module Instrumental
     module Middleware
+      # Client side sidekiq middleware
       class Client < Base
-
-        def track(stats, worker_instance, msg, queue, elapsed)
-
+        def track(_stats, worker_instance, msg, queue, _elapsed)
           increment('sidekiq.queued')
 
           return unless config.allowed_to_submit queue, worker_instance
 
-          base_key = "sidekiq.#{queue.to_s}."
+          base_key = "sidekiq.#{queue}."
           increment(base_key + 'queued')
 
-          base_key += msg['class'].underscore.gsub('/', '_') + '.'
+          base_key += msg.display_class.underscore.gsub('/', '_') + '.'
 
           increment(base_key + 'queued')
         end
       end
     end
   end
-end
+end

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

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module Sidekiq
   module Instrumental
     module Middleware
+      # Server side sidekiq middleware
       class Server < Base
         protected
 
@@ -9,26 +12,26 @@ module Sidekiq
 
           return unless config.allowed_to_submit queue, worker_instance
 
-          base_key = "sidekiq.#{queue.to_s}."
+          base_key = "sidekiq.#{queue}."
 
           increment(base_key + 'processed')
           gauge(base_key + 'time', elapsed)
           gauge(base_key + 'enqueued', stats.queues[queue].to_i)
           gauge(base_key + 'latency', Sidekiq::Queue.new(queue.to_s).latency)
-          base_key += msg['class'].underscore.gsub('/', '_') + '.'
+          base_key += msg.display_class.underscore.gsub('/', '_') + '.'
 
           increment(base_key + 'processed')
-          increment(base_key + 'time', elapsed)
+          gauge(base_key + 'time', elapsed)
         end
 
         def submit_general_stats(stats)
-          increment("sidekiq.processed")
+          increment('sidekiq.processed')
           {
-              enqueued: nil,
-              failed: nil,
-              scheduled_size: 'scheduled'
+            enqueued: nil,
+            failed: nil,
+            scheduled_size: 'scheduled'
           }.each do |method, name|
-            gauge("sidekiq.#{(name || method).to_s}", stats.send(method).to_i)
+            gauge("sidekiq.#{(name || method)}", stats.send(method).to_i)
           end
         end
       end

data/lib/sidekiq/instrumental/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Sidekiq
   module Instrumental
-    VERSION = "0.2.3"
+    VERSION = '0.3.0'
   end
 end

data/lib/sidekiq/instrumental.rb

@@ -1,4 +1,6 @@
-require "sidekiq/instrumental/version"
+# frozen_string_literal: true
+
+require 'sidekiq/instrumental/version'
 require 'sidekiq/instrumental/configuration'
 require 'sidekiq/instrumental/middleware/base'
 require 'sidekiq/instrumental/middleware/client'
@@ -6,18 +8,18 @@ require 'sidekiq/instrumental/middleware/server'
 require 'sidekiq'
 
 module Sidekiq
-  module Instrumental
+  module Instrumental # :nodoc:
     def self.config
       @config ||= Sidekiq::Instrumental::Configuration.new
     end
 
     def self.configure
-      yield self.config if block_given?
-      self.register
+      yield config if block_given?
+      register
     end
 
     def self.register
-      new_config = self.config.dup
+      new_config = config.dup
 
       ::Sidekiq.configure_server do |config|
         config.server_middleware do |chain|

data/sidekiq-instrumental.gemspec

@@ -1,28 +1,38 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sidekiq/instrumental/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "sidekiq-instrumental"
-  spec.version       = Sidekiq::Instrumental::VERSION
-  spec.authors       = ["Edward Rudd"]
-  spec.email         = ["urkle@outoforder.cc"]
+  spec.name = 'sidekiq-instrumental'
+  spec.version = Sidekiq::Instrumental::VERSION
+  spec.authors = ['Edward Rudd']
+  spec.email = ['urkle@outoforder.cc']
+
+  spec.summary = 'Send Sidekiq status into Instrumental after every job'
+  spec.homepage = 'https://github.com/NetsoftHoldings/sidekiq-instrumental/'
+  spec.license = 'MIT'
 
-  spec.summary       = %q{Send Sidekiq status into Instrumental after every job}
-  spec.homepage      = "https://github.com/NetsoftHoldings/sidekiq-instrumental/"
-  spec.license       = "MIT"
+  spec.files = `git ls-files -z`
+                 .split("\x0")
+                 .reject { |f| f.match(%r{^(spec)/}) }
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+  spec.test_files = Dir['spec/**/*']
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.test_files    = Dir['spec/**/*']
+  spec.required_ruby_version = '>= 2.3'
 
-  spec.add_runtime_dependency 'instrumental_agent', ">= 0.13"
+  spec.add_runtime_dependency 'instrumental_agent', '>= 0.13'
   spec.add_runtime_dependency 'sidekiq', '>= 3.5'
 
-  spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "simplecov", "~> 0.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.4"
+  spec.add_development_dependency 'activesupport', '~> 5.0'
+  spec.add_development_dependency 'bundler', '~> 1.9'
+  spec.add_development_dependency 'rake', '>= 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_development_dependency 'simplecov', '~> 0.11'
+  spec.add_development_dependency 'timecop', '~> 0.9.1'
+
+  spec.add_development_dependency 'rubocop', '~> 0.79.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.37.1'
 end

data/spec/sidekiq/instrumental/configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Sidekiq::Instrumental::Configuration do
@@ -59,23 +61,38 @@ RSpec.describe Sidekiq::Instrumental::Configuration do
         expect(subject.send(method, 'other')).to eq(false)
       end
     end
-
   end
 
   describe '#queue_in_whitelist' do
-    include_examples 'whitelist checks', :whitelist_queues, :queue_in_whitelist, ['default'], 'default'
+    include_examples 'whitelist checks',
+                     :whitelist_queues,
+                     :queue_in_whitelist,
+                     ['default'],
+                     'default'
   end
 
   describe '#queue_in_blacklist' do
-    include_examples 'blacklist checks', :blacklist_queues, :queue_in_blacklist, ['default'], 'default'
+    include_examples 'blacklist checks',
+                     :blacklist_queues,
+                     :queue_in_blacklist,
+                     ['default'],
+                     'default'
   end
 
   describe '#class_in_whitelist' do
-    include_examples 'whitelist checks', :whitelist_classes, :class_in_whitelist, ['Array'], []
+    include_examples 'whitelist checks',
+                     :whitelist_classes,
+                     :class_in_whitelist,
+                     ['Array'],
+                     []
   end
 
   describe '#class_in_blacklist' do
-    include_examples 'blacklist checks', :blacklist_classes, :class_in_blacklist, ['Array'], []
+    include_examples 'blacklist checks',
+                     :blacklist_classes,
+                     :class_in_blacklist,
+                     ['Array'],
+                     []
   end
 
   describe '#allowed_to_submit' do
@@ -83,4 +100,4 @@ RSpec.describe Sidekiq::Instrumental::Configuration do
       expect(subject.allowed_to_submit('default', [])).to eq(true)
     end
   end
-end
+end

data/spec/sidekiq/instrumental/middleware/client_spec.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require 'active_support/core_ext/string/inflections'
+
+RSpec.describe Sidekiq::Instrumental::Middleware::Client do
+  let(:config) { Sidekiq::Instrumental::Configuration.new }
+  let(:middleware) { described_class.new(config) }
+  let(:sidekiq_stats) { double('Sidekiq::Stats') }
+  let(:worker) { {} }
+  let(:msg) { { 'class' => 'MyClassName' } }
+  let(:queue) { 'default' }
+
+  before do
+    allow(config).to receive(:enabled?).and_return(true)
+    allow(middleware).to receive(:increment)
+    allow(::Sidekiq::Stats).to receive(:new).and_return(sidekiq_stats)
+  end
+
+  subject { middleware.call(worker, msg, queue) {} }
+
+  it 'increments the queued metric' do
+    expect(middleware).to receive(:increment).with('sidekiq.queued')
+
+    subject
+  end
+
+  it 'checks if the worker class is allowed to submit detailed metrics' do
+    expect(config).to receive(:allowed_to_submit).with(queue, worker)
+
+    subject
+  end
+
+  it 'increments the queued metric for the queue' do
+    expect(middleware).to receive(:increment).with("sidekiq.#{queue}.queued")
+
+    subject
+  end
+
+  it 'calls display_class to get the class name' do
+    expect_any_instance_of(::Sidekiq::Job)
+      .to receive(:display_class).and_call_original
+
+    subject
+  end
+
+  it 'increments the queued metric for the worker class name' do
+    expect(middleware).to receive(:increment)
+                            .with("sidekiq.#{queue}.my_class_name.queued")
+
+    subject
+  end
+end

data/spec/sidekiq/instrumental/middleware/server_spec.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require 'active_support/core_ext/string/inflections'
+
+RSpec.describe Sidekiq::Instrumental::Middleware::Server do
+  let(:config) { Sidekiq::Instrumental::Configuration.new }
+  let(:middleware) { described_class.new(config) }
+  let(:sidekiq_stats) do
+    instance_double('Sidekiq::Stats',
+                    enqueued: 1,
+                    failed: 2,
+                    scheduled_size: 3,
+                    queues: { queue => 4 })
+  end
+  let(:sidekiq_queue) { instance_double('Sidekiq::Queue', latency: 5) }
+  let(:worker) { {} }
+  let(:msg) { { 'class' => 'MyClassName' } }
+  let(:queue) { 'default' }
+
+  before do
+    allow(config).to receive(:enabled?).and_return(true)
+    allow(middleware).to receive(:increment)
+    allow(middleware).to receive(:gauge)
+    allow(::Sidekiq::Stats).to receive(:new).and_return(sidekiq_stats)
+    allow(::Sidekiq::Queue).to receive(:new).and_return(sidekiq_queue)
+  end
+
+  subject do
+    Timecop.freeze do
+      middleware.call(worker, msg, queue) do
+        Timecop.travel(0.5)
+      end
+    end
+  end
+
+  it 'submits general stats' do
+    expect(middleware).to receive(:gauge)
+                            .with('sidekiq.enqueued', 1)
+    expect(middleware).to receive(:gauge)
+                            .with('sidekiq.failed', 2)
+    expect(middleware).to receive(:gauge)
+                            .with('sidekiq.scheduled', 3)
+
+    subject
+  end
+
+  it 'increments the processed metric' do
+    expect(middleware).to receive(:increment)
+                            .with('sidekiq.processed')
+
+    subject
+  end
+
+  it 'increments the processed metric for the queue' do
+    expect(middleware).to receive(:increment)
+                            .with("sidekiq.#{queue}.processed")
+
+    subject
+  end
+
+  it 'gauge the elapsed time metric for the queue' do
+    expect(middleware).to receive(:gauge)
+                            .with(
+                              "sidekiq.#{queue}.time",
+                              be_within(0.001).of(0.5)
+                            )
+
+    subject
+  end
+
+  it 'gauge the enqueued metric for the queue' do
+    expect(middleware).to receive(:gauge)
+                            .with("sidekiq.#{queue}.enqueued", 4)
+
+    subject
+  end
+
+  it 'gauge the latency metric for the queue' do
+    expect(middleware).to receive(:gauge)
+                            .with("sidekiq.#{queue}.latency", 5)
+
+    subject
+  end
+
+  it 'increments processed metric for the class' do
+    expect(middleware).to receive(:increment)
+                            .with("sidekiq.#{queue}.my_class_name.processed")
+
+    subject
+  end
+
+  it 'gauge elapsed time metric for the class' do
+    expect(middleware).to receive(:gauge)
+                            .with(
+                              "sidekiq.#{queue}.my_class_name.time",
+                              be_within(0.001).of(0.5)
+                            )
+
+    subject
+  end
+end

data/spec/sidekiq/instrumental_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Sidekiq::Instrumental do
@@ -8,7 +10,8 @@ RSpec.describe Sidekiq::Instrumental do
   describe '::config' do
     describe '::config' do
       it 'should return a Configuration object' do
-        expect(described_class.config).to be_an_instance_of(described_class::Configuration)
+        expect(described_class.config)
+          .to be_an_instance_of(described_class::Configuration)
       end
     end
   end
@@ -22,7 +25,8 @@ RSpec.describe Sidekiq::Instrumental do
     end
 
     it 'should yield the configuration object' do
-      expect { |b| described_class.configure(&b) }.to yield_with_args(described_class.config)
+      expect { |b| described_class.configure(&b) }
+        .to yield_with_args(described_class.config)
     end
   end
 
@@ -39,8 +43,13 @@ RSpec.describe Sidekiq::Instrumental do
         allow(config).to receive(:client_middleware)
         allow(Sidekiq).to receive(:configure_server).and_yield(config)
 
-        expect(server_chain).to receive(:remove).with(described_class::Middleware::Server)
-        expect(server_chain).to receive(:add).with(described_class::Middleware::Server, an_instance_of(described_class::Configuration))
+        expect(server_chain).to receive(:remove)
+                                  .with(described_class::Middleware::Server)
+        expect(server_chain).to receive(:add)
+                                  .with(described_class::Middleware::Server,
+                                        an_instance_of(
+                                          described_class::Configuration
+                                        ))
 
         described_class.register
       end
@@ -52,8 +61,13 @@ RSpec.describe Sidekiq::Instrumental do
         allow(config).to receive(:client_middleware).and_yield(client_chain)
         allow(Sidekiq).to receive(:configure_server).and_yield(config)
 
-        expect(client_chain).to receive(:remove).with(described_class::Middleware::Client)
-        expect(client_chain).to receive(:add).with(described_class::Middleware::Client, an_instance_of(described_class::Configuration))
+        expect(client_chain).to receive(:remove)
+                                  .with(described_class::Middleware::Client)
+        expect(client_chain).to receive(:add)
+                                  .with(described_class::Middleware::Client,
+                                        an_instance_of(
+                                          described_class::Configuration
+                                        ))
 
         described_class.register
       end
@@ -66,8 +80,13 @@ RSpec.describe Sidekiq::Instrumental do
         allow(config).to receive(:client_middleware).and_yield(client_chain)
         allow(Sidekiq).to receive(:configure_client).and_yield(config)
 
-        expect(client_chain).to receive(:remove).with(described_class::Middleware::Client)
-        expect(client_chain).to receive(:add).with(described_class::Middleware::Client, an_instance_of(described_class::Configuration))
+        expect(client_chain).to receive(:remove)
+                                  .with(described_class::Middleware::Client)
+        expect(client_chain).to receive(:add)
+                                  .with(described_class::Middleware::Client,
+                                        an_instance_of(
+                                          described_class::Configuration
+                                        ))
 
         described_class.register
       end

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'simplecov'
 require 'sidekiq/instrumental'
+require 'timecop'
+
+Timecop.safe_mode = true
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-instrumental
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Edward Rudd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: instrumental_agent
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -67,33 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 0.79.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.37.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.37.1
 description: 
 email:
 - urkle@outoforder.cc
@@ -101,16 +157,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".simplecov"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
+- bin/setup-rubygems.sh
+- bin/tag_check.sh
 - lib/sidekiq/instrumental.rb
 - lib/sidekiq/instrumental/configuration.rb
 - lib/sidekiq/instrumental/middleware/base.rb
@@ -119,6 +179,8 @@ files:
 - lib/sidekiq/instrumental/version.rb
 - sidekiq-instrumental.gemspec
 - spec/sidekiq/instrumental/configuration_spec.rb
+- spec/sidekiq/instrumental/middleware/client_spec.rb
+- spec/sidekiq/instrumental/middleware/server_spec.rb
 - spec/sidekiq/instrumental_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/NetsoftHoldings/sidekiq-instrumental/
@@ -133,19 +195,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Send Sidekiq status into Instrumental after every job
 test_files:
-- spec/sidekiq/instrumental/configuration_spec.rb
-- spec/sidekiq/instrumental_spec.rb
 - spec/spec_helper.rb
+- spec/sidekiq/instrumental_spec.rb
+- spec/sidekiq/instrumental/middleware/client_spec.rb
+- spec/sidekiq/instrumental/middleware/server_spec.rb
+- spec/sidekiq/instrumental/configuration_spec.rb

data/circle.yml

@@ -1,17 +0,0 @@
-machine:
-  ruby:
-    version: 2.2.5
-dependencies:
-  post:
-    - gem install geminabox
-test:
-  post:
-    - gem build sidekiq-instrumental.gemspec
-    - rm -rf pkg
-    - mkdir -p pkg
-    - mv *.gem pkg
-deployment:
-  release:
-    tag: /v[0-9]+(\.[0-9]+)+/
-    commands:
-      - gem inabox -g ${HUBSTAFF_GEM_SERVER}