ears 0.13.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba8ffc55e16ec7c7f0b7e3327b25aaf287feba34cc527d93d40d5b59bb4a1976
-  data.tar.gz: cacc33604f6299450735d16a376d583ffea86f27cc04e6108eab92473ae2ac50
+  metadata.gz: 076c414b4a4d481063324314d0b25408c63eb65c7257487941ae887ecdcaf39d
+  data.tar.gz: e10d6b0695cc02844f848c3a83c628b1ac1a06cacf34d426d21709cb4ea98039
 SHA512:
-  metadata.gz: aa791974d982def87dfff26bc03819e5cd9c12d25440a055a3c9ce3bb5ebf8c6b36d00f31f93b3b37d5f0702ce4d5831e47f86e24abea9efde01b6d40e8f9482
-  data.tar.gz: df472e7514f6308e4436f0e475ea0dbcbf1e5e3219d87a3bc7adddb9ea74ee198088f9d565db61925cad3865f24fa25d6d1ff9db7b85bc84122fb0d934c1dbac
+  metadata.gz: 7639a6815f7ecedbf9ffcb359d4a531fabe7375e53c9e64cd036c898dabd99ed91d3458bb663e60b6164d8a5277e8fe9768ff8644f1f6b1a1f6200c3f59848fe
+  data.tar.gz: d97d703e7b6a644256652a9757c5ddc89f8fa70959842dc71a526ef5e3574611101a2bd49567a0c5817e44db3951627b2a3370e0788942b76da0846b82b16160

data/.github/dependabot.yml

@@ -0,0 +1,10 @@
+# Specify a different separator for branch names
+
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'
+    pull-request-branch-name:
+      separator: '-'

data/.github/workflows/build.yml

@@ -12,18 +12,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3']
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Run prettier
         run: npm ci && npm run lint
       - name: Run Rubocop
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/codeql.yml

@@ -41,11 +41,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -71,6 +71,6 @@ jobs:
       #     ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: '/language:${{matrix.language}}'

data/.github/workflows/dependency-review.yml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v2
+        uses: actions/dependency-review-action@v4

data/.rspec

@@ -1,2 +1 @@
 --require spec_helper
---format doc

data/.tool-versions

@@ -1,2 +1,2 @@
-ruby 2.7.7
-nodejs 20.6.1
+ruby 2.7.8
+nodejs 22.5.1

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.14.1 (2024-07-31)
+
+- Add instrumentation around block in Appsignal middleware
+
+## 0.14.0 (2024-07-29)
+
+- **[Breaking]** Adjust Appsignal middleware to use `Appsignal.monitor`.  
+  To use the middleware the `appsignal` gem in version `>= 3.11.0` is required.  
+  The configuration of the middleware changed and now only requires one option `class_name` and an optional `namespace`.
+
 ## 0.13.0 (2023-11-07)
 
 - Allow adding multiple routing keys to the consumer configuration, configure method within consumer will only accept `routing_keys` array instead of `routing_key` string

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ears (0.13.0)
+    ears (0.14.1)
       bunny (~> 2.22.0)
       multi_json
 
@@ -10,74 +10,67 @@ GEM
   specs:
     amq-protocol (2.3.2)
     ast (2.4.2)
-    base64 (0.1.1)
     bunny (2.22.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    haml (6.1.2)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
-    json (2.6.3)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     multi_json (1.15.0)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    prettier (4.0.2)
+    prettier (4.0.4)
       syntax_tree (>= 4.0.1)
       syntax_tree-haml (>= 2.0.0)
       syntax_tree-rbs (>= 0.2.0)
     prettier_print (1.2.1)
-    racc (1.7.1)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rbs (3.1.3)
     rbtree (0.4.6)
-    regexp_parser (2.8.1)
-    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.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    regexp_parser (2.9.2)
+    rexml (3.3.2)
+      strscan
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.56.3)
-      base64 (~> 0.1.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.24.0)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    set (1.0.3)
+    set (1.0.4)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -87,7 +80,8 @@ GEM
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    syntax_tree (6.1.1)
+    strscan (3.1.0)
+    syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
     syntax_tree-haml (4.0.3)
       haml (>= 5.2)
