appsignal 3.4.0-java → 3.4.2-java

data/lib/appsignal/helpers/instrumentation.rb

@@ -57,14 +57,14 @@ module Appsignal
       #   re-raised by this method.
       # @return [Object] the value of the given block is returned.
       # @since 0.10.0
-      def monitor_transaction(name, env = {})
+      def monitor_transaction(name, env = {}, &block)
         # Always verify input, even when Appsignal is not active.
         # This makes it more likely invalid arguments get flagged in test/dev
         # environments.
-        if name.start_with?("perform_job".freeze)
+        if name.start_with?("perform_job")
           namespace = Appsignal::Transaction::BACKGROUND_JOB
           request   = Appsignal::Transaction::GenericRequest.new(env)
-        elsif name.start_with?("process_action".freeze)
+        elsif name.start_with?("process_action")
           namespace = Appsignal::Transaction::HTTP_REQUEST
           request   = ::Rack::Request.new(env)
         else
@@ -82,9 +82,7 @@ module Appsignal
           request
         )
         begin
-          Appsignal.instrument(name) do
-            yield
-          end
+          Appsignal.instrument(name, &block)
         rescue Exception => error # rubocop:disable Lint/RescueException
           transaction.set_error(error)
           raise error
@@ -211,21 +209,21 @@ module Appsignal
           call_location = caller(1..1).first
           deprecation_message \
             "The tags argument for `Appsignal.send_error` is deprecated. " \
-            "Please use the block method to set tags instead.\n\n" \
-            "  Appsignal.send_error(error) do |transaction|\n" \
-            "    transaction.set_tags(#{tags})\n" \
-            "  end\n\n" \
-            "Appsignal.send_error called on location: #{call_location}"
+              "Please use the block method to set tags instead.\n\n" \
+              "  Appsignal.send_error(error) do |transaction|\n" \
+              "    transaction.set_tags(#{tags})\n" \
+              "  end\n\n" \
+              "Appsignal.send_error called on location: #{call_location}"
         end
         if namespace
           call_location = caller(1..1).first
           deprecation_message \
             "The namespace argument for `Appsignal.send_error` is deprecated. " \
-            "Please use the block method to set the namespace instead.\n\n" \
-            "  Appsignal.send_error(error) do |transaction|\n" \
-            "    transaction.set_namespace(#{namespace.inspect})\n" \
-            "  end\n\n" \
-            "Appsignal.send_error called on location: #{call_location}"
+              "Please use the block method to set the namespace instead.\n\n" \
+              "  Appsignal.send_error(error) do |transaction|\n" \
+              "    transaction.set_namespace(#{namespace.inspect})\n" \
+              "  end\n\n" \
+              "Appsignal.send_error called on location: #{call_location}"
         end
         return unless active?
 
@@ -304,21 +302,21 @@ module Appsignal
           call_location = caller(1..1).first
           deprecation_message \
             "The tags argument for `Appsignal.set_error` is deprecated. " \
-            "Please use the block method to set tags instead.\n\n" \
-            "  Appsignal.set_error(error) do |transaction|\n" \
-            "    transaction.set_tags(#{tags})\n" \
-            "  end\n\n" \
-            "Appsignal.set_error called on location: #{call_location}"
+              "Please use the block method to set tags instead.\n\n" \
+              "  Appsignal.set_error(error) do |transaction|\n" \
+              "    transaction.set_tags(#{tags})\n" \
+              "  end\n\n" \
+              "Appsignal.set_error called on location: #{call_location}"
         end
         if namespace
           call_location = caller(1..1).first
           deprecation_message \
             "The namespace argument for `Appsignal.set_error` is deprecated. " \
-            "Please use the block method to set the namespace instead.\n\n" \
-            "  Appsignal.set_error(error) do |transaction|\n" \
-            "    transaction.set_namespace(#{namespace.inspect})\n" \
-            "  end\n\n" \
-            "Appsignal.set_error called on location: #{call_location}"
+              "Please use the block method to set the namespace instead.\n\n" \
+              "  Appsignal.set_error(error) do |transaction|\n" \
+              "    transaction.set_namespace(#{namespace.inspect})\n" \
+              "  end\n\n" \
+              "Appsignal.set_error called on location: #{call_location}"
         end
         unless exception.is_a?(Exception)
           logger.error "Appsignal.set_error: Cannot set error. The given " \
@@ -360,8 +358,9 @@ module Appsignal
       # @since 2.2.0
       def set_action(action)
         return if !active? ||
