appsignal 3.4.0-java → 3.4.1-java

data/lib/appsignal/transaction.rb

@@ -4,11 +4,11 @@ require "json"
 
 module Appsignal
   class Transaction
-    HTTP_REQUEST   = "http_request".freeze
-    BACKGROUND_JOB = "background_job".freeze
-    ACTION_CABLE   = "action_cable".freeze
-    FRONTEND       = "frontend".freeze
-    BLANK          = "".freeze
+    HTTP_REQUEST   = "http_request"
+    BACKGROUND_JOB = "background_job"
+    ACTION_CABLE   = "action_cable"
+    FRONTEND       = "frontend"
+    BLANK          = ""
     ALLOWED_TAG_KEY_TYPES = [Symbol, String].freeze
     ALLOWED_TAG_VALUE_TYPES = [Symbol, String, Integer].freeze
     BREADCRUMB_LIMIT = 20
@@ -16,19 +16,21 @@ module Appsignal
     class << self
       def create(id, namespace, request, options = {})
         # Allow middleware to force a new transaction
-        if options.include?(:force) && options[:force]
-          Thread.current[:appsignal_transaction] = nil
-        end
+        Thread.current[:appsignal_transaction] = nil if options.include?(:force) && options[:force]
 
         # Check if we already have a running transaction
         if Thread.current[:appsignal_transaction].nil?
           # If not, start a new transaction
-          Thread.current[:appsignal_transaction] = Appsignal::Transaction.new(id, namespace, request, options)
+          Thread.current[:appsignal_transaction] =
+            Appsignal::Transaction.new(id, namespace, request, options)
         else
           # Otherwise, log the issue about trying to start another transaction
-          Appsignal.logger.warn_once_then_debug :transaction_id, "Trying to start new transaction with id " \
-            "'#{id}', but a transaction with id '#{current.transaction_id}' " \
-            "is already running. Using transaction '#{current.transaction_id}'."
+          Appsignal.logger.warn_once_then_debug(
+            :transaction_id,
+            "Trying to start new transaction with id " \
+              "'#{id}', but a transaction with id '#{current.transaction_id}' " \
+              "is already running. Using transaction '#{current.transaction_id}'."
+          )
 
           # And return the current transaction instead
           current
@@ -56,7 +58,9 @@ module Appsignal
       def complete_current!
         current.complete
       rescue => e
-        Appsignal.logger.error("Failed to complete transaction ##{current.transaction_id}. #{e.message}")
+        Appsignal.logger.error(
+          "Failed to complete transaction ##{current.transaction_id}. #{e.message}"
+        )
       ensure
         clear_current_transaction!
       end
@@ -68,7 +72,8 @@ module Appsignal
       end
     end
 
-    attr_reader :ext, :transaction_id, :action, :namespace, :request, :paused, :tags, :options, :discarded, :breadcrumbs
+    attr_reader :ext, :transaction_id, :action, :namespace, :request, :paused, :tags, :options,
+      :discarded, :breadcrumbs
 
     # @!attribute params
     #   Attribute for parameters of the transaction.
@@ -146,6 +151,7 @@ module Appsignal
 
     def params
       return @params if defined?(@params)
+
       request_params
     end
 
@@ -202,6 +208,7 @@ module Appsignal
     # @since 2.2.0
     def set_action(action)
       return unless action
+
       @action = action
       @ext.set_action(action)
     end
@@ -222,6 +229,7 @@ module Appsignal
     # @since 2.2.0
     def set_action_if_nil(action)
       return if @action
+
       set_action(action)
     end
 
@@ -242,12 +250,14 @@ module Appsignal
     # @since 2.2.0
     def set_namespace(namespace)
       return unless namespace
+
       @namespace = namespace
       @ext.set_namespace(namespace)
     end
 
     def set_http_or_background_action(from = request.params)
       return unless from
