appsignal 2.1.0.alpha.3 → 2.1.0.beta.1

data/lib/appsignal/event_formatter.rb

@@ -18,18 +18,18 @@ module Appsignal
         @@formatter_classes ||= {}
       end
 
-      def register(name, formatter=self)
+      def register(name, formatter = self)
         formatter_classes[name] = formatter
       end
 
-      def unregister(name, formatter=self)
-        if formatter_classes[name] == formatter
-          formatter_classes.delete(name)
-          formatters.delete(name)
-        end
+      def unregister(name, formatter = self)
+        return unless formatter_classes[name] == formatter
+
+        formatter_classes.delete(name)
+        formatters.delete(name)
       end
 
-      def registered?(name, klass=nil)
+      def registered?(name, klass = nil)
         if klass
           formatter_classes[name] == klass
         else
@@ -65,6 +65,6 @@ module Appsignal
   end
 end
 
-Dir.glob(File.expand_path('../event_formatter/**/*.rb', __FILE__)).each do |file|
+Dir.glob(File.expand_path("../event_formatter/**/*.rb", __FILE__)).each do |file|
   require file
 end

data/lib/appsignal/event_formatter/action_view/render_formatter.rb

@@ -2,15 +2,15 @@ module Appsignal
   class EventFormatter
     module ActionView
       class RenderFormatter < Appsignal::EventFormatter
-        register 'render_partial.action_view'
-        register 'render_template.action_view'
+        register "render_partial.action_view"
+        register "render_template.action_view"
 
-        BLANK = ''.freeze
+        BLANK = "".freeze
 
         attr_reader :root_path
 
         def initialize
-          @root_path = "#{Rails.root.to_s}/".freeze
+          @root_path = "#{Rails.root}/".freeze
         end
 
         def format(payload)

data/lib/appsignal/event_formatter/active_record/instantiation_formatter.rb

@@ -2,7 +2,7 @@ module Appsignal
   class EventFormatter
     module ActiveRecord
       class InstantiationFormatter < Appsignal::EventFormatter
-        register 'instantiation.active_record'
+        register "instantiation.active_record"
 
         def format(payload)
           [payload[:class_name], nil]

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

@@ -2,7 +2,7 @@ module Appsignal
   class EventFormatter
     module ActiveRecord
       class SqlFormatter < Appsignal::EventFormatter
-        register 'sql.active_record'
+        register "sql.active_record"
 
         def format(payload)
           [payload[:name], payload[:sql], SQL_BODY_FORMAT]

data/lib/appsignal/event_formatter/elastic_search/search_formatter.rb

@@ -2,7 +2,7 @@ module Appsignal
   class EventFormatter
     module ElasticSearch
       class SearchFormatter < Appsignal::EventFormatter