@@ -97,11 +91,11 @@ GEM
       prettier_print
       rbs
       syntax_tree (>= 2.0.1)
-    temple (0.10.2)
-    thor (1.2.2)
-    tilt (2.3.0)
-    unicode-display_width (2.4.2)
-    yard (0.9.34)
+    temple (0.10.3)
+    thor (1.3.1)
+    tilt (2.4.0)
+    unicode-display_width (2.5.0)
+    yard (0.9.36)
 
 PLATFORMS
   arm64-darwin-20
@@ -125,4 +119,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.7
+   2.4.22

data/ears.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description = 'A gem for building RabbitMQ consumers.'
   spec.homepage = 'https://github.com/ivx/ears'
   spec.license = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.7.7')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
@@ -23,12 +23,6 @@ Gem::Specification.new do |spec|
     'changelog_uri'
   ] = 'https://github.com/ivx/ears/blob/main/CHANGELOG.md'
 
-  spec.post_install_message =
-    '
-Ears: the new version changed the exit behaviour in case of uncaught exceptions.
-You may want to have a look into the CHANGELOG!
-'
-
   spec.files =
     Dir.chdir(File.expand_path('..', __FILE__)) do
       `git ls-files -z`.split("\x0")

data/lib/ears/consumer.rb

@@ -40,7 +40,6 @@ module Ears
     # @option opts [Boolean] :error_queue (false) Whether an error queue should be provided.
     # @option opts [Boolean] :durable_exchange (true) Whether the exchange should be durable.
     # @option opts [Symbol] :exchange_type (:topic) The type of exchange to use.
-    # @option opts [Integer] :threads (1) The number of threads to use for this consumer.
     def self.configure(opts = {})
       self.queue = opts.fetch(:queue)
       self.exchange = opts.fetch(:exchange)

data/lib/ears/middlewares/appsignal.rb

@@ -5,12 +5,12 @@ module Ears
     # A middleware that automatically wraps {Ears::Consumer#work} in an Appsignal transaction.
     class Appsignal < Middleware
       # @param [Hash] opts The options for the middleware.
-      # @option opts [String] :transaction_name The name of the Appsignal transaction.
       # @option opts [String] :class_name The name of the class you want to monitor.
+      # @option opts [String] :namespace ('background') The namespace in which the action should appear.
       def initialize(opts)
         super()
-        @transaction_name = opts.fetch(:transaction_name)
         @class_name = opts.fetch(:class_name)
+        @namespace = opts.fetch(:namespace, 'background')
       end
 
       def call(delivery_info, metadata, payload, app)
@@ -26,16 +26,13 @@ module Ears
 
       private
 
-      attr_reader :transaction_name, :class_name
+      attr_reader :namespace, :class_name
 
       def start_transaction(&block)
-        ::Appsignal.monitor_transaction(
-          transaction_name,
-          class: class_name,
-          method: 'work',
-          queue_start: Time.now.utc,
-          &block
-        )
+        ::Appsignal.monitor(
+          namespace: namespace,
+          action: "#{class_name}#work",
+        ) { ::Appsignal.instrument('process_message.ears', &block) }
       end
     end
   end

data/lib/ears/version.rb

@@ -1,3 +1,3 @@
 module Ears
-  VERSION = '0.13.0'
+  VERSION = '0.14.1'
 end

data/package-lock.json

@@ -6,34 +6,35 @@
     "": {
       "name": "ears",
       "devDependencies": {
-        "@invisionag/prettier-config": "^2.1.2",
-        "@prettier/plugin-ruby": "^4.0.2",
-        "prettier": "^3.0.3"
+        "@invisionag/prettier-config": "^2.1.3",
+        "@prettier/plugin-ruby": "^4.0.4",
+        "prettier": "^3.3.3"
       }
     },
     "node_modules/@invisionag/prettier-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@invisionag/prettier-config/-/prettier-config-2.1.2.tgz",
