appsignal 3.0.17-java → 3.0.18-java

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.0.18
+
+### Added
+
+- [d7bfcdf1](https://github.com/appsignal/appsignal-ruby/commit/d7bfcdf11a66df1ec5f54ac9342e5566062013b5) patch - Add Ruby 3.1.0 support. There was an issue with `YAML.load` arguments when parsing the `appsignal.yml` config file.
+
 ## 3.0.17
 
 ### Fixed

data/appsignal.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 require File.expand_path("../lib/appsignal/version", __FILE__)
 
 Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength

data/build_matrix.yml

@@ -52,7 +52,7 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - name: Validate CI setup
           env_vars:
             - name: RUBY_VERSION
-              value: 2.6.6
+              value: 2.6.9
             - name: GEMSET
               value: no_dependencies
             - name: BUNDLE_GEMFILE
@@ -76,7 +76,7 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
         - name: RuboCop
           env_vars:
             - name: RUBY_VERSION
-              value: 2.6.6
+              value: 2.6.9
             - name: GEMSET
               value: no_dependencies
             - name: BUNDLE_GEMFILE
@@ -164,6 +164,7 @@ matrix:
       - "no_dependencies"
       - "rails-5.2"
       - "rails-6.0"
+      - "rails-7.0"
 
   ruby:
     - ruby: "2.0.0-p648"
@@ -184,9 +185,10 @@ matrix:
       gems: "none"
     - ruby: "2.5.8"
       gems: "minimal"
-    - ruby: "2.6.6"
-    - ruby: "2.7.3"
-    - ruby: "3.0.1"
+    - ruby: "2.6.9"
+    - ruby: "2.7.5"
+    - ruby: "3.0.3"
+    - ruby: "3.1.0"
     - ruby: "jruby-9.2.19.0"
       gems: "minimal"
       env_vars:
@@ -204,28 +206,33 @@ matrix:
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "2.6.6"
-          - "2.7.3"
-          - "3.0.1"
+          - "2.6.9"
+          - "2.7.5"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-4.2"
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "2.6.6"
-          - "2.7.3"
-          - "3.0.1"
+          - "2.6.9"
+          - "2.7.5"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-5.0"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-5.1"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-5.2"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "rails-6.0"
       exclude:
         ruby:
@@ -233,16 +240,30 @@ matrix:
           - "2.2.10"
           - "2.3.8"
           - "2.4.10"
+          - "3.1.0"
+    - gem: "rails-7.0"
+      exclude:
+        ruby:
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+          - "2.5.8"
+          - "2.6.9"
+          - "3.1.0"
+          - "jruby-9.2.19.0"
     - gem: "resque-1"
       bundler: "1.17.3"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "resque-2"
     - gem: "sequel"
     - gem: "sequel-435"
       exclude:
         ruby:
-          - "3.0.1"
+          - "3.0.3"
+          - "3.1.0"
     - gem: "sinatra"
     - gem: "webmachine"

data/ext/agent.yml

@@ -3,92 +3,92 @@
 # appsignal-agent repository.
 # Modifications to this file will be overwritten with the next agent release.
 ---
-version: 0db01c2
+version: 15ee07b
 mirrors:
 - https://appsignal-agent-releases.global.ssl.fastly.net
 - https://d135dj0rjqvssy.cloudfront.net
 triples:
   x86_64-darwin:
     static:
-      checksum: 8a7cf35f8c9aa98e7778b720f33b38bfbdedcdedb0047035259ab187517be971
+      checksum: 59bb7f5aea47ccea89b48cc323371fd87609592945ae8692f36063a635970e22
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 4330f83a44db6f092b3f437d942204e9bf7f7022ae2cc24ade4e7b4137905d03
+      checksum: ce2d489170fdd84be1467d24e5c13782cf97912b3c7dbaaebe9e074d56e711a2
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   universal-darwin:
     static:
-      checksum: 8a7cf35f8c9aa98e7778b720f33b38bfbdedcdedb0047035259ab187517be971
+      checksum: 59bb7f5aea47ccea89b48cc323371fd87609592945ae8692f36063a635970e22
       filename: appsignal-x86_64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 4330f83a44db6f092b3f437d942204e9bf7f7022ae2cc24ade4e7b4137905d03
+      checksum: ce2d489170fdd84be1467d24e5c13782cf97912b3c7dbaaebe9e074d56e711a2
       filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
   aarch64-darwin:
     static:
-      checksum: a22cd07e656f194dd1921983be6507816b60c79bc0c4623d2cac5c88fda9d407
+      checksum: aa37596a85d65d46fc5bba25d4d059e98655709e6c44ee39e7c6ba72398ad704
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 0535e4506ccd2230dfa59fee5ba00ec6d3a2ff67693bf1b622e7a454fc1a5851
+      checksum: b40026410702c1bb3ac974c9648d464e0551956dc933deff22543f10cca81e46
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm64-darwin:
     static:
-      checksum: a22cd07e656f194dd1921983be6507816b60c79bc0c4623d2cac5c88fda9d407
+      checksum: aa37596a85d65d46fc5bba25d4d059e98655709e6c44ee39e7c6ba72398ad704
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 0535e4506ccd2230dfa59fee5ba00ec6d3a2ff67693bf1b622e7a454fc1a5851
+      checksum: b40026410702c1bb3ac974c9648d464e0551956dc933deff22543f10cca81e46
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   arm-darwin:
     static:
-      checksum: a22cd07e656f194dd1921983be6507816b60c79bc0c4623d2cac5c88fda9d407
+      checksum: aa37596a85d65d46fc5bba25d4d059e98655709e6c44ee39e7c6ba72398ad704
       filename: appsignal-aarch64-darwin-all-static.tar.gz
     dynamic:
-      checksum: 0535e4506ccd2230dfa59fee5ba00ec6d3a2ff67693bf1b622e7a454fc1a5851
+      checksum: b40026410702c1bb3ac974c9648d464e0551956dc933deff22543f10cca81e46
       filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
   aarch64-linux:
     static:
-      checksum: edf43f1a6b340c0afa07c7b71963def9bb68bd8d62d17cb64a7f7a36f84a4517
+      checksum: 12c5659d5a5d67ee641bdb1c38ef842b7687811fdec1f9edf8e196a2ed596405
       filename: appsignal-aarch64-linux-all-static.tar.gz
     dynamic:
-      checksum: 8390561e1a41e4b8bba8e4f92b9b49f957650eca21d281589143b9c3764f504e
+      checksum: 8301ab5f64af1c185860314682fbfd89027ea5e4850d8beb222613ca5455358a
       filename: appsignal-aarch64-linux-all-dynamic.tar.gz
   i686-linux:
     static:
-      checksum: 4179334f88dc32e00ce62aa196b3e47b4258b12ec48dd3cf722d4f6eeb4dc2c0
+      checksum: afebd51e26b8d21923a8adcbc8fda7bbd29d4e12573f53895e3a650fcd84ffd5
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 7c6bcc88e5d218c1986d1a9f1c9ad728c72e68a440656b2e9228d432ba300f86
+      checksum: e0ed425a1d92ad7e9beb83f5b7c896f8606773cc599337a198536a150ba76c51
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86-linux:
     static:
-      checksum: 4179334f88dc32e00ce62aa196b3e47b4258b12ec48dd3cf722d4f6eeb4dc2c0
+      checksum: afebd51e26b8d21923a8adcbc8fda7bbd29d4e12573f53895e3a650fcd84ffd5
       filename: appsignal-i686-linux-all-static.tar.gz
     dynamic:
-      checksum: 7c6bcc88e5d218c1986d1a9f1c9ad728c72e68a440656b2e9228d432ba300f86
+      checksum: e0ed425a1d92ad7e9beb83f5b7c896f8606773cc599337a198536a150ba76c51
       filename: appsignal-i686-linux-all-dynamic.tar.gz
   x86_64-linux:
     static:
-      checksum: d602823277cac752bdea742d928112cef457bc61ee05b960b316fc052f0cc714
+      checksum: 563eb5c9daeec67a760ac236b2848aee4ec0e39dca1368150a6d99844d4d665f
       filename: appsignal-x86_64-linux-all-static.tar.gz
     dynamic:
-      checksum: 2e9e955672dec266b408770638c0503a072410e03526b1eef2170326b083a42f
+      checksum: 74940f06f4c92582262014a9967f298bccee3ca94e3a490ddc40787573c91ed0
       filename: appsignal-x86_64-linux-all-dynamic.tar.gz
   x86_64-linux-musl:
     static:
-      checksum: dfbdff116339b99613fff6ed4092b772e58f0d3e667b7de347b4215fb7ea9d62
+      checksum: 2ecad2b2bdd362d9d871322eac79370d12314e3d32a53c83be17d054e91f188d
       filename: appsignal-x86_64-linux-musl-all-static.tar.gz
     dynamic:
-      checksum: 560835ec657b471d50c765a932385cd0e3b6bdca54d2a5e28b4203e43869cf3d
+      checksum: 5e4c4096ca7b0c7a97fe03f684c0678396c97f24c2065dc961081d022a8ad2a7
       filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
   x86_64-freebsd:
     static:
-      checksum: e31a7d89798193857247bd3590a554782fcff64b65d3da86d9c451d3147e961a
+      checksum: 2eaa4beeb3322ec3c6007f4a8ec483405f8ade4c372031a068bbedf05da9443d
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: e7f007cc385a23977ca93b58439dc720d703b7cc5929ef52a7acd59f74703b92
+      checksum: 4805995f0b10d4b5183e4a2430af19638372a4f290d95a123a0874b2f3878d8e
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
   amd64-freebsd:
     static:
-      checksum: e31a7d89798193857247bd3590a554782fcff64b65d3da86d9c451d3147e961a
+      checksum: 2eaa4beeb3322ec3c6007f4a8ec483405f8ade4c372031a068bbedf05da9443d
       filename: appsignal-x86_64-freebsd-all-static.tar.gz
     dynamic:
-      checksum: e7f007cc385a23977ca93b58439dc720d703b7cc5929ef52a7acd59f74703b92
+      checksum: 4805995f0b10d4b5183e4a2430af19638372a4f290d95a123a0874b2f3878d8e
       filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz

data/gemfiles/rails-7.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 7.0.0'
+gem "sidekiq"
+gem "rake", "> 12.2"
+
+gemspec :path => '../'

data/lib/appsignal/config.rb

@@ -370,7 +370,8 @@ module Appsignal
     def load_from_disk
       return if !config_file || !File.exist?(config_file)
 
-      configurations = YAML.load(ERB.new(IO.read(config_file)).result)
+      read_options = RUBY_VERSION >= "3.1.0" ? { :aliases => true } : {}
+      configurations = YAML.load(ERB.new(IO.read(config_file)).result, **read_options)
       config_for_this_env = configurations[env]
       if config_for_this_env
         config_for_this_env =

data/lib/appsignal/integrations/sidekiq.rb

@@ -158,7 +158,11 @@ module Appsignal
 
       # Based on: https://github.com/mperham/sidekiq/blob/63ee43353bd3b753beb0233f64865e658abeb1c3/lib/sidekiq/api.rb#L403-L412
       def safe_load(content, default)
-        yield(*YAML.load(content))
+        if RUBY_VERSION >= "3.1.0"
+          yield(*YAML.unsafe_load(content))
+        else
+          yield(*YAML.load(content))
+        end
       rescue => error
         # Sidekiq issue #1761: in dev mode, it's possible to have jobs enqueued
         # which haven't been loaded into memory yet so the YAML can't be

data/lib/appsignal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Appsignal
-  VERSION = "3.0.17".freeze
+  VERSION = "3.0.18".freeze
 end

data/spec/lib/appsignal/event_formatter_spec.rb

@@ -28,7 +28,7 @@ end
 
 class MockDependentFormatter < Appsignal::EventFormatter
   def initialize
-    NonsenseDependency.something
+    raise "There is an error"
   end
 
   def format(_payload)
@@ -72,7 +72,7 @@ describe Appsignal::EventFormatter do
         end
         expect(klass.registered?("mock.dependent")).to be_falsy
         expect(logs).to contains_log :error, \
-          "'uninitialized constant MockDependentFormatter::NonsenseDependency' " \
+          "'There is an error' " \
           "when initializing mock.dependent event formatter"
       end
     end

data/spec/lib/appsignal/hooks/activejob_spec.rb

@@ -64,6 +64,13 @@ if DependencyHelper.active_job_present?
         parameterized_expected_args
       ]
     end