-        register 'search.elasticsearch'
+        register "search.elasticsearch"
 
         def format(payload)
           [
@@ -12,14 +12,16 @@ module Appsignal
         end
 
         def sanitized_search(search)
-          return nil unless search.is_a?(Hash)
+          return unless search.is_a?(Hash)
+
           {}.tap do |hsh|
             search.each do |key, val|
-              if [:index, :type].include?(key)
-                hsh[key] = val
-              else
-                hsh[key] = Appsignal::Utils::QueryParamsSanitizer.sanitize(val)
-              end
+              hsh[key] =
+                if [:index, :type].include?(key)
+                  val
+                else
+                  Appsignal::Utils::QueryParamsSanitizer.sanitize(val)
+                end
             end
           end
         end

data/lib/appsignal/event_formatter/faraday/request_formatter.rb

@@ -2,7 +2,7 @@ module Appsignal
   class EventFormatter
     module Faraday
       class RequestFormatter < Appsignal::EventFormatter
-        register 'request.faraday'
+        register "request.faraday"
 
         def format(payload)
           http_method = payload[:method].to_s.upcase

data/lib/appsignal/event_formatter/mongo_ruby_driver/query_formatter.rb

@@ -57,7 +57,7 @@ module Appsignal
 
           {}.tap do |hsh|
             command.each do |key, val|
-              hsh[key] = self.apply_strategy(strategies[key], val)
+              hsh[key] = apply_strategy(strategies[key], val)
             end
           end
         end
@@ -66,20 +66,20 @@ module Appsignal
         def self.apply_strategy(strategy, val)
           case strategy
           when :allow      then val
-          when :deny       then '?'
-          when :deny_array then '[?]'
+          when :deny       then "?"
+          when :deny_array then "[?]"
           when :sanitize_document
             Appsignal::Utils::QueryParamsSanitizer.sanitize(val, true, :mongodb)
           when :sanitize_bulk
             if val.length > 1
               [
-                self.format(:bulk, val.first),
+                format(:bulk, val.first),
                 "[...]"
               ]
             else
-              val.map { |v| self.format(:bulk, v) }
+              val.map { |v| format(:bulk, v) }
             end
-          else '?'
+          else "?"
           end
         end
       end

data/lib/appsignal/event_formatter/moped/query_formatter.rb

@@ -2,54 +2,67 @@ module Appsignal
   class EventFormatter
     module Moped
       class QueryFormatter < Appsignal::EventFormatter
-        register 'query.moped'
+        register "query.moped"
 
         def format(payload)
-          if payload[:ops] && payload[:ops].length > 0
+          if payload[:ops] && !payload[:ops].empty?
             op = payload[:ops].first
             case op.class.to_s
-            when 'Moped::Protocol::Command'
-              return ['Command', {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, true, :mongodb)
-              }.inspect]
-            when 'Moped::Protocol::Query'
-              return ['Query', {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :flags    => op.flags,
-                :limit    => op.limit,
-                :skip     => op.skip,
-                :fields   => op.fields
-              }.inspect]
-            when 'Moped::Protocol::Delete'
-              return ['Delete', {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :flags    => op.flags,
-              }.inspect]
-            when 'Moped::Protocol::Insert'
-              return ['Insert', {
-                :database   => op.full_collection_name,
-                :documents  => sanitize(op.documents, true, :mongodb),
-                :count      => op.documents.count,
-                :flags      => op.flags,
-              }.inspect]
-            when 'Moped::Protocol::Update'
-              return ['Update', {
-                :database => op.full_collection_name,
-                :selector => sanitize(op.selector, false, :mongodb),
-                :update   => sanitize(op.update, true, :mongodb),
-                :flags    => op.flags,
-              }.inspect]
-            when 'Moped::Protocol::KillCursors'
-              return ['KillCursors', {
-                :number_of_cursor_ids => op.number_of_cursor_ids
-              }.inspect]
+            when "Moped::Protocol::Command"
+              [
+                "Command", {
+                  :database => op.full_collection_name,
+                  :selector => sanitize(op.selector, true, :mongodb)
+                }.inspect
+              ]
+            when "Moped::Protocol::Query"
+              [
+                "Query", {
+                  :database => op.full_collection_name,
+                  :selector => sanitize(op.selector, false, :mongodb),
+                  :flags    => op.flags,
+                  :limit    => op.limit,
+                  :skip     => op.skip,
+                  :fields   => op.fields
+                }.inspect
+              ]
+            when "Moped::Protocol::Delete"
+              [
+                "Delete", {
+                  :database => op.full_collection_name,
+                  :selector => sanitize(op.selector, false, :mongodb),
+                  :flags    => op.flags
+                }.inspect
+              ]
+            when "Moped::Protocol::Insert"
+              [
+                "Insert", {
+                  :database   => op.full_collection_name,
+                  :documents  => sanitize(op.documents, true, :mongodb),
+                  :count      => op.documents.count,
+                  :flags      => op.flags
+                }.inspect
+              ]
+            when "Moped::Protocol::Update"
+              [
+                "Update",
+                {
+                  :database => op.full_collection_name,
+                  :selector => sanitize(op.selector, false, :mongodb),
+                  :update   => sanitize(op.update, true, :mongodb),
+                  :flags    => op.flags
+                }.inspect
+              ]
+            when "Moped::Protocol::KillCursors"
+              [
+                "KillCursors",
+                { :number_of_cursor_ids => op.number_of_cursor_ids }.inspect
+              ]
             else
-              return [op.class.to_s.sub('Moped::Protocol::', ''), {
-                :database => op.full_collection_name
-              }.inspect]
+              [
+                op.class.to_s.sub("Moped::Protocol::", ""),
+                { :database => op.full_collection_name }.inspect
+              ]
             end
           end
         end

data/lib/appsignal/extension.rb

@@ -1,7 +1,7 @@
-require 'yaml'
+require "yaml"
 
 begin
