newrelic-sidekiq-metrics 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c32a39a9abdd43a7ef2e3c24d647fb21edf939d4b976e85ba46b9527753aefd9
-  data.tar.gz: cc4071084e8a4be80da20f9c6455a40b0aa675a2b4c2cb1486500ba31fbf6f5f
+  metadata.gz: 6c39889a91bb2f1e2095d3cb69ce25e04b8b094fa60515d01c0c2d7fefa45380
+  data.tar.gz: 4755388c16adac08e65415ebb29bee75ce7a5f3743f1c7c3bff04cd20428efe9
 SHA512:
-  metadata.gz: 9e6f3be9cc26efb0dd7c19840282953a89561cab26e84bd67497ee99f6e4c31d8218cddf33c37d0a6435fddcdb265057368817878cac08257ebe7a7aeb7d7325
-  data.tar.gz: 23a5c8e5667ded1f39fbe9b9aba67d8a86cb02245833a3a37a1b35fb3a5274f8c18395206a1df0d277b8d400b66e3fb4d4d4adea88d442885af5e1de06436fce
+  metadata.gz: 53429ff5cfa3cd475b8b0fbb3b6e31664ba89a75eb5b69fd0114fed7455262e708daccc3a8c76017d162291aab668e37bd2d8980070a971a7f97c429f604a21c
+  data.tar.gz: f5eefae681f5f7392626d150de41c3fb9440beae1e76f4a1437216abbd3d16bc997e09824ab055ccad4f564f3cfdebe21df76b154f003e3e5cfa03da5706ed92

data/.bundler-version

@@ -1 +1 @@
-2.3.26
+2.4.21

data/.dependabot/config.yml

@@ -14,3 +14,6 @@ update_configs:
       - match:
           dependency_type: "all"
           update_type: "security:patch"
+    labels:
+      - "automerge"
+      - "dependencies"

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

@@ -1,14 +1,13 @@
-# 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_target
+name: Auto approve dependency upgrades and hot-fix PRs
+on:
+  pull_request_target:
+    types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]
 
 jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-    - uses: hmarr/auto-approve-action@v2
-      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
-      with:
-        github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: hmarr/auto-approve-action@v3
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(toJson(github), 'HOTFIX-AUTO-APPROVE')
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"

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

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

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

@@ -6,13 +6,16 @@ on:
   check_suite:
     types:
       - completed
+  label:
+    types:
+      - created
   status: {}
 jobs:
   automerge:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.12.0"
+        uses: pascalgn/automerge-action@v0.15.6
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', 3.1]
+        ruby-version: [3.1, 3.2]
 
     steps:
     - uses: actions/checkout@v3

data/Gemfile

@@ -1,3 +1,11 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem 'bundler'
+gem 'pry'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    newrelic-sidekiq-metrics (1.6.0)
-      newrelic_rpm (~> 8)
+    newrelic-sidekiq-metrics (1.6.2)
+      newrelic_rpm (>= 8.0.0)
       sidekiq
 
 GEM
@@ -10,61 +10,71 @@ GEM
   specs:
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.3.0)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
     json (2.6.3)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    newrelic_rpm (8.13.1)
-    parallel (1.22.1)
-    parser (3.1.3.0)
+    newrelic_rpm (9.5.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
-    pry (0.14.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (3.0.2)
+    racc (1.7.1)
+    rack (3.0.8)
     rainbow (3.1.1)
-    rake (13.0.6)
-    redis-client (0.11.2)
+    rake (13.1.0)
+    redis-client (0.18.0)
       connection_pool
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
+    regexp_parser (2.8.2)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.40.0)
+    rspec-support (3.12.1)
+    rubocop (1.57.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.19.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.15.0)
-      rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
-    sidekiq (7.0.2)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    sidekiq (7.1.6)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
-      redis-client (>= 0.11.0)
-    unicode-display_width (2.3.0)
+      redis-client (>= 0.14.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   aarch64-linux-musl
@@ -86,4 +96,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.3.26
+   2.4.21

data/lib/newrelic_sidekiq_metrics/version.rb

@@ -1,3 +1,3 @@
 module NewrelicSidekiqMetrics
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.2'.freeze
 end

data/newrelic-sidekiq-metrics.gemspec

@@ -23,16 +23,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
 
-  spec.add_dependency 'newrelic_rpm', '~> 8'
+  spec.add_dependency 'newrelic_rpm', '>= 8.0.0'
   spec.add_dependency 'sidekiq'
-
-  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-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.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,128 +9,30 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_rpm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '8'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: 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'
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  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'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -152,6 +54,7 @@ files:
 - ".github/ISSUE_TEMPLATE/story.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/auto-approve.yml"
+- ".github/workflows/auto-merge-dependencies.yml"
 - ".github/workflows/auto-merge.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
@@ -182,14 +85,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Implements recording Sidekiq stats to New Relic metrics.