Merge pull request #40 from jeremiahlukus/update-gems-ruby-3-4-4

Update to Ruby 3.4.4, Bundler 4, and latest gems

Author: jeremiahlukus

.github/workflows/cicd.yml

@@ -0,0 +1,24 @@
+name: Release Gem
+on:
+  workflow_dispatch:
+    branches:
+      - master
+
+jobs:
+  push:
+    name: Push gem to RubyGems.org
+    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - uses: rubygems/release-gem@v1

.github/workflows/release.yml

@@ -0,0 +1,15 @@
+name: CI/CD
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+      - name: Test
+        run: bundle exec rake test

.github/workflows/test.yml

@@ -0,0 +1 @@
+3.4.4

.ruby-version

@@ -1,6 +1,16 @@
 # Keep A Changelog!
 
-See this http://keepachangelog.com link for information on how we want this documented formatted.
+See this http://keepachangelog.com link for information on how we want this formatted.
+
+## v2.4.0
+
+### Changed
+
+- Update to Ruby 3.4.4 and Bundler 4.
+- Update all gems, including Rails 6.1 → 8.1 and aws-sdk-sqs 1.35 → 1.116.
+- Fix duplicate `JobName` key in CloudWatch metrics output (would raise an error in json 3.0).
+- Modernize CI to use `ruby/setup-ruby` directly on `ubuntu-24.04`.
+- Add `release.yml` workflow for trusted publishing to RubyGems.org.
 
 ## v2.3.0
 

CHANGELOG.md

@@ -10,93 +10,177 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.1.1)
-      actionview (= 6.1.1)
-      activesupport (= 6.1.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (8.1.3)
+      actionview (= 8.1.3)
+      activesupport (= 8.1.3)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.1.1)
-      activesupport (= 6.1.1)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (8.1.3)
+      activesupport (= 8.1.3)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.1)
-      activesupport (= 6.1.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (8.1.3)
+      activesupport (= 8.1.3)
       globalid (>= 0.3.6)
-    activesupport (6.1.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.1.3)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.422.0)
-    aws-sdk-core (3.111.2)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1257.0)
+    aws-sdk-core (3.251.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-sqs (1.116.0)
+      aws-sdk-core (~> 3, >= 3.248.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-sqs (1.35.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
-      aws-eventstream (~> 1, >= 1.0.2)
-    builder (3.2.4)
+    base64 (0.3.0)
+    bigdecimal (4.1.2)
+    builder (3.3.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
     crass (1.0.6)
-    erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.7)
+    date (3.5.1)
+    drb (2.2.3)
+    erb (6.0.4)
+    erubi (1.13.1)
+    globalid (1.3.0)
+      activesupport (>= 6.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    loofah (2.9.0)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jmespath (1.6.2)
+    json (2.19.8)
+    logger (1.7.0)
+    loofah (2.25.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     macaddr (1.7.2)
       systemu (~> 2.6.5)
-    method_source (1.0.0)
-    mini_portile2 (2.5.0)
-    minitest (5.14.2)
-    minitest-focus (1.2.1)
-      minitest (>= 4, < 6)
-    mocha (1.11.2)
-    nokogiri (1.11.1)
-      mini_portile2 (~> 2.5.0)
+    method_source (1.1.0)
+    mini_portile2 (2.8.9)
+    minitest (6.0.6)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    minitest-focus (1.4.1)
+      minitest (> 5.0)
+    mocha (3.1.0)
+      ruby2_keywords (>= 0.0.5)
+    nokogiri (1.19.3)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.19.3-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.3-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.19.3-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.3-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.19.3-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.3-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.3-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.3-x86_64-linux-musl)
       racc (~> 1.4)
-    pry (0.13.1)
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.5.2)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+      reline (>= 0.6.0)
+    psych (5.4.0)
+      date
+      stringio
+    racc (1.8.1)
+    rack (3.2.6)
+    rack-session (2.1.2)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.3.1)
+      rack (>= 3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
-      loofah (~> 2.3)
-    railties (6.1.1)
-      actionpack (= 6.1.1)
-      activesupport (= 6.1.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (~> 1.0)
-    rake (13.0.1)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    railties (8.1.3)
+      actionpack (= 8.1.3)
+      activesupport (= 8.1.3)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
+    rake (13.4.2)
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
+      io-console (~> 0.5)
+    ruby2_keywords (0.0.5)
+    securerandom (0.4.1)
+    stringio (3.2.0)
     systemu (2.6.5)
-    thor (1.1.0)
-    tzinfo (2.0.4)
+    thor (1.5.0)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    uri (1.1.1)
+    useragent (0.16.11)
     uuid (2.3.9)
       macaddr (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.8.2)
 
 PLATFORMS
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
   ruby
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   bundler
@@ -109,4 +193,4 @@ DEPENDENCIES
   uuid
 
 BUNDLED WITH
-   2.1.4
+  4.0.13

Gemfile.lock

@@ -67,7 +67,6 @@ def instrument!
       put_metric 'Count', 1, 'Count'
       put_metric 'ExceptionCount', 1, 'Count' if exception_name
       set_property 'JobId', job.job_id
-      set_property 'JobName', job_name
       set_property 'QueueName', job.queue_name
       set_property 'MessageId', job.provider_job_id if job.provider_job_id
       set_property 'ExceptionName', exception_name if exception_name

lib/lambdakiq/metrics.rb

@@ -1,3 +1,3 @@
 module Lambdakiq
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

lib/lambdakiq/version.rb

@@ -8,7 +8,7 @@ class JobTest < LambdakiqSpec
     expect(aj).must_be_instance_of TestHelper::Jobs::BasicJob
     expect(aj.job_id).must_equal '527cd37e-08f4-4aa8-9834-a46220cdc5a3'
     expect(aj.queue_name).must_equal queue_name
-    expect(aj.enqueued_at).must_equal '2020-11-30T13:07:36Z'
+    expect(aj.enqueued_at).must_equal Time.utc(2020, 11, 30, 13, 7, 36)
     expect(aj.executions).must_equal 0
     expect(aj.provider_job_id).must_equal message_id
   end

test/cases/job_test.rb

@@ -4,7 +4,8 @@ module Dummy
   class Application < ::Rails::Application
     config.root = File.join __FILE__, '..'
     config.eager_load = true
-    logger = ActiveSupport::Logger.new(StringIO.new)
+    LOG_IO = StringIO.new
+    logger = ActiveSupport::Logger.new(LOG_IO)
     logger.formatter = ActiveSupport::Logger::SimpleFormatter.new
     config.logger = logger
     config.active_job.queue_adapter = :lambdakiq