-  require 'appsignal_extension'
+  require "appsignal_extension"
   Appsignal.extension_loaded = true
 rescue LoadError => err
   Appsignal.logger.error(
@@ -16,12 +16,12 @@ module Appsignal
     class << self
       def agent_config
         @agent_config ||= YAML.load(
-          File.read(File.join(File.dirname(__FILE__), '../../ext/agent.yml'))
+          File.read(File.join(File.dirname(__FILE__), "../../ext/agent.yml"))
         )
       end
 
       def agent_version
-        agent_config['version']
+        agent_config["version"]
       end
 
       def method_missing(m, *args, &block)
@@ -31,7 +31,7 @@ module Appsignal
 
     class Data
       def inspect
-        "#<#{self.class.name}:#{object_id} #{to_s}>"
+        "#<#{self.class.name}:#{object_id} #{self}>"
       end
     end
   end

data/lib/appsignal/hooks.rb

@@ -17,7 +17,7 @@ module Appsignal
     end
 
     class Hook
-      def self.register(name, hook=self)
+      def self.register(name, hook = self)
         Appsignal::Hooks.register(name, hook.new)
       end
 
@@ -63,16 +63,18 @@ module Appsignal
         text.size > 200 ? "#{text[0...197]}..." : text
       end
 
-      def extract_value(object_or_hash, field, default_value=nil, convert_to_s=false)
-        value = if object_or_hash.respond_to?(:[])
-          begin
-            object_or_hash[field]
-          rescue NameError
-            nil
-          end
-        elsif object_or_hash.respond_to?(field)
-          object_or_hash.send(field)
-        end || default_value
+      def extract_value(object_or_hash, field, default_value = nil, convert_to_s = false)
+        value =
+          if object_or_hash.respond_to?(:[])
+            begin
+              object_or_hash[field]
+            rescue NameError
+              nil
+            end
+          elsif object_or_hash.respond_to?(field)
+            object_or_hash.send(field)
+          end || default_value
+
         if convert_to_s
           value.to_s
         else
@@ -89,18 +91,18 @@ module Appsignal
   end
 end
 
-require 'appsignal/hooks/active_support_notifications'
-require 'appsignal/hooks/celluloid'
-require 'appsignal/hooks/delayed_job'
-require 'appsignal/hooks/net_http'
-require 'appsignal/hooks/passenger'
-require 'appsignal/hooks/puma'
-require 'appsignal/hooks/rake'
-require 'appsignal/hooks/redis'
-require 'appsignal/hooks/sequel'
-require 'appsignal/hooks/shoryuken'
-require 'appsignal/hooks/sidekiq'
-require 'appsignal/hooks/unicorn'
-require 'appsignal/hooks/mongo_ruby_driver'
-require 'appsignal/hooks/webmachine'
-require 'appsignal/hooks/data_mapper'
+require "appsignal/hooks/active_support_notifications"
+require "appsignal/hooks/celluloid"
+require "appsignal/hooks/delayed_job"
+require "appsignal/hooks/net_http"
+require "appsignal/hooks/passenger"
+require "appsignal/hooks/puma"
+require "appsignal/hooks/rake"
+require "appsignal/hooks/redis"
+require "appsignal/hooks/sequel"
+require "appsignal/hooks/shoryuken"
+require "appsignal/hooks/sidekiq"
+require "appsignal/hooks/unicorn"
+require "appsignal/hooks/mongo_ruby_driver"
+require "appsignal/hooks/webmachine"
+require "appsignal/hooks/data_mapper"

data/lib/appsignal/hooks/active_support_notifications.rb

@@ -3,7 +3,7 @@ module Appsignal
     class ActiveSupportNotificationsHook < Appsignal::Hooks::Hook
       register :active_support_notifications
 
-      BANG = '!'.freeze
+      BANG = "!".freeze
 
       def dependencies_present?
         defined?(::ActiveSupport::Notifications::Instrumenter)
@@ -13,7 +13,7 @@ module Appsignal
         ::ActiveSupport::Notifications::Instrumenter.class_eval do
           alias instrument_without_appsignal instrument
 
-          def instrument(name, payload={}, &block)
+          def instrument(name, payload = {}, &block)
             # Events that start with a bang are internal to Rails
             instrument_this = name[0] != BANG
 

data/lib/appsignal/hooks/celluloid.rb

@@ -18,7 +18,7 @@ module Appsignal
             alias shutdown_without_appsignal shutdown
 
             def shutdown
-              Appsignal.stop('celluloid')
+              Appsignal.stop("celluloid")
               shutdown_without_appsignal
             end
           end

data/lib/appsignal/hooks/data_mapper.rb

@@ -5,11 +5,11 @@ module Appsignal
 
       def dependencies_present?
         defined?(::DataMapper) &&
-        defined?(::DataObjects::Connection)
+          defined?(::DataObjects::Connection)
       end
 
       def install
-        require 'appsignal/integrations/data_mapper'
+        require "appsignal/integrations/data_mapper"
         ::DataObjects::Connection.send(:include, Appsignal::Hooks::DataMapperLogListener)
       end
     end

data/lib/appsignal/hooks/delayed_job.rb

@@ -10,7 +10,7 @@ module Appsignal
       def install
         # The DJ plugin is a subclass of Delayed::Plugin, so we can only
         # require this code if we're actually installing.
-        require 'appsignal/integrations/delayed_job_plugin'
+        require "appsignal/integrations/delayed_job_plugin"
         ::Delayed::Worker.plugins << Appsignal::Hooks::DelayedJobPlugin
       end
     end

data/lib/appsignal/hooks/mongo_ruby_driver.rb

@@ -8,7 +8,7 @@ module Appsignal
       end
 
       def install
-        require 'appsignal/integrations/mongo_ruby_driver'
+        require "appsignal/integrations/mongo_ruby_driver"
 
         Mongo::Monitoring::Global.subscribe(
           Mongo::Monitoring::COMMAND,

data/lib/appsignal/hooks/net_http.rb

@@ -1,4 +1,4 @@
-require 'net/http'
+require "net/http"
 
 module Appsignal
   class Hooks
@@ -13,10 +13,10 @@ module Appsignal
         Net::HTTP.class_eval do
           alias request_without_appsignal request
 
-          def request(request, body=nil, &block)
+          def request(request, body = nil, &block)
             Appsignal.instrument(
-              'request.net_http',
-              "#{request.method} #{use_ssl? ? 'https' : 'http'}://#{request['host'] || self.address}"
+              "request.net_http",
+              "#{request.method} #{use_ssl? ? "https" : "http"}://#{request["host"] || address}"
             ) do
               request_without_appsignal(request, body, &block)
             end