-            !Appsignal::Transaction.current? ||
-            action.nil?
+          !Appsignal::Transaction.current? ||
+          action.nil?
+
         Appsignal::Transaction.current.set_action(action)
       end
 
@@ -399,8 +398,9 @@ module Appsignal
       # @since 2.2.0
       def set_namespace(namespace)
         return if !active? ||
-            !Appsignal::Transaction.current? ||
-            namespace.nil?
+          !Appsignal::Transaction.current? ||
+          namespace.nil?
+
         Appsignal::Transaction.current.set_namespace(namespace)
       end
 
@@ -454,9 +454,24 @@ module Appsignal
       # Only the last 20 added breadcrumbs will be saved.
       #
       # @example
-      #   Appsignal.add_breadcrumb("Navigation", "http://blablabla.com", "", { :response => 200 }, Time.now.utc)
-      #   Appsignal.add_breadcrumb("Network", "[GET] http://blablabla.com", "", { :response => 500 })
-      #   Appsignal.add_breadcrumb("UI", "closed modal(change_password)", "User closed modal without actions")
+      #   Appsignal.add_breadcrumb(
+      #     "Navigation",
+      #     "http://blablabla.com",
+      #     "",
+      #     { :response => 200 },
+      #     Time.now.utc
+      #   )
+      #   Appsignal.add_breadcrumb(
+      #     "Network",
+      #     "[GET] http://blablabla.com",
+      #     "",
+      #     { :response => 500 }
+      #   )
+      #   Appsignal.add_breadcrumb(
+      #     "UI",
+      #     "closed modal(change_password)",
+      #     "User closed modal without actions"
+      #   )
       #
       # @param category [String] category of breadcrumb
       #   e.g. "UI", "Network", "Navigation", "Console".
@@ -583,10 +598,10 @@ module Appsignal
       # @return [Object] Returns the return value of the block.
       # @since 0.8.7
       def without_instrumentation
-        Appsignal::Transaction.current.pause! if Appsignal::Transaction.current
+        Appsignal::Transaction.current&.pause!
         yield
       ensure
-        Appsignal::Transaction.current.resume! if Appsignal::Transaction.current
+        Appsignal::Transaction.current&.resume!
       end
     end
   end

data/lib/appsignal/hooks/action_cable.rb

@@ -6,7 +6,7 @@ module Appsignal
     class ActionCableHook < Appsignal::Hooks::Hook
       register :action_cable
 
-      REQUEST_ID = "_appsignal_action_cable.request_id".freeze
+      REQUEST_ID = "_appsignal_action_cable.request_id"
 
       def dependencies_present?
         defined?(::ActiveSupport::Notifications::Instrumenter) &&
@@ -15,7 +15,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/action_cable"
-        ActionCable::Channel::Base.send(:prepend, Appsignal::Integrations::ActionCableIntegration)
+        ActionCable::Channel::Base.prepend Appsignal::Integrations::ActionCableIntegration
 
         install_callbacks
       end
@@ -23,7 +23,8 @@ module Appsignal
       private
 
       def install_callbacks
-        ActionCable::Channel::Base.set_callback :subscribe, :around, :prepend => true do |channel, inner|
+        ActionCable::Channel::Base.set_callback :subscribe, :around,
+          :prepend => true do |channel, inner|
           # The request is only the original websocket request
           connection = channel.connection
           # #env is not available on the Rails ConnectionStub class used in the
@@ -55,7 +56,8 @@ module Appsignal
           end
         end
 
-        ActionCable::Channel::Base.set_callback :unsubscribe, :around, :prepend => true do |channel, inner|
+        ActionCable::Channel::Base.set_callback :unsubscribe, :around,
+          :prepend => true do |channel, inner|
           # The request is only the original websocket request
           connection = channel.connection
           # #env is not available on the Rails ConnectionStub class used in the

data/lib/appsignal/hooks/action_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Appsignal
   class Hooks
     class ActionMailerHook < Appsignal::Hooks::Hook

data/lib/appsignal/hooks/active_job.rb

@@ -37,12 +37,6 @@ module Appsignal
               )
             end
 
