newrelic-sidekiq-metrics 1.0.3 → 1.3.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c13659e38b4498429986398be71768070551cac47ab7b034b082357b07950138
-  data.tar.gz: e8018b3a78eeda64c1772c028cd4c978a977036d9906611ede3fb380af559bb5
+  metadata.gz: ac355c0f12a994203e55ad29daa0c88d2b6a1ac2f229bf34fb206ccb552e0b27
+  data.tar.gz: ceaf12efc746145568a38aac2bcdd4c376785786a5179d21972da83ab1965860
 SHA512:
-  metadata.gz: c6690ef66cd5ea7f0b64ef59ecfbfb00227adfc24b32e7eb7472f03db0fb5c8c8bfc4569bb77687323b4f64e28db7781e9ee3f3f7f8eef5d0ae49259be8ac88f
-  data.tar.gz: f435a522f0701cb8d671ebf3b69f3d2316b068717da5be95a8af458bd19fdcf2d4ddff7a8902fe039ea03c4b623fe107dabd49e072a11e0e02cc9246ccf80c1f
+  metadata.gz: f20eab6b4f238e5742ae0b75bed454e81c36d3f85156df2ef9959b07910c8483d2ae8ecc7d4ba8df1f7855a2d0395e3967e18b2b0d24e6d02e152950e86f9806
+  data.tar.gz: 0da8b76462690344ad5484c7adef13cdb8df05d2633af34eb0535217e352ada510e4e3592a60e728b05cc35b1317fe4bd9b3dafa75847faedfee181185cbe180

data/.bundler-version

@@ -0,0 +1 @@
+2.2.16

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,68 +1,70 @@
 PATH
   remote: .
   specs:
-    newrelic-sidekiq-metrics (1.0.3)
-      newrelic_rpm (~> 6.8)
-      sidekiq (~> 6.0.4)
+    newrelic-sidekiq-metrics (1.3.0.rc)
+      newrelic_rpm (~> 7.0)
+      sidekiq (~> 6.2)
 
 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.9.0.363)
-    parallel (1.19.1)
-    parser (2.7.0.3)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.2.2)
-    rack-protection (2.0.8.1)
-      rack
+    ast (2.4.2)
+    coderay (1.1.3)
+    connection_pool (2.2.5)
+    diff-lcs (1.4.4)
+    method_source (1.0.0)
+    newrelic_rpm (7.0.0)
+    parallel (1.20.1)
+    parser (3.0.1.0)
+      ast (~> 2.4.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.1.3)
-    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.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.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.2)
-    rubocop (0.80.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.13.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)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    sidekiq (6.0.5)
+      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.1)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      rack-protection (>= 2.0.0)
-      redis (>= 4.1.0)
-    unicode-display_width (1.6.1)
+      redis (>= 4.2.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/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.3".freeze
+  VERSION = "1.3.0.rc".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.0.4'
+  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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-sidekiq-metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.3.0.rc
 platform: ruby
 authors:
 - Krzysztof Knapik
 - RenoFi Engineering Team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2021-04-27 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.0.4
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.4
+        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:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - knapo@knapo.net
 - engineering@renofi.com
@@ -145,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"
@@ -166,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
@@ -177,12 +184,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 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: []