-      "integrity": "sha512-/h9r5ZjI3bSvq6G5aJyXjfH5bxbxJku/TWMMV5jEFBPTwvL8s7//lrb/0gN44MJKU2toITw9dP08JvjKsFMqhQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@invisionag/prettier-config/-/prettier-config-2.1.3.tgz",
+      "integrity": "sha512-/BRe7iCWtsn43hhYrD2ANla2Qf332EusDjcuuB9xOK/z3lEghp59pkuxNFIvlQ/Y9AFMaT1zOFhvxzYax+fj3g==",
       "dev": true,
       "peerDependencies": {
         "prettier": ">=2.0.0"
       }
     },
     "node_modules/@prettier/plugin-ruby": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@prettier/plugin-ruby/-/plugin-ruby-4.0.2.tgz",
-      "integrity": "sha512-TOGsMoOLF0BLwRozqtTB/w7HpDHotDSBPfLsMBpCjlMONLSoCWBF1NhZQjiioyLim7tCltzFrCqZp11WcrPOzA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@prettier/plugin-ruby/-/plugin-ruby-4.0.4.tgz",
+      "integrity": "sha512-lCpvfS/dQU5WrwN3AQ5vR8qrvj2h5gE41X08NNzAAXvHdM4zwwGRcP2sHSxfu6n6No+ljWCVx95NvJPFTTjCTg==",
       "dev": true,
       "peerDependencies": {
         "prettier": "^3.0.0"
       }
     },
     "node_modules/prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -47,23 +48,23 @@
   },
   "dependencies": {
     "@invisionag/prettier-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@invisionag/prettier-config/-/prettier-config-2.1.2.tgz",
-      "integrity": "sha512-/h9r5ZjI3bSvq6G5aJyXjfH5bxbxJku/TWMMV5jEFBPTwvL8s7//lrb/0gN44MJKU2toITw9dP08JvjKsFMqhQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@invisionag/prettier-config/-/prettier-config-2.1.3.tgz",
+      "integrity": "sha512-/BRe7iCWtsn43hhYrD2ANla2Qf332EusDjcuuB9xOK/z3lEghp59pkuxNFIvlQ/Y9AFMaT1zOFhvxzYax+fj3g==",
       "dev": true,
       "requires": {}
     },
     "@prettier/plugin-ruby": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@prettier/plugin-ruby/-/plugin-ruby-4.0.2.tgz",
-      "integrity": "sha512-TOGsMoOLF0BLwRozqtTB/w7HpDHotDSBPfLsMBpCjlMONLSoCWBF1NhZQjiioyLim7tCltzFrCqZp11WcrPOzA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@prettier/plugin-ruby/-/plugin-ruby-4.0.4.tgz",
+      "integrity": "sha512-lCpvfS/dQU5WrwN3AQ5vR8qrvj2h5gE41X08NNzAAXvHdM4zwwGRcP2sHSxfu6n6No+ljWCVx95NvJPFTTjCTg==",
       "dev": true,
       "requires": {}
     },
     "prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "dev": true
     }
   }

data/package.json

@@ -7,9 +7,9 @@
     "format": "npm run prettify -- --write"
   },
   "devDependencies": {
-    "@invisionag/prettier-config": "^2.1.2",
-    "@prettier/plugin-ruby": "^4.0.2",
-    "prettier": "^3.0.3"
+    "@invisionag/prettier-config": "^2.1.3",
+    "@prettier/plugin-ruby": "^4.0.4",
+    "prettier": "^3.3.3"
   },
   "prettier": "@invisionag/prettier-config/ruby"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ears
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.1
 platform: ruby
 authors:
 - InVision AG
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/build.yml"
 - ".github/workflows/codeql.yml"
 - ".github/workflows/dependency-review.yml"
@@ -84,10 +85,7 @@ metadata:
   homepage_uri: https://github.com/ivx/ears
   source_code_uri: https://github.com/ivx/ears
   changelog_uri: https://github.com/ivx/ears/blob/main/CHANGELOG.md
-post_install_message: |2
-
-  Ears: the new version changed the exit behaviour in case of uncaught exceptions.
-  You may want to have a look into the CHANGELOG!
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -95,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 2.7.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="