-          super
-        rescue Exception => exception # rubocop:disable Lint/RescueException
-          job_status = :failed
-          transaction.set_error(exception)
-          raise exception
-        ensure
           if transaction
             transaction.params =
               Appsignal::Utils::HashSanitizer.sanitize(
@@ -53,12 +47,19 @@ module Appsignal
             transaction_tags = ActiveJobHelpers.transaction_tags_for(job)
             transaction_tags["active_job_id"] = job["job_id"]
             provider_job_id = job["provider_job_id"]
-            if provider_job_id
-              transaction_tags[:provider_job_id] = provider_job_id
-            end
+            transaction_tags[:provider_job_id] = provider_job_id if provider_job_id
             transaction.set_tags(transaction_tags)
 
-            transaction.set_action_if_nil(ActiveJobHelpers.action_name(job))
+            transaction.set_action(ActiveJobHelpers.action_name(job))
+          end
+
+          super
+        rescue Exception => exception # rubocop:disable Lint/RescueException
+          job_status = :failed
+          transaction.set_error(exception)
+          raise exception
+        ensure
+          if transaction
             enqueued_at = job["enqueued_at"]
             if enqueued_at # Present in Rails 6 and up
               transaction.set_queue_start((Time.parse(enqueued_at).to_f * 1_000).to_i)

data/lib/appsignal/hooks/active_support_notifications.rb

@@ -30,10 +30,9 @@ module Appsignal
           install_module(parent_integration_module::InstrumentIntegration)
         end
 
-        # rubocop:disable Style/GuardClause
-        if instrumenter.method_defined?(:finish_with_state)
-          install_module(parent_integration_module::FinishStateIntegration)
-        end
+        return unless instrumenter.method_defined?(:finish_with_state)
+
+        install_module(parent_integration_module::FinishStateIntegration)
       end
 
       def install_module(mod)

data/lib/appsignal/hooks/data_mapper.rb

@@ -13,7 +13,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/data_mapper"
-        ::DataObjects::Connection.send(:include, Appsignal::Hooks::DataMapperLogListener)
+        ::DataObjects::Connection.include Appsignal::Hooks::DataMapperLogListener
       end
     end
   end

data/lib/appsignal/hooks/gvl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Appsignal
   class Hooks
     # @api private
@@ -6,6 +8,7 @@ module Appsignal
 
       def dependencies_present?
         return false if Appsignal::System.jruby?
+
         require "gvltools"
         Appsignal.config && Appsignal::Probes::GvlProbe.dependencies_present?
       rescue LoadError

data/lib/appsignal/hooks/http.rb

@@ -12,7 +12,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/http"
-        HTTP::Client.send(:prepend, Appsignal::Integrations::HttpIntegration)
+        HTTP::Client.prepend Appsignal::Integrations::HttpIntegration
 
         Appsignal::Environment.report_enabled("http_rb")
       end

data/lib/appsignal/hooks/mri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Appsignal
   class Hooks
     # @api private

data/lib/appsignal/hooks/net_http.rb

@@ -14,7 +14,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/net_http"
-        Net::HTTP.send(:prepend, Appsignal::Integrations::NetHttpIntegration)
+        Net::HTTP.prepend Appsignal::Integrations::NetHttpIntegration
 
         Appsignal::Environment.report_enabled("net_http")
       end

data/lib/appsignal/hooks/que.rb

@@ -12,7 +12,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/que"
-        ::Que::Job.send(:prepend, Appsignal::Integrations::QuePlugin)
+        ::Que::Job.prepend Appsignal::Integrations::QuePlugin
 
         ::Que.error_notifier = proc do |error, _job|
           Appsignal::Transaction.current.set_error(error)

data/lib/appsignal/hooks/rake.rb

@@ -12,7 +12,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/rake"
-        ::Rake::Task.send(:prepend, Appsignal::Integrations::RakeIntegration)
+        ::Rake::Task.prepend Appsignal::Integrations::RakeIntegration
       end
     end
   end

data/lib/appsignal/hooks/redis.rb

@@ -14,7 +14,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/redis"
-        ::Redis::Client.send(:prepend, Appsignal::Integrations::RedisIntegration)
+        ::Redis::Client.prepend Appsignal::Integrations::RedisIntegration
 
         Appsignal::Environment.report_enabled("redis")
       end

data/lib/appsignal/hooks/resque.rb

@@ -12,7 +12,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/resque"
-        Resque::Job.send(:prepend, Appsignal::Integrations::ResqueIntegration)
+        Resque::Job.prepend Appsignal::Integrations::ResqueIntegration
       end
     end
   end

data/lib/appsignal/hooks/shoryuken.rb

@@ -4,7 +4,7 @@ module Appsignal
   class Hooks
     # @api private
     class ShoryukenMiddleware
-      def call(worker_instance, queue, sqs_msg, body)
+      def call(worker_instance, queue, sqs_msg, body, &block)
         batch = sqs_msg.is_a?(Array)
         attributes =
           if batch
@@ -61,9 +61,7 @@ module Appsignal
           options[:queue_start] = Time.at(attributes["SentTimestamp"].to_i / 1000)
         end
 
-        Appsignal.monitor_transaction("perform_job.shoryuken", options) do
-          yield
-        end
+        Appsignal.monitor_transaction("perform_job.shoryuken", options, &block)
       end
     end
 

data/lib/appsignal/hooks/sidekiq.rb

@@ -14,7 +14,7 @@ module Appsignal
         Appsignal::Minutely.probes.register :sidekiq, Appsignal::Probes::SidekiqProbe
 
         ::Sidekiq.configure_server do |config|
-          config.error_handlers << \
+          config.error_handlers <<
             Appsignal::Integrations::SidekiqErrorHandler.new
 
           config.server_middleware do |chain|

data/lib/appsignal/hooks/unicorn.rb

@@ -13,8 +13,8 @@ module Appsignal
 
       def install
         require "appsignal/integrations/unicorn"
-        ::Unicorn::HttpServer.send(:prepend, Appsignal::Integrations::UnicornIntegration::Server)
-        ::Unicorn::Worker.send(:prepend, Appsignal::Integrations::UnicornIntegration::Worker)
+        ::Unicorn::HttpServer.prepend Appsignal::Integrations::UnicornIntegration::Server
+        ::Unicorn::Worker.prepend Appsignal::Integrations::UnicornIntegration::Worker
       end
     end
   end

data/lib/appsignal/hooks/webmachine.rb

@@ -12,7 +12,7 @@ module Appsignal
 
       def install
         require "appsignal/integrations/webmachine"
-        ::Webmachine::Decision::FSM.send(:prepend, Appsignal::Integrations::WebmachineIntegration)
+        ::Webmachine::Decision::FSM.prepend Appsignal::Integrations::WebmachineIntegration
       end
     end
   end

data/lib/appsignal/hooks.rb

@@ -78,8 +78,8 @@ module Appsignal
         callers = caller
         Appsignal::Utils::DeprecationMessage.message \
           "The constant Appsignal::Hooks::SidekiqPlugin has been deprecated. " \
-          "Please update the constant name to Appsignal::Integrations::SidekiqMiddleware " \
-          "in the following file to remove this message.\n#{callers.first}"
+            "Please update the constant name to Appsignal::Integrations::SidekiqMiddleware " \
+            "in the following file to remove this message.\n#{callers.first}"
         Appsignal::Integrations::SidekiqMiddleware
       else
         super

data/lib/appsignal/integrations/active_support_notifications.rb

@@ -3,7 +3,7 @@
 module Appsignal
   module Integrations
     module ActiveSupportNotificationsIntegration
-      BANG = "!".freeze
+      BANG = "!"
 
       module InstrumentIntegration
         def instrument(name, payload = {}, &block)

data/lib/appsignal/integrations/capistrano/appsignal.cap

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 namespace :appsignal do
   task :deploy do
-    appsignal_env = fetch(:appsignal_env, fetch(:stage, fetch(:rails_env, fetch(:rack_env, "production"))))
-    user = fetch(:appsignal_user, ENV["USER"] || ENV["USERNAME"])
+    appsignal_env = fetch(:appsignal_env,
+      fetch(:stage, fetch(:rails_env, fetch(:rack_env, "production"))))
+    user = fetch(:appsignal_user, ENV["USER"] || ENV.fetch("USERNAME", nil))
     revision = fetch(:appsignal_revision, fetch(:current_revision))
 
     appsignal_config = Appsignal::Config.new(
@@ -16,7 +19,7 @@ namespace :appsignal do
       c.validate
     end
 
-    if appsignal_config && appsignal_config.active?
+    if appsignal_config&.active?
       marker_data = {
         :revision => revision,
         :user => user

data/lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb

@@ -11,12 +11,13 @@ module Appsignal
 
         namespace :appsignal do
           task :deploy do
-            env = fetch(:appsignal_env, fetch(:stage, fetch(:rails_env, fetch(:rack_env, "production"))))
-            user = fetch(:appsignal_user, ENV["USER"] || ENV["USERNAME"])
+            env = fetch(:appsignal_env,
+              fetch(:stage, fetch(:rails_env, fetch(:rack_env, "production"))))
+            user = fetch(:appsignal_user, ENV["USER"] || ENV.fetch("USERNAME", nil))
             revision = fetch(:appsignal_revision, fetch(:current_revision))
 
             appsignal_config = Appsignal::Config.new(
-              ENV["PWD"],
+              ENV.fetch("PWD", nil),
               env,
               {},
               Appsignal::Utils::IntegrationLogger.new(StringIO.new)
@@ -27,7 +28,7 @@ module Appsignal
               c.validate
             end
 
-            if appsignal_config && appsignal_config.active?
+            if appsignal_config&.active?
               marker_data = {
                 :revision => revision,
                 :user => user

data/lib/appsignal/integrations/delayed_job_plugin.rb

@@ -41,8 +41,8 @@ module Appsignal
           :class    => class_name,
           :method   => method_name,
           :metadata => {
-            :id       => extract_value(job, :id, nil, true),
-            :queue    => extract_value(job, :queue),
+            :id => extract_value(job, :id, nil, true),
+            :queue => extract_value(job, :queue),
             :priority => extract_value(job, :priority, 0),
             :attempts => extract_value(job, :attempts, 0)
           },
@@ -80,9 +80,7 @@ module Appsignal
         end
 
         # Attempt to read value from object
-        if value.nil? && object_or_hash.respond_to?(field)
-          value = object_or_hash.send(field)
-        end
+        value = object_or_hash.send(field) if value.nil? && object_or_hash.respond_to?(field)
 
         # Set default value if nothing was found
         value = default_value if value.nil?

data/lib/appsignal/integrations/grape.rb

@@ -31,7 +31,7 @@ module Appsignal
           path = request.path # Path without namespaces
           endpoint = env["api.endpoint"]
 
-          if endpoint && endpoint.options
+          if endpoint&.options
             options = endpoint.options
             request_method = options[:method].first.to_s.upcase
             klass = options[:for]

data/lib/appsignal/integrations/hanami.rb

@@ -17,7 +17,7 @@ module Appsignal
         Appsignal.start_logger
         Appsignal.start
 
-        ::Hanami::Action.send(:prepend, Appsignal::Integrations::HanamiIntegration) if Appsignal.active?
+        ::Hanami::Action.prepend Appsignal::Integrations::HanamiIntegration if Appsignal.active?
       end
     end
   end

data/lib/appsignal/integrations/object.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-if defined?(Appsignal)
-  Appsignal::Environment.report_enabled("object_instrumentation")
-end
+Appsignal::Environment.report_enabled("object_instrumentation") if defined?(Appsignal)
 
 class Object
   def self.appsignal_instrument_class_method(method_name, options = {})
@@ -37,6 +35,7 @@ class Object
 
   def self.appsignal_reverse_class_name
     return "AnonymousClass" unless name
+
     name.split("::").reverse.join(".")
   end
 

data/lib/appsignal/integrations/padrino.rb

@@ -59,9 +59,7 @@ module Appsignal::Integrations::PadrinoIntegration
     action_name = request.action if request.respond_to?(:action)
     action_name ||= ""
 
-    unless action_name.empty?
-      return "#{settings.name}:#{controller_name}##{action_name}"
-    end
+    return "#{settings.name}:#{controller_name}##{action_name}" unless action_name.empty?
 
     # Older versions of Padrino work with a route object
     if request.respond_to?(:route_obj) && request.route_obj
@@ -74,7 +72,7 @@ module Appsignal::Integrations::PadrinoIntegration
   end
 end
 
-Padrino::Application.send(:prepend, Appsignal::Integrations::PadrinoIntegration)
+Padrino::Application.prepend Appsignal::Integrations::PadrinoIntegration
 
 Padrino.after_load do
   Appsignal::Integrations::PadrinoPlugin.init

data/lib/appsignal/integrations/que.rb

@@ -6,12 +6,12 @@ module Appsignal
       def _run(*)
         local_attrs = respond_to?(:que_attrs) ? que_attrs : attrs
         env = {
-          :metadata    => {
-            :id        => local_attrs[:job_id] || local_attrs[:id],
-            :queue     => local_attrs[:queue],
-            :run_at    => local_attrs[:run_at].to_s,
-            :priority  => local_attrs[:priority],
-            :attempts  => local_attrs[:error_count].to_i
+          :metadata => {
+            :id => local_attrs[:job_id] || local_attrs[:id],
+            :queue => local_attrs[:queue],
+            :run_at => local_attrs[:run_at].to_s,
+            :priority => local_attrs[:priority],
+            :attempts => local_attrs[:error_count].to_i
           },
           :params => local_attrs[:args]
         }