newrelic-sidekiq-metrics 1.1.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e79240e42709d193295947a6b3ed604205ce0f5ae07ec3f5f68f1f3787101b30
-  data.tar.gz: 78b74fb7c189176bfa6da189102ae1748e79ad2a8379ab74fcb4b2413d083e1e
+  metadata.gz: a27a079527d1d5a2fee926474b303b3873c731549ea9424be3c9084be0ced70f
+  data.tar.gz: 1f21921a65d2e041ce3b9037434989d928580f2a2c3e9c5d33fa6933fc46bd82
 SHA512:
-  metadata.gz: e4b1fea20dae6f7a83222c912d2cfa754721b76e2b3a7e450ef79c9d15afda27c287fa0f2447f16fcfab1f591ec024ebf24774ea98b053327850bba98fc14bec
-  data.tar.gz: 791dafd70e8943fe96624fa172141985c2eefae203fb0d4f72945e500f6caf267dcdc003391c31820a81f7c32bceb760b6899550c231746c2e79ee72a5f578b2
+  metadata.gz: d2743eaced2fcc43ea9c9885d65588e39d4d2939e8068506fa4e519bebaa5b408c8275ab06a6e95940882e02925ea5cc62ba92d9af021c647b56e58b3329645d
+  data.tar.gz: 6119743f9ca0fbba2afc47d24d5692fbee309218ff0ca5df3e88977d4285f033d3ef2c7d237004a84182380ffbc91d77a633033baba5c2b10ecbdbe351ac0635

data/.bundler-version

@@ -0,0 +1 @@
+2.2.22

data/.dependabot/config.yml

@@ -3,9 +3,14 @@ version: 1
 update_configs:
   - package_manager: "ruby:bundler"
     directory: "/"
-    update_schedule: "monthly"
+    update_schedule: "daily"
     commit_message:
       prefix: "[dependabot]"
     allowed_updates:
       - match:
-          update_type: "all"
+          dependency_type: "all"
+          update_type: "security"
+    automerged_updates:
+      - match:
+          dependency_type: "all"
+          update_type: "security:patch"

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,18 +1,6 @@
-## Description
+## Description, motivation and context
 <!--- Describe your changes in detail -->
-
-## Related issue(s)
-<!--- GH issue number -->
-
-## Motivation and Context
 <!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
 
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-
-## Screenshots (if appropriate):
-<!--- Please add any screenshots of the feature. -->
-
-## Related PRs
-<!--- Please add links to any related PRs (backend, component packages, etc). -->
+## Related issue(s) or PR(s)
+<!--- GH issue number -->

data/.github/workflows/auto-approve.yml

@@ -1,7 +1,7 @@
-# automatically approve PRs submitted by Dependabot
+# automatically approve PRs submitted by Dependabot or Renofidev
 # this will allow Dependabot to automatically merge dependency update PRs where CI passes
 # from: https://github.com/hmarr/auto-approve-action
-name: Auto approve Dependabot PRs
+name: Auto approve dependency upgrades PRs
 
 on:
   pull_request
@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: hmarr/auto-approve-action@v2.0.0
-      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
       with:
         github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/auto-merge.yml

@@ -0,0 +1,19 @@
+name: automerge
+on:
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.12.0"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: squash
+          MERGE_DELETE_BRANCH: true

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: ci
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Run tests
+      run: bundle exec rake ci

data/Gemfile.lock

@@ -1,68 +1,70 @@
 PATH
   remote: .
   specs:
-    newrelic-sidekiq-metrics (1.1.0)
-      newrelic_rpm (~> 6.8)
-      sidekiq (~> 6.1)
+    newrelic-sidekiq-metrics (1.3.1)
+      newrelic_rpm (~> 7.0)
+      sidekiq (~> 6.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
+    ast (2.4.2)
     coderay (1.1.3)
-    connection_pool (2.2.3)
+    connection_pool (2.2.5)
     diff-lcs (1.4.4)
     method_source (1.0.0)
-    newrelic_rpm (6.12.0.367)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    newrelic_rpm (7.2.0)
+    parallel (1.20.1)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    redis (4.2.1)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rake (13.0.4)
+    redis (4.3.1)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.89.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.18.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
-    rubocop-rspec (1.42.0)
-      rubocop (>= 0.87.0)
-    ruby-progressbar (1.10.1)
-    sidekiq (6.1.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    sidekiq (6.2.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler
@@ -71,8 +73,8 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  rubocop-performance
+  rubocop-rake
   rubocop-rspec
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/Rakefile

@@ -1,9 +1,9 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
-require 'newrelic_sidekiq_metrics'
 
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %w[spec rubocop:auto_correct]
+task ci: %i[spec rubocop]
+task default: %i[spec rubocop:auto_correct]

data/lib/newrelic_sidekiq_metrics.rb

@@ -50,6 +50,10 @@ module NewrelicSidekiqMetrics
       end
     end
   end
+
+  def self.inline_sidekiq?
+    defined?(Sidekiq::Testing) && Sidekiq::Testing.inline?
+  end
 end
 
 NewrelicSidekiqMetrics.add_client_middleware

data/lib/newrelic_sidekiq_metrics/recorder.rb

@@ -10,14 +10,19 @@ module NewrelicSidekiqMetrics
       metrics.each { |m| record_metric(m) }
     end
 
+    private
+
     def stats
       @stats ||= Sidekiq::Stats.new
     end
 
-    private
+    def get_stat(name)
+      return 0 if NewrelicSidekiqMetrics.inline_sidekiq?
+      stats.public_send(name)
+    end
 
     def record_metric(name)
-      NewRelic::Agent.record_metric(metric_full_name(name), stats.public_send(name))
+      NewRelic::Agent.record_metric(metric_full_name(name), get_stat(name))
     end
 
     def metric_full_name(name)

data/lib/newrelic_sidekiq_metrics/version.rb

@@ -1,3 +1,3 @@
 module NewrelicSidekiqMetrics
-  VERSION = "1.1.0".freeze
+  VERSION = "1.3.1".freeze
 end

data/newrelic-sidekiq-metrics.gemspec

@@ -24,14 +24,14 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'newrelic_rpm', '~> 6.8'
-  spec.add_dependency 'sidekiq', '~> 6.1'
+  spec.add_dependency 'newrelic_rpm', '~> 7.0'
+  spec.add_dependency 'sidekiq', '~> 6.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-sidekiq-metrics
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-10 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,15 +145,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundler-version"
 - ".dependabot/config.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
+- ".github/workflows/auto-merge.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -186,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Implements recording Sidekiq stats to New Relic metrics.

data/.travis.yml

@@ -1,13 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.6
-  - 2.7
-before_install: gem install bundler
-script:
-  - bundle exec rake rubocop
-  - bundle exec rake spec
-services:
-  - redis-server