+    let(:expected_perform_events) do
+      if DependencyHelper.rails_version >= Gem::Version.new("7.0.0")
+        ["perform.active_job", "perform_start.active_job"]
+      else
+        ["perform_start.active_job", "perform.active_job"]
+      end
+    end
     before do
       ActiveJob::Base.queue_adapter = :inline
 
@@ -119,7 +126,8 @@ if DependencyHelper.active_job_present?
       events = transaction_hash["events"]
         .sort_by { |e| e["start"] }
         .map { |event| event["name"] }
-      expect(events).to eq(["perform_start.active_job", "perform.active_job"])
+
+      expect(events).to eq(expected_perform_events)
     end
 
     context "with custom queue" do
@@ -208,7 +216,8 @@ if DependencyHelper.active_job_present?
         events = transaction_hash["events"]
           .sort_by { |e| e["start"] }
           .map { |event| event["name"] }
-        expect(events).to eq(["perform_start.active_job", "perform.active_job"])
+
+        expect(events).to eq(expected_perform_events)
       end
 
       if DependencyHelper.rails_version >= Gem::Version.new("5.0.0")
@@ -286,7 +295,8 @@ if DependencyHelper.active_job_present?
           .reject { |e| e["name"] == "enqueue.active_job" }
           .sort_by { |e| e["start"] }
           .map { |event| event["name"] }