+
       group_and_action = [
         from[:controller] || from[:class],
         from[:action] || from[:method]
@@ -267,6 +277,7 @@ module Appsignal
     # @return [void]
     def set_queue_start(start)
       return unless start
+
       @ext.set_queue_start(start)
     rescue RangeError
       Appsignal.logger.warn("Queue start value #{start} is too big")
@@ -297,11 +308,13 @@ module Appsignal
 
     def set_metadata(key, value)
       return unless key && value
+
       @ext.set_metadata(key, value)
     end
 
     def set_sample_data(key, data)
       return unless key && data && (data.is_a?(Array) || data.is_a?(Hash))
+
       @ext.set_sample_data(
         key.to_s,
         Appsignal::Utils::Data.generate(data)
@@ -309,20 +322,24 @@ module Appsignal
     rescue RuntimeError => e
       begin
         inspected_data = data.inspect
-        Appsignal.logger.error("Error generating data (#{e.class}: #{e.message}) for '#{inspected_data}'")
+        Appsignal.logger.error(
+          "Error generating data (#{e.class}: #{e.message}) for '#{inspected_data}'"
+        )
       rescue => e
-        Appsignal.logger.error("Error generating data (#{e.class}: #{e.message}). Can't inspect data.")
+        Appsignal.logger.error(
+          "Error generating data (#{e.class}: #{e.message}). Can't inspect data."
+        )
       end
     end
 
     def sample_data
       {
-        :params       => sanitized_params,
-        :environment  => sanitized_environment,
+        :params => sanitized_params,
+        :environment => sanitized_environment,
         :session_data => sanitized_session_data,
-        :metadata     => metadata,
-        :tags         => sanitized_tags,
-        :breadcrumbs  => breadcrumbs
+        :metadata => metadata,
+        :tags => sanitized_tags,
+        :breadcrumbs => breadcrumbs
       }.each do |key, data|
         set_sample_data(key, data)
       end
@@ -348,11 +365,13 @@ module Appsignal
 
     def start_event
       return if paused?
+
       @ext.start_event(0)
     end
 
     def finish_event(name, title, body, body_format = Appsignal::EventFormatter::DEFAULT)
       return if paused?
+
       @ext.finish_event(
         name,
         title || BLANK,
@@ -364,6 +383,7 @@ module Appsignal
 
     def record_event(name, title, body, duration, body_format = Appsignal::EventFormatter::DEFAULT)
       return if paused?
+
       @ext.record_event(
         name,
         title || BLANK,
@@ -410,6 +430,7 @@ module Appsignal
     def background_queue_start
       env = environment
       return unless env
+
       queue_start = env[:queue_start]
       return unless queue_start
 
@@ -424,9 +445,11 @@ module Appsignal
     def http_queue_start
       env = environment
       return unless env
-      env_var = env["HTTP_X_QUEUE_START".freeze] || env["HTTP_X_REQUEST_START".freeze]
+
+      env_var = env["HTTP_X_QUEUE_START"] || env["HTTP_X_REQUEST_START"]
       return unless env_var
-      cleaned_value = env_var.tr("^0-9".freeze, "".freeze)
+
+      cleaned_value = env_var.tr("^0-9", "")
       return if cleaned_value.empty?
 
       value = cleaned_value.to_i
@@ -489,7 +512,8 @@ module Appsignal
     # @return [Hash<String, Object>]
     def sanitized_session_data
       return if !Appsignal.config[:send_session_data] ||
-          !request.respond_to?(:session)
+        !request.respond_to?(:session)
+
       session = request.session
       return unless session
 
@@ -555,7 +579,7 @@ module Appsignal
     # transaction, so that it's still safe to call methods on it if there is no
     # current transaction.
     class NilTransaction
-      def method_missing(m, *args, &block)
+      def method_missing(_method, *args, &block)
       end
 
       # Instrument should still yield

data/lib/appsignal/transmitter.rb

@@ -9,7 +9,7 @@ require "json"
 module Appsignal
   # @api private
   class Transmitter
-    CONTENT_TYPE = "application/json; charset=UTF-8".freeze
+    CONTENT_TYPE = "application/json; charset=UTF-8"
 
     HTTP_ERRORS = [
       EOFError,
@@ -84,7 +84,7 @@ module Appsignal
           if ca_file && File.exist?(ca_file) && File.readable?(ca_file)
             http.ca_file = ca_file
           else
-            config.logger.warn "Ignoring non-existing or unreadable "\
+            config.logger.warn "Ignoring non-existing or unreadable " \
               "`ca_file_path`: #{ca_file}"
           end
         end
@@ -97,11 +97,13 @@ module Appsignal
 
     def proxy_addr
       return unless config[:http_proxy]
+
       proxy_uri.host
     end
 
     def proxy_port
       return unless config[:http_proxy]
+
       proxy_uri.port
     end
   end

data/lib/appsignal/utils/deprecation_message.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Appsignal
   module Utils
     module DeprecationMessage

data/lib/appsignal/utils/hash_sanitizer.rb

@@ -4,7 +4,7 @@ module Appsignal
   module Utils
     # @api private
     class HashSanitizer
-      FILTERED = "[FILTERED]".freeze
+      FILTERED = "[FILTERED]"
 
       class << self
         def sanitize(value, filter_keys = [])

data/lib/appsignal/utils/integration_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Appsignal
   module Utils
     # Subclass of logger with method to only log a warning once
@@ -8,10 +10,10 @@ module Appsignal
       end
 
       def warn_once_then_debug(key, message)
-        if !seen_keys.add?(key).nil?
-          warn message
-        else
+        if seen_keys.add?(key).nil?
           debug message
+        else
+          warn message
         end
       end
     end

data/lib/appsignal/utils/json.rb

@@ -30,7 +30,7 @@ module Appsignal
 
         def encode_utf8(value)
           value.encode(
-            "utf-8".freeze,
+            "utf-8",
             :invalid => :replace,
             :undef   => :replace
           )

data/lib/appsignal/utils/query_params_sanitizer.rb

@@ -4,7 +4,7 @@ module Appsignal
   module Utils
     # @api private
     class QueryParamsSanitizer
-      REPLACEMENT_KEY = "?".freeze
+      REPLACEMENT_KEY = "?"
 
       module ClassMethods
         def sanitize(params, only_top_level = false, key_sanitizer = nil)

data/lib/appsignal/version.rb

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

data/lib/appsignal.rb

@@ -99,13 +99,13 @@ module Appsignal
 
       @config ||= Config.new(
         Dir.pwd,
-        ENV["APPSIGNAL_APP_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"]
+        ENV["APPSIGNAL_APP_ENV"] || ENV["RAILS_ENV"] || ENV.fetch("RACK_ENV", nil)
       )
 
       if config.valid?
         logger.level = config.log_level
         if config.active?
-          logger.info "Starting AppSignal #{Appsignal::VERSION} "\
+          logger.info "Starting AppSignal #{Appsignal::VERSION} " \
             "(#{$PROGRAM_NAME}, Ruby #{RUBY_VERSION}, #{RUBY_PLATFORM})"
           config.write_to_environment
           Appsignal::Extension.start
@@ -152,6 +152,7 @@ module Appsignal
 
     def forked
       return unless active?
+
       Appsignal.start_logger
       logger.debug("Forked process, resubscribing and restarting extension")
       Appsignal::Extension.start
@@ -186,7 +187,7 @@ module Appsignal
     def log_formatter(prefix = nil)
       pre = "#{prefix}: " if prefix
       proc do |severity, datetime, _progname, msg|
-        "[#{datetime.strftime("%Y-%m-%dT%H:%M:%S")} (process) "\
+        "[#{datetime.strftime("%Y-%m-%dT%H:%M:%S")} (process) " \
           "##{Process.pid}][#{severity}] #{pre}#{msg}\n"
       end
     end
@@ -249,7 +250,7 @@ module Appsignal
     # @return [Boolean]
     # @since 0.2.7
     def active?
-      config && config.active? && extension_loaded?
+      config&.active? && extension_loaded?
     end
 
     private

data/lib/puma/plugin/appsignal.rb

@@ -17,23 +17,21 @@ Puma::Plugin.create do # rubocop:disable Metrics/BlockLength
       plugin = AppsignalPumaPlugin.new
 
       loop do
-        begin
-          # Implement similar behavior to minutely probes.
-          # Initial sleep to wait until the app is fully initalized.
-          # Then loop every 60 seconds and collect the Puma stats as AppSignal
-          # metrics.
-          sleep sleep_time
-
-          log_debug "AppSignal: Collecting Puma stats."
-          stats = fetch_puma_stats
-          if stats
-            plugin.call(stats)
-          else
-            log_debug "AppSignal: No Puma stats to report."
-          end
-        rescue StandardError => error
-          log_error "Error while processing metrics.", error
+        # Implement similar behavior to minutely probes.
+        # Initial sleep to wait until the app is fully initalized.
+        # Then loop every 60 seconds and collect the Puma stats as AppSignal
+        # metrics.
+        sleep sleep_time
+
+        log_debug "AppSignal: Collecting Puma stats."
+        stats = fetch_puma_stats
+        if stats
+          plugin.call(stats)
+        else
+          log_debug "AppSignal: No Puma stats to report."
         end
+      rescue StandardError => error
+        log_error "Error while processing metrics.", error
       end
     end
   end
@@ -119,7 +117,7 @@ class AppsignalPumaPlugin
   def fetch_hostname
     # Configure hostname as reported for the Puma metrics with the
     # APPSIGNAL_HOSTNAME environment variable.
-    env_hostname = ENV["APPSIGNAL_HOSTNAME"]
+    env_hostname = ENV.fetch("APPSIGNAL_HOSTNAME", nil)
     return env_hostname if env_hostname
 
     # Auto detect hostname as fallback. May be inaccurate.
@@ -162,7 +160,7 @@ class AppsignalPumaPlugin
       socket = UDPSocket.new
       socket.send(data, 0, host, port)
     ensure
-      socket && socket.close
+      socket&.close
     end
   end
 end

data/script/lint_git

@@ -2,7 +2,7 @@
 
 set -eu
 
-LINTJE_VERSION="0.7.1"
+LINTJE_VERSION="0.11.3"
 
 mkdir -p "$HOME/bin"
 cache_key=v1-lintje-$LINTJE_VERSION

data/spec/lib/appsignal/capistrano2_spec.rb

@@ -148,7 +148,8 @@ if DependencyHelper.capistrano2_present?
             run
 
             expect(output).to include \
-              "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman",
+              "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005," \
+                " user: batman",
               "AppSignal has been notified of this deploy!"
           end
 
@@ -175,7 +176,8 @@ if DependencyHelper.capistrano2_present?
 
             it "transmits the overriden deploy user" do
               expect(output).to include \
-                "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: robin",
+                "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005," \
+                  " user: robin",
                 "AppSignal has been notified of this deploy!"
             end
           end
@@ -188,7 +190,8 @@ if DependencyHelper.capistrano2_present?
 
             it "does not transmit marker" do
               expect(output).to include \
-                "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman",
+                "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005," \
+                  " user: batman",
                 "Something went wrong while trying to notify AppSignal:"
               expect(output).to_not include "AppSignal has been notified of this deploy!"
             end

data/spec/lib/appsignal/capistrano3_spec.rb

@@ -160,7 +160,8 @@ if DependencyHelper.capistrano3_present?
             run
 
             expect(output).to include \
-              "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman",
+              "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, " \
+                "user: batman",
               "AppSignal has been notified of this deploy!"
           end
 
@@ -187,7 +188,8 @@ if DependencyHelper.capistrano3_present?
 
             it "transmits the overriden deploy user" do
               expect(output).to include \
-                "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: robin",
+                "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, " \
+                  "user: robin",
                 "AppSignal has been notified of this deploy!"
             end
           end
@@ -213,7 +215,8 @@ if DependencyHelper.capistrano3_present?
 
             it "does not transmit marker" do
               expect(output).to include \
-                "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, user: batman",
+                "Notifying AppSignal of deploy with: revision: 503ce0923ed177a3ce000005, " \
+                  "user: batman",
                 "Something went wrong while trying to notify AppSignal:"
               expect(output).to_not include "AppSignal has been notified of this deploy!"
             end

data/spec/lib/appsignal/cli/diagnose/utils_spec.rb

@@ -46,9 +46,7 @@ describe Appsignal::CLI::Diagnose::Utils do
     let(:bytes_to_read) { 100 }
     subject { described_class.read_file_content(path, bytes_to_read) }
     before do
-      File.open path, "w+" do |f|
-        f.write file_contents
-      end
+      File.write(path, file_contents)
     end
 
     context "when file is bigger than read size" do

data/spec/lib/appsignal/cli/diagnose_spec.rb

@@ -2,7 +2,8 @@ require "bundler/cli"
 require "bundler/cli/common"
 require "appsignal/cli"
 
-describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_input, :color => false do
+describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_input,
+  :color => false do
   include CLIHelpers
 
   class DiagnosticsReportEndpoint
@@ -268,7 +269,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           },
           "build" => {
             "time" => kind_of(String),
-            "package_path" => File.expand_path("../../../../../", __FILE__),
+            "package_path" => File.expand_path("../../../..", __dir__),
             "architecture" => Appsignal::System.agent_architecture,
             "target" => Appsignal::System.agent_platform,
             "musl_override" => false,
@@ -319,7 +320,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         before do
           allow(File).to receive(:read).and_call_original
           expect(File).to receive(:read)
-            .with(File.expand_path("../../../../../ext/install.report", __FILE__))
+            .with(File.expand_path("../../../../ext/install.report", __dir__))
             .and_return(
               JSON.generate(
                 "result" => {
@@ -359,7 +360,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         before do
           allow(File).to receive(:read).and_call_original
           expect(File).to receive(:read)
-            .with(File.expand_path("../../../../../ext/install.report", __FILE__))
+            .with(File.expand_path("../../../../ext/install.report", __dir__))
             .and_raise(error)
         end
 
@@ -389,7 +390,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         before do
           allow(File).to receive(:read).and_call_original
           expect(File).to receive(:read)
-            .with(File.expand_path("../../../../../ext/install.report", __FILE__))
+            .with(File.expand_path("../../../../ext/install.report", __dir__))
             .and_return(raw_report)
         end
 
@@ -839,7 +840,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
             let(:options) { { :environment => "development" } }
             before do
               ENV["APPSIGNAL_APP_ENV"] = "production"
-              config.instance_variable_set(:@env, ENV["APPSIGNAL_APP_ENV"])
+              config.instance_variable_set(:@env, ENV.fetch("APPSIGNAL_APP_ENV", nil))
               stub_api_request(config, "auth").to_return(:status => 200)
               capture_diagnatics_report_request
               run
@@ -847,10 +848,10 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
 
             it "outputs a list of sources with their values" do
               expect(output).to include(
-                %(  environment: "production"\n) +
-                %(    Sources:\n) +
-                %(      initial: "development"\n) +
-                %(      env:     "production"\n)
+                "  environment: \"production\"\n" \
+                  "    Sources:\n" \
+                  "      initial: \"development\"\n" \
+                  "      env:     \"production\"\n"
               )
             end
           end
@@ -882,7 +883,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           context "when the source is multiple sources" do
             before do
               ENV["APPSIGNAL_APP_NAME"] = "MyApp"
-              config[:name] = ENV["APPSIGNAL_APP_NAME"]
+              config[:name] = ENV.fetch("APPSIGNAL_APP_NAME", nil)
               stub_api_request(config, "auth").to_return(:status => 200)
               capture_diagnatics_report_request
               run
@@ -891,20 +892,20 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
             if DependencyHelper.rails_present?
               it "outputs a list of sources with their values" do
                 expect(output).to include(
-                  %(  name: "MyApp"\n) +
-                  %(    Sources:\n) +
-                  %(      initial: "MyApp"\n) +
-                  %(      file:    "TestApp"\n) +
-                  %(      env:     "MyApp"\n)
+                  "  name: \"MyApp\"\n" \
+                    "    Sources:\n" \
+                    "      initial: \"MyApp\"\n" \
+                    "      file:    \"TestApp\"\n" \
+                    "      env:     \"MyApp\"\n"
                 )
               end
             else
               it "outputs a list of sources with their values" do
                 expect(output).to include(
-                  %(  name: "MyApp"\n) +
-                  %(    Sources:\n) +
-                  %(      file: "TestApp"\n) +
-                  %(      env:  "MyApp"\n)
+                  "  name: \"MyApp\"\n" \
+                    "    Sources:\n" \
+                    "      file: \"TestApp\"\n" \
+                    "      env:  \"MyApp\"\n"
                 )
               end
             end
@@ -928,7 +929,9 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
             "sources" => {
               "default" => hash_with_string_keys(Appsignal::Config::DEFAULT_CONFIG),
               "system" => {},
-              "initial" => hash_with_string_keys(config.initial_config.merge(additional_initial_config)),
+              "initial" => hash_with_string_keys(
+                config.initial_config.merge(additional_initial_config)
+              ),
               "file" => hash_with_string_keys(config.file_config),
               "env" => {},
               "override" => { "send_session_data" => true }
@@ -1047,18 +1050,16 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
         it "outputs failure with status code" do
           expect(output).to include "Validation",
             "Validating Push API key: Failed to validate: status 500\n" +
-            %("Could not confirm authorization: 500")
+              %("Could not confirm authorization: 500")
         end
 
         context "with color", :color => true do
           it "outputs error in color" do
             expect(output).to include "Validation",
-              "Validating Push API key: " +
-              colorize(
-                "Failed to validate: status 500\n" +
-                %("Could not confirm authorization: 500"),
+              "Validating Push API key: #{colorize(
+                %(Failed to validate: status 500\n"Could not confirm authorization: 500"),
                 :red
-              )
+              )}"
           end
         end
 
@@ -1280,7 +1281,7 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           it "outputs ownership" do
             expect(output).to include \
               %(Root path\n    Path: "#{root_path}"\n    Writable?: true\n    ) \
-                "Ownership?: true (file: #{process_user}:#{Process.uid}, "\
+                "Ownership?: true (file: #{process_user}:#{Process.uid}, " \
                 "process: #{process_user}:#{Process.uid})"
           end
 
@@ -1414,7 +1415,9 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
           let(:filename) { "appsignal.log" }
           before do
             ENV["APPSIGNAL_LOG"] = "stdout"
-            expect_any_instance_of(Appsignal::Config).to receive(:log_file_path).at_least(:once).and_return(file_path)
+            expect_any_instance_of(Appsignal::Config).to receive(:log_file_path)
+              .at_least(:once)
+              .and_return(file_path)
           end
         end
 
@@ -1442,6 +1445,6 @@ describe Appsignal::CLI::Diagnose, :api_stub => true, :send_report => :yes_cli_i
   end
 
   def hash_with_string_keys(hash)
-    Hash[hash.map { |key, value| [key.to_s, value] }]
+    hash.transform_keys(&:to_s)
   end
 end