appsignal 3.0.16-java → 3.0.20-java

data/CHANGELOG.md

@@ -1,5 +1,42 @@
 # AppSignal for Ruby gem Changelog
 
+## 3.0.20
+
+### Added
+
+- [35bd83b8](https://github.com/appsignal/appsignal-ruby/commit/35bd83b84fd30f0188d9f134cfd249360b6e281d) patch - Add `send_session_data` option to configure if session data is automatically included transactions. By default this is turned on. It can be disabled by configuring `send_session_data` to `false`.
+
+### Deprecated
+
+- [35bd83b8](https://github.com/appsignal/appsignal-ruby/commit/35bd83b84fd30f0188d9f134cfd249360b6e281d) patch - Deprecate `skip_session_data` option in favor of the newly introduced `send_session_data` option. If it is configured it will print a warning on AppSignal load, but will also retain its functionality until the config option is fully removed in the next major release.
+- [e51a8fb6](https://github.com/appsignal/appsignal-ruby/commit/e51a8fb653fccc5a6b72ac7af9c9417e6827e2e9) patch - Warn about the deprecated `working_dir_path` option from all config sources. It previously only printed a warning when it was configured in the `config/appsignal.yml` file, but now also prints the warning if it's set via the Config class initialize options and environment variables. Please use the `working_directory_path` option instead.
+
+### Fixed
+
+- [c9000eee](https://github.com/appsignal/appsignal-ruby/commit/c9000eeefec722cb940b2e14f37d31a7827986d6) patch - Fix reported Ruby version in diagnose report. It would report only the first major release of the series, e.g. 2.6.0 for 2.6.1.
+
+## 3.0.19
+
+### Changed
+
+- [2587eae3](https://github.com/appsignal/appsignal-ruby/commit/2587eae30f17e0f0b5e27cb61982301220cc77b1) patch - Store the extension install report as JSON, instead of YAML. Reduces internal complexity.
+
+### Fixed
+
+- [243c1ed4](https://github.com/appsignal/appsignal-ruby/commit/243c1ed444f3351ca158200a47836673f851cb31) patch - Improve compatibility with the sequel-rails gem by tracking the performed SQL query in instrumentation events.
+
+## 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
+
+- [f9d57752](https://github.com/appsignal/appsignal-ruby/commit/f9d5775217400c59a70d98e9aa96e3dcd06cb1f9) patch - Use the `log_level` option for the Ruby gem logger. Previously it only configured the extension and agent loggers. Also fixes the `debug` and `transaction_debug_mode` option if no `log_level` is configured by the app.
+
 ## 3.0.16
 
 ### Added

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,8 @@ matrix:
       - "no_dependencies"
       - "rails-5.2"
       - "rails-6.0"
+      - "rails-6.1"
+      - "rails-7.0"
 
   ruby:
     - ruby: "2.0.0-p648"
@@ -184,9 +186,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 +207,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 +241,36 @@ matrix:
           - "2.2.10"
           - "2.3.8"
           - "2.4.10"
+          - "3.1.0"
+    - gem: "rails-6.1"
+      exclude:
+        ruby:
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+    - gem: "rails-7.0"
+      exclude:
+        ruby:
+          - "2.1.10"
+          - "2.2.10"
+          - "2.3.8"
+          - "2.4.10"
+          - "2.5.8"
+          - "2.6.9"
+          - "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/ext/base.rb

@@ -2,6 +2,7 @@ require "digest"
 require "fileutils"
 require "open-uri"
 require "zlib"
+require "json"
 require "yaml"
 require "rubygems/package"
 require File.expand_path("../../lib/appsignal/version.rb", __FILE__)
@@ -30,7 +31,7 @@ def report
         },
         "language" => {
           "name" => "ruby",
-          "version" => "#{rbconfig["ruby_version"]}-p#{rbconfig["PATCHLEVEL"]}"
+          "version" => "#{rbconfig["RUBY_PROGRAM_VERSION"]}-p#{rbconfig["PATCHLEVEL"]}"
         },
         "download" => {
           "checksum" => "unverified",
@@ -60,7 +61,7 @@ end
 
 def write_report
   File.open(File.join(EXT_PATH, "install.report"), "w") do |file|
-    file.write YAML.dump(report)
+    file.write JSON.generate(report)
   end
 end
 

data/gemfiles/rails-6.1.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "net-smtp", require: false
+gem "sidekiq"
+
+gemspec :path => "../"

data/gemfiles/rails-7.0.gemfile

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

data/lib/appsignal/cli/diagnose/utils.rb

@@ -32,20 +32,6 @@ module Appsignal
 
           IO.binread(path, length, offset)
         end
-
-        def self.parse_yaml(contents)
-          if YAML.respond_to? :safe_load
-            if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.6.0")
-              # Use keyword params for Ruby 2.6 and up
-              YAML.safe_load(contents, :permitted_classes => [Time])
-            else
-              YAML.safe_load(contents, [Time])
-            end
-          else
-            # Support for Ruby versions without YAML.safe_load
-            YAML.load(contents) # rubocop:disable Security/YAMLLoad
-          end
-        end
       end
     end
   end

data/lib/appsignal/cli/diagnose.rb

@@ -352,8 +352,8 @@ module Appsignal
         def fetch_installation_report
           path = File.expand_path("../../../../ext/install.report", __FILE__)
           raw_report = File.read(path)
-          Utils.parse_yaml(raw_report)
-        rescue StandardError, Psych::SyntaxError => e # rubocop:disable Lint/ShadowedException
+          JSON.parse(raw_report)
+        rescue StandardError, JSON::ParserError => e # rubocop:disable Lint/ShadowedException
           {
             "parsing_error" => {
               "error" => "#{e.class}: #{e}",
@@ -411,7 +411,7 @@ module Appsignal
         def print_installation_build_report(report)
           report = report.fetch("build", {})
           puts "  Build details"
-          puts_format "Install time", report["time"].to_s, :level => 2
+          puts_format "Install time", report["time"], :level => 2
           puts_format "Architecture", report["architecture"], :level => 2
           puts_format "Target", report["target"], :level => 2
           puts_format "Musl override", report["musl_override"], :level => 2
@@ -443,7 +443,7 @@ module Appsignal
             save :os, os
             puts_value "Operating System", os_label
 
-            language_version = "#{rbconfig["ruby_version"]}-p#{rbconfig["PATCHLEVEL"]}"
+            language_version = "#{rbconfig["RUBY_PROGRAM_VERSION"]}-p#{rbconfig["PATCHLEVEL"]}"
             save :language_version, language_version
             puts_format "Ruby version", language_version
 

data/lib/appsignal/config.rb

@@ -30,7 +30,6 @@ module Appsignal
       :instrument_redis               => true,
       :instrument_sequel              => true,
       :log                            => "file",
-      :log_level                      => "info",
       :request_headers                => %w[
         HTTP_ACCEPT HTTP_ACCEPT_CHARSET HTTP_ACCEPT_ENCODING
         HTTP_ACCEPT_LANGUAGE HTTP_CACHE_CONTROL HTTP_CONNECTION
@@ -40,10 +39,23 @@ module Appsignal
       ],
       :send_environment_metadata      => true,
       :send_params                    => true,
-      :skip_session_data              => false,
       :transaction_debug_mode         => false
     }.freeze
 
+    # @api private
+    DEFAULT_LOG_LEVEL = Logger::INFO
+    # Map from the `log_level` config option to Ruby's Logger level value.
+    #
+    # The trace level doesn't exist in the Ruby logger so it's mapped to debug.
+    # @api private
+    LOG_LEVEL_MAP = {
+      "error" => Logger::ERROR,
+      "warn" => Logger::WARN,
+      "info" => Logger::INFO,
+      "debug" => Logger::DEBUG,
+      "trace" => Logger::DEBUG
+    }.freeze
+
     ENV_TO_KEY_MAPPING = {
       "APPSIGNAL_ACTIVE"                         => :active,
       "APPSIGNAL_APP_NAME"                       => :name,
@@ -75,6 +87,7 @@ module Appsignal
       "APPSIGNAL_RUNNING_IN_CONTAINER"           => :running_in_container,
       "APPSIGNAL_SEND_ENVIRONMENT_METADATA"      => :send_environment_metadata,
       "APPSIGNAL_SEND_PARAMS"                    => :send_params,
+      "APPSIGNAL_SEND_SESSION_DATA"              => :send_session_data,
       "APPSIGNAL_SKIP_SESSION_DATA"              => :skip_session_data,
       "APPSIGNAL_TRANSACTION_DEBUG_MODE"         => :transaction_debug_mode,
       "APPSIGNAL_WORKING_DIRECTORY_PATH"         => :working_directory_path,
@@ -112,6 +125,7 @@ module Appsignal
       APPSIGNAL_RUNNING_IN_CONTAINER
       APPSIGNAL_SEND_ENVIRONMENT_METADATA
       APPSIGNAL_SEND_PARAMS
+      APPSIGNAL_SEND_SESSION_DATA
       APPSIGNAL_SKIP_SESSION_DATA
       APPSIGNAL_TRANSACTION_DEBUG_MODE
     ].freeze
@@ -217,6 +231,8 @@ module Appsignal
       # Load config from environment variables
       @env_config = load_from_environment
       merge(env_config)
+      # Handle deprecated config options
+      maintain_backwards_compatibility
       # Validate that we have a correct config
       validate
       # Track origin of env
@@ -242,6 +258,18 @@ module Appsignal
       config_hash[key] = value
     end
 
+    def log_level
+      if config_hash[:debug] || config_hash[:transaction_debug_mode]
+        level = Logger::DEBUG
+      end
+      option = config_hash[:log_level]
+      if option
+        log_level_option = LOG_LEVEL_MAP[option]
+        level = log_level_option if log_level_option
+      end
+      level.nil? ? Appsignal::Config::DEFAULT_LOG_LEVEL : level
+    end
+
     def log_file_path
       path = config_hash[:log_path] || root_path && File.join(root_path, "log")
       if path && File.writable?(path)
@@ -345,15 +373,13 @@ 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 =
-          config_for_this_env.each_with_object({}) do |(key, value), hash|
-            hash[key.to_sym] = value # convert keys to symbols
-          end
-
-        maintain_backwards_compatibility(config_for_this_env)
+        config_for_this_env.each_with_object({}) do |(key, value), hash|
+          hash[key.to_sym] = value # convert keys to symbols
+        end
       else
         logger.error "Not loading from config file: config for '#{env}' not found"
         nil
@@ -368,19 +394,38 @@ module Appsignal
       nil
     end
 
-    # Maintain backwards compatibility with config files generated by earlier
-    # versions of the gem
+    # Maintain backwards compatibility with deprecated config options.
+    #
+    # Add deprecated config options here with the behavior of setting its
+    # replacement, if the replacement option is not configured by the user.
     #
-    # Used by {#load_from_disk}. No compatibility for env variables or initial config currently.
-    def maintain_backwards_compatibility(configuration)
-      configuration.tap do |config|
-        if config.include?(:working_dir_path)
-          deprecation_message \
-            "'working_dir_path' is deprecated, please use " \
-            "'working_directory_path' instead and specify the " \
-            "full path to the working directory",
-            logger
+    # Make sure to remove the contents of this method in the next major
+    # version, but the method itself with an empty body can stick around as a
+    # structure for future deprecations.
+    def maintain_backwards_compatibility
+      skip_session_data = config_hash[:skip_session_data]
+      send_session_data = config_hash[:send_session_data]
+      if skip_session_data.nil? # Deprecated option is not set
+        if send_session_data.nil? # Not configured by user
+          @system_config[:send_session_data] = true
+          merge(:send_session_data => true) # Set default value
         end
+      else
+        if send_session_data.nil? # Not configured by user
+          @system_config[:send_session_data] = !skip_session_data
+          merge(:send_session_data => !skip_session_data)
+        end
+        deprecation_message "The `skip_session_data` config option is " \
+          "deprecated. Please use `send_session_data` instead.",
+          logger
+      end
+
+      if config_hash.key?(:working_dir_path) # rubocop:disable Style/GuardClause
+        deprecation_message \
+          "The `working_dir_path` option is deprecated, please use " \
+          "`working_directory_path` instead and specify the " \
+          "full path to the working directory",
+          logger
       end
     end
 

data/lib/appsignal/event_formatter/sequel/sql_formatter.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Appsignal
+  class EventFormatter
+    # @api private
+    module Sequel
+      # Compatability with the sequel-rails gem.
+      # The sequel-rails gem adds its own ActiveSupport::Notifications events
+      # that conflict with our own sequel instrumentor. Without this event
+      # formatter the sequel-rails events are recorded without the SQL query
+      # that's being executed.
+      class SqlFormatter
+        def format(payload)
+          [payload[:name].to_s, payload[:sql], SQL_BODY_FORMAT]
+        end
+      end
+    end
+  end
+end
+
+Appsignal::EventFormatter.register(
+  "sql.sequel",
+  Appsignal::EventFormatter::Sequel::SqlFormatter
+)

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/system.rb

@@ -106,9 +106,5 @@ module Appsignal
     def self.jruby?
       RUBY_PLATFORM == "java"
     end
-
-    def self.ruby_2_7_or_newer?
-      RUBY_VERSION > "2.7"
-    end
   end
 end

data/lib/appsignal/transaction.rb

@@ -476,12 +476,12 @@ module Appsignal
     #
     # The session data is sanitized by the {Appsignal::Utils::HashSanitizer}.
     #
-    # @return [nil] if `:skip_session_data` config is set to `true`.
+    # @return [nil] if `:send_session_data` config is set to `false`.
     # @return [nil] if the {#request} object doesn't respond to `#session`.
     # @return [nil] if the {#request} session data is `nil`.
     # @return [Hash<String, Object>]
     def sanitized_session_data
-      return if Appsignal.config[:skip_session_data] ||
+      return if !Appsignal.config[:send_session_data] ||
           !request.respond_to?(:session)
       session = request.session
       return unless session

data/lib/appsignal/version.rb

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

data/lib/appsignal.rb

@@ -116,12 +116,7 @@ module Appsignal
       )
 
       if config.valid?
-        logger.level =
-          if config[:debug]
-            Logger::DEBUG
-          else
-            Logger::INFO
-          end
+        logger.level = config.log_level
         if config.active?
           logger.info "Starting AppSignal #{Appsignal::VERSION} "\
             "(#{$PROGRAM_NAME}, Ruby #{RUBY_VERSION}, #{RUBY_PLATFORM})"
@@ -230,12 +225,11 @@ module Appsignal
       end
 
       logger.level =
-        if config && config[:debug]
-          Logger::DEBUG
+        if config
+          config.log_level
         else
-          Logger::INFO
+          Appsignal::Config::DEFAULT_LOG_LEVEL
         end
-
       logger << @in_memory_log.string if @in_memory_log
     end