newrelic-sidekiq-metrics 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1a6216c518a86627e9b0255ed748f19fb707371e08fc05fc199904b5ba08240
-  data.tar.gz: e112071edb2dea41ad9d0462c9ea79da94baa9bbc5bc0e47410a904b8a9fe443
+  metadata.gz: ff0aad65cd83cb47a11b9cdb7cdfbb23044fdf7c565d8dd85b0b90d30a273453
+  data.tar.gz: 78054abb2a57917468f409c3a19564ffe37a9a15cbff1a50a01f5ed9d95df6fb
 SHA512:
-  metadata.gz: 367c94cebdd7bef5ad56005f4e088ca9d965b047b0a767e187b99561388e5eb9832c509dfbe87d3233a1f67ee5f07617fc1e2b715062edc20949c8ceab99d745
-  data.tar.gz: bde33dd231fe868e99f95953394430efbb28bfee0d0cfa449180d253d483ba955167fbd8748ce6b254e0b1122dd7301cf17959f81214e33abf8a40c3b9f55b26
+  metadata.gz: 05ea0a727319ff8e3b98bb26999f5e1c103c81bbf4870bd1360f4ba68436eec4d50adfc7168ff1555ffbfa220ed6f11a58e54d815ae4ea1181b24b0b9feefc3f
+  data.tar.gz: 0c6486e4da0b24fffc90fc37d01dc7597837c9d9f2c50422bc6ec8f411ba5dc5fcf43187aa865412e9b1e24e57dc6efd51a88d523f5d90b16eeb0362b5d34128

data/.bundler-version

@@ -0,0 +1 @@
+2.2.14

data/.dependabot/config.yml

@@ -3,16 +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: "development"
-          update_type: "all"
-      - match:
-          dependency_type: "production"
-          update_type: "all"
+          dependency_type: "all"
+          update_type: "security:patch"

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to track an issue that has been identified
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Mutation/Query**
+
+**URL and HTTP method (for non-GQL):**
+
+**Sentry or Logs URL:**
+
+**User/authentication details**
+Impacted user name or service account
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

data/.github/ISSUE_TEMPLATE/story.md

@@ -0,0 +1,22 @@
+---
+name: New story
+about: Add a new story for implementation
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the solution**
+A clear and concise description of what you want to happen.
+When will this feature be done?
+
+**Describe the users**
+Who are we building this feature for?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+Link to any applicable documents describing the feature.
+
+**Designs**
+Link to any applicable designs on Invision.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+## Description
+<!--- 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). -->

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

@@ -0,0 +1,16 @@
+# 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 dependency upgrades PRs
+
+on:
+  pull_request
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hmarr/auto-approve-action@v2.0.0
+      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/.travis.yml

@@ -3,10 +3,12 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5
   - 2.6
+  - 2.7
+  - 3.0
 before_install: gem install bundler
 script:
-  - bundle exec rake
+  - bundle exec rake rubocop
+  - bundle exec rake spec
 services:
   - redis-server

data/Gemfile.lock

@@ -1,64 +1,70 @@
 PATH
   remote: .
   specs:
-    newrelic-sidekiq-metrics (1.0.2)
-      newrelic_rpm (~> 6.8)
-      sidekiq (~> 6.0.4)
+    newrelic-sidekiq-metrics (1.2.0)
+      newrelic_rpm (~> 6.14)
+      sidekiq (~> 6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    coderay (1.1.2)
-    connection_pool (2.2.2)
-    diff-lcs (1.3)
-    jaro_winkler (1.5.4)
-    method_source (0.9.2)
-    newrelic_rpm (6.8.0.360)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.1.1)
-    rack-protection (2.0.8.1)
-      rack
+    ast (2.4.2)
+    coderay (1.1.3)
+    connection_pool (2.2.3)
+    diff-lcs (1.4.4)
+    method_source (1.0.0)
+    newrelic_rpm (6.15.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
-    redis (4.1.3)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rake (13.0.3)
+    redis (4.2.5)
+    regexp_parser (2.1.1)
+    rexml (3.2.4)
+    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.2)
-    rubocop (0.79.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    ruby-progressbar (1.10.1)
-    sidekiq (6.0.4)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    sidekiq (6.2.0)
       connection_pool (>= 2.2.2)
-      rack (>= 2.0.0)
-      rack-protection (>= 2.0.0)
-      redis (>= 4.1.0)
-    unicode-display_width (1.6.1)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   bundler
@@ -67,7 +73,8 @@ DEPENDENCIES
   rake
   rspec
   rubocop
-  rubocop-performance
+  rubocop-rake
+  rubocop-rspec
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

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.0.2".freeze
+  VERSION = "1.2.0".freeze
 end

data/newrelic-sidekiq-metrics.gemspec

@@ -3,14 +3,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'newrelic_sidekiq_metrics/version'
 
 Gem::Specification.new do |spec|
-  spec.name     = 'newrelic-sidekiq-metrics'
-  spec.version  = NewrelicSidekiqMetrics::VERSION
-  spec.authors  = ['Krzysztof Knapik', 'RenoFi Engineering Team']
-  spec.email    = ['knapo@knapo.net', 'engineering@renofi.com']
+  spec.name = 'newrelic-sidekiq-metrics'
+  spec.version = NewrelicSidekiqMetrics::VERSION
+  spec.authors = ['Krzysztof Knapik', 'RenoFi Engineering Team']
+  spec.email = ['knapo@knapo.net', 'engineering@renofi.com']
 
-  spec.summary  = 'Implements recording Sidekiq stats to New Relic metrics.'
+  spec.summary = 'Implements recording Sidekiq stats to New Relic metrics.'
   spec.homepage = 'https://github.com/RenoFi/newrelic-sidekiq-metrics'
-  spec.license  = 'MIT'
+  spec.license = 'MIT'
 
   spec.metadata['homepage_uri'] = 'https://github.com/RenoFi/newrelic-sidekiq-metrics'
   spec.metadata['source_code_uri'] = 'https://github.com/RenoFi/newrelic-sidekiq-metrics'
@@ -18,19 +18,20 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'newrelic_rpm', '~> 6.8'
-  spec.add_dependency 'sidekiq', '~> 6.0.4'
+  spec.add_dependency 'newrelic_rpm', '~> 6.14'
+  spec.add_dependency 'sidekiq', '~> 6.1'
 
   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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-sidekiq-metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Krzysztof Knapik
 - RenoFi Engineering Team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2021-03-23 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: '6.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.8'
+        version: '6.14'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.4
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.4
+        version: '6.1'
 - !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:
     - - ">="
@@ -123,7 +123,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  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'
+description:
 email:
 - knapo@knapo.net
 - engineering@renofi.com
@@ -131,7 +145,14 @@ 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"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -152,7 +173,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/RenoFi/newrelic-sidekiq-metrics
   source_code_uri: https://github.com/RenoFi/newrelic-sidekiq-metrics
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,15 +181,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Implements recording Sidekiq stats to New Relic metrics.
 test_files: []