-        expect(events).to eq(["perform_start.active_job", "perform.active_job"])
+
+        expect(events).to eq(expected_perform_events)
       end
     end
 
@@ -414,7 +424,7 @@ if DependencyHelper.active_job_present?
           expect(transaction_hash).to include(
             "action" => "ActionMailerTestJob#welcome",
             "sample_data" => hash_including(
-              "params" => ["ActionMailerTestJob", "welcome", "deliver_now"],
+              "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + active_job_args_wrapper,
               "tags" => {
                 "active_job_id" => kind_of(String),
                 "queue" => "mailers"
@@ -433,7 +443,7 @@ if DependencyHelper.active_job_present?
           expect(transaction_hash).to include(
             "action" => "ActionMailerTestJob#welcome",
             "sample_data" => hash_including(
-              "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + method_expected_args,
+              "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + active_job_args_wrapper(:args => method_expected_args),
               "tags" => {
                 "active_job_id" => kind_of(String),
                 "queue" => "mailers"
@@ -453,7 +463,7 @@ if DependencyHelper.active_job_present?
             expect(transaction_hash).to include(
               "action" => "ActionMailerTestJob#welcome",
               "sample_data" => hash_including(
-                "params" => ["ActionMailerTestJob", "welcome", "deliver_now", parameterized_expected_args],
+                "params" => ["ActionMailerTestJob", "welcome", "deliver_now"] + active_job_args_wrapper(:params => parameterized_expected_args),
                 "tags" => {
                   "active_job_id" => kind_of(String),
                   "queue" => "mailers"
@@ -587,5 +597,23 @@ if DependencyHelper.active_job_present?
         "_aj_symbol_keys"
       end
     end
+
+    def active_job_args_wrapper(args: [], params: nil)
+      if DependencyHelper.rails_version >= Gem::Version.new("7.0.0")
+        wrapped_args = {
+          "_aj_ruby2_keywords" => ["args"],
+          "args" => args
+        }
+
+        unless params.nil?
+          wrapped_args["params"] = params
+          wrapped_args["_aj_ruby2_keywords"] = ["params", "args"]
+        end
+
+        [wrapped_args]
+      else
+        params.nil? ? args : args + [params]
+      end
+    end
   end
 end

data/spec/lib/appsignal/integrations/padrino_spec.rb

@@ -98,7 +98,13 @@ if DependencyHelper.padrino_present?
         RSpec::Matchers.define :match_response do |expected_status, expected_content|
           match do |response|
             status, _headers, content = response
-            status == expected_status && content == [expected_content].compact
+            matches_content =
+              if expected_content.is_a?(Regexp)
+                content.join =~ expected_content
+              else
+                content == [expected_content].compact
+              end
+            status == expected_status && matches_content
           end
         end
 
@@ -142,7 +148,7 @@ if DependencyHelper.padrino_present?
               expect_a_transaction_to_be_created
               # Uses path for action name
               expect(transaction).to receive(:set_action_if_nil).with("PadrinoTestApp#unknown")
-              expect(response).to match_response(404, "GET /404")
+              expect(response).to match_response(404, %r{^GET /404})
             end
           end
 

data/spec/lib/appsignal/integrations/sidekiq_spec.rb

@@ -366,6 +366,16 @@ if DependencyHelper.active_job_present?
         }
       ]
     end
+    let(:expected_wrapped_args) do
+      if DependencyHelper.rails_version >= Gem::Version.new("7.0.0")
+        [{
+          "_aj_ruby2_keywords" => ["args"],
+          "args" => expected_args
+        }]
+      else
+        expected_args
+      end
+    end
     let(:expected_tags) do
       {}.tap do |hash|
         hash["active_job_id"] = kind_of(String)
@@ -374,6 +384,13 @@ if DependencyHelper.active_job_present?
         end
       end
     end
+    let(:expected_perform_events) do
+      if DependencyHelper.rails_version >= Gem::Version.new("7.0.0")
+        ["perform_job.sidekiq", "perform.active_job", "perform_start.active_job"]
+      else
+        ["perform_job.sidekiq", "perform_start.active_job", "perform.active_job"]
+      end
+    end
     before do
       start_agent
       Appsignal.logger = test_logger(log)
@@ -434,8 +451,8 @@ if DependencyHelper.active_job_present?
       events = transaction_hash["events"]
         .sort_by { |e| e["start"] }
         .map { |event| event["name"] }
-      expect(events)
-        .to eq(["perform_job.sidekiq", "perform_start.active_job", "perform.active_job"])
+
+      expect(events).to eq(expected_perform_events)
     end
 
     context "with error" do
@@ -467,8 +484,8 @@ if DependencyHelper.active_job_present?
         events = transaction_hash["events"]
           .sort_by { |e| e["start"] }
           .map { |event| event["name"] }
-        expect(events)
-          .to eq(["perform_job.sidekiq", "perform_start.active_job", "perform.active_job"])
+
+        expect(events).to eq(expected_perform_events)
       end
     end
 
@@ -490,7 +507,7 @@ if DependencyHelper.active_job_present?
         expect(transaction_hash).to include(
           "action" => "ActionMailerSidekiqTestJob#welcome",
           "sample_data" => hash_including(
-            "params" => ["ActionMailerSidekiqTestJob", "welcome", "deliver_now"] + expected_args
+            "params" => ["ActionMailerSidekiqTestJob", "welcome", "deliver_now"] + expected_wrapped_args
           )
         )
       end

data/spec/lib/appsignal/utils/data_spec.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 describe Appsignal::Utils::Data do
   describe ".generate" do
     subject { Appsignal::Utils::Data.generate(body) }

data/spec/lib/appsignal/utils/json_spec.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 describe Appsignal::Utils::JSON do
   describe ".generate" do
     subject { Appsignal::Utils::JSON.generate(body) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appsignal
 version: !ruby/object:Gem::Version
-  version: 3.0.17
+  version: 3.0.18
 platform: java
 authors:
 - Robert Beekman
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -185,6 +185,7 @@ files:
 - gemfiles/rails-5.1.gemfile
 - gemfiles/rails-5.2.gemfile
 - gemfiles/rails-6.0.gemfile
+- gemfiles/rails-7.0.gemfile
 - gemfiles/resque-1.gemfile
 - gemfiles/resque-2.gemfile
 - gemfiles/sequel-435.gemfile
@@ -435,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Logs performance and exception data from your app to appsignal.com