traceview 3.6.0 → 3.7.0

data/lib/traceview/base.rb

@@ -224,7 +224,7 @@ module TraceViewBase
         Pry.commands.alias_command 'n', 'next'
         Pry.commands.alias_command 'f', 'finish'
 
-        Pry::Commands.command /^$/, 'repeat last command' do
+        Pry::Commands.command(/^$/, 'repeat last command') do
           _pry_.run_command Pry.history.to_a.last
         end
       end

data/lib/traceview/frameworks/rails.rb

@@ -65,14 +65,11 @@ module TraceView
 
     def self.load_instrumentation
       # Load the Rails specific instrumentation
-      pattern = File.join(File.dirname(__FILE__), 'rails/inst', '*.rb')
-      Dir.glob(pattern) do |f|
-        begin
-          require f
-        rescue => e
-          TraceView.logger.error "[traceview/loading] Error loading rails insrumentation file '#{f}' : #{e}"
-        end
-      end
+      require 'traceview/frameworks/rails/inst/action_controller'
+      require 'traceview/frameworks/rails/inst/action_view'
+      require 'traceview/frameworks/rails/inst/action_view_2x'
+      require 'traceview/frameworks/rails/inst/action_view_30'
+      require 'traceview/frameworks/rails/inst/active_record'
 
       TraceView.logger.info "TraceView gem #{TraceView::Version::STRING} successfully loaded."
     end
@@ -105,7 +102,7 @@ if defined?(::Rails)
 
         initializer 'traceview.rack' do |app|
           TraceView.logger.info '[traceview/loading] Instrumenting rack' if TraceView::Config[:verbose]
-          app.config.middleware.insert 0, 'TraceView::Rack'
+          app.config.middleware.insert 0, TraceView::Rack
         end
 
         config.after_initialize do

data/lib/traceview/frameworks/rails/inst/action_controller.rb

@@ -69,145 +69,12 @@ module TraceView
         TraceView::API.log_exit('actionview')
       end
     end
-
-    #
-    # ActionController3
-    #
-    # This modules contains the instrumentation code specific
-    # to Rails v3
-    #
-    module ActionController3
-      include ::TraceView::Inst::RailsBase
-
-      def self.included(base)
-        base.class_eval do
-          alias_method_chain :process, :traceview
-          alias_method_chain :process_action, :traceview
-          alias_method_chain :render, :traceview
-        end
-      end
-
-      def process_with_traceview(*args)
-        TraceView::API.log_entry('rails')
-        process_without_traceview(*args)
-
-      rescue Exception => e
-        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
-        raise
-      ensure
-        TraceView::API.log_exit('rails')
-      end
-
-      def process_action_with_traceview(*args)
-        report_kvs = {
-          :Controller   => self.class.name,
-          :Action       => action_name,
-        }
-        TraceView::API.log(nil, 'info', report_kvs)
-
-        process_action_without_traceview(*args)
-      rescue Exception
-        report_kvs[:Status] = 500
-        TraceView::API.log(nil, 'info', report_kvs)
-        raise
-      end
-    end
-
-    #
-    # ActionController4
-    #
-    # This modules contains the instrumentation code specific
-    # to Rails v4
-    #
-    module ActionController4
-      include ::TraceView::Inst::RailsBase
-
-      def self.included(base)
-        base.class_eval do
-          alias_method_chain :process_action, :traceview
-          alias_method_chain :render, :traceview
-        end
-      end
-
-      def process_action_with_traceview(method_name, *args)
-        report_kvs = {
-          :Controller   => self.class.name,
-          :Action       => self.action_name,
-        }
-
-        TraceView::API.log_entry('rails', report_kvs)
-        process_action_without_traceview(method_name, *args)
-
-      rescue Exception => e
-        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
-        raise
-      ensure
-        TraceView::API.log_exit('rails')
-      end
-    end
   end
 end
 
 if defined?(ActionController::Base) && TraceView::Config[:action_controller][:enabled]
-  if ::Rails::VERSION::MAJOR == 4
-
-    class ActionController::Base
-      include TraceView::Inst::ActionController4
-    end
-
-  elsif ::Rails::VERSION::MAJOR == 3
-
-    class ActionController::Base
-      include TraceView::Inst::ActionController3
-    end
-
-  elsif ::Rails::VERSION::MAJOR == 2
-
-    ActionController::Base.class_eval do
-      include ::TraceView::Inst::RailsBase
-
-      alias :perform_action_without_traceview :perform_action
-      alias :rescue_action_without_traceview :rescue_action
-      alias :process_without_traceview :process
-      alias :render_without_traceview :render
-
-      def process(*args)
-        TraceView::API.log_entry('rails')
-        process_without_traceview(*args)
-
-      rescue Exception => e
-        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
-        raise
-      ensure
-        TraceView::API.log_exit('rails')
-      end
-
-      def perform_action(*arguments)
-        report_kvs = {
-          :Controller  => @_request.path_parameters['controller'],
-          :Action      => @_request.path_parameters['action']
-        }
-        TraceView::API.log(nil, 'info', report_kvs)
-        perform_action_without_traceview(*arguments)
-      end
-
-      def rescue_action(exn)
-        TraceView::API.log_exception(nil, exn) if log_rails_error?(exn)
-        rescue_action_without_traceview(exn)
-      end
-
-      def render(options = nil, extra_options = {}, &block)
-        TraceView::API.log_entry('actionview')
-        render_without_traceview(options, extra_options, &block)
-
-      rescue Exception => e
-        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
-        raise
-      ensure
-        TraceView::API.log_exit('actionview')
-      end
-    end
-  end
   TraceView.logger.info '[traceview/loading] Instrumenting actioncontroler' if TraceView::Config[:verbose]
+  require "traceview/frameworks/rails/inst/action_controller#{Rails::VERSION::MAJOR}"
+  ::TraceView::Util.send_include(::ActionController::Base, TraceView::Inst::ActionController)
 end
 # vim:set expandtab:tabstop=2

data/lib/traceview/frameworks/rails/inst/action_controller2.rb

@@ -0,0 +1,59 @@
+# Copyright (c) 2016 AppNeta, Inc.
+# All rights reserved.
+
+module TraceView
+  module Inst
+    #
+    # ActionController
+    #
+    # This modules contains the instrumentation code specific
+    # to Rails v2
+    #
+    module ActionController
+      include ::TraceView::Inst::RailsBase
+
+      def self.included(klass)
+        ::TraceView::Util.method_alias(klass, :perform_action)
+        ::TraceView::Util.method_alias(klass, :rescue_action)
+        ::TraceView::Util.method_alias(klass, :process)
+        ::TraceView::Util.method_alias(klass, :render)
+      end
+
+      def process_with_traceview(*args)
+        TraceView::API.log_entry('rails')
+        process_without_traceview(*args)
+
+      rescue Exception => e
+        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
+        raise
+      ensure
+        TraceView::API.log_exit('rails')
+      end
+
+      def perform_action_with_traceview(*arguments)
+        report_kvs = {
+          :Controller  => @_request.path_parameters['controller'],
+          :Action      => @_request.path_parameters['action']
+        }
+        TraceView::API.log(nil, 'info', report_kvs)
+        perform_action_without_traceview(*arguments)
+      end
+
+      def rescue_action_with_traceview(exn)
+        TraceView::API.log_exception(nil, exn) if log_rails_error?(exn)
+        rescue_action_without_traceview(exn)
+      end
+
+      def render_with_traceview(options = nil, extra_options = {}, &block)
+        TraceView::API.log_entry('actionview')
+        render_without_traceview(options, extra_options, &block)
+
+      rescue Exception => e
+        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
+        raise
+      ensure
+        TraceView::API.log_exit('actionview')
+      end
+    end
+  end
+end

data/lib/traceview/frameworks/rails/inst/action_controller3.rb

@@ -0,0 +1,49 @@
+# Copyright (c) 2016 AppNeta, Inc.
+# All rights reserved.
+
+module TraceView
+  module Inst
+    #
+    # ActionController
+    #
+    # This modules contains the instrumentation code specific
+    # to Rails v3
+    #
+    module ActionController
+      include ::TraceView::Inst::RailsBase
+
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :process, :traceview
+          alias_method_chain :process_action, :traceview
+          alias_method_chain :render, :traceview
+        end
+      end
+
+      def process_with_traceview(*args)
+        TraceView::API.log_entry('rails')
+        process_without_traceview(*args)
+
+      rescue Exception => e
+        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
+        raise
+      ensure
+        TraceView::API.log_exit('rails')
+      end
+
+      def process_action_with_traceview(*args)
+        report_kvs = {
+          :Controller   => self.class.name,
+          :Action       => action_name,
+        }
+        TraceView::API.log(nil, 'info', report_kvs)
+
+        process_action_without_traceview(*args)
+      rescue Exception
+        report_kvs[:Status] = 500
+        TraceView::API.log(nil, 'info', report_kvs)
+        raise
+      end
+    end
+  end
+end

data/lib/traceview/frameworks/rails/inst/action_controller4.rb

@@ -0,0 +1,40 @@
+# Copyright (c) 2013 AppNeta, Inc.
+# All rights reserved.
+
+module TraceView
+  module Inst
+    #
+    # ActionController
+    #
+    # This modules contains the instrumentation code specific
+    # to Rails v4
+    #
+    module ActionController
+      include ::TraceView::Inst::RailsBase
+
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :process_action, :traceview
+          alias_method_chain :render, :traceview
+        end
+      end
+
+      def process_action_with_traceview(method_name, *args)
+        report_kvs = {
+          :Controller   => self.class.name,
+          :Action       => self.action_name,
+        }
+
+        TraceView::API.log_entry('rails', report_kvs)
+        process_action_without_traceview(method_name, *args)
+
+      rescue Exception => e
+        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
+        raise
+      ensure
+        TraceView::API.log_exit('rails')
+      end
+    end
+  end
+end
+

data/lib/traceview/frameworks/rails/inst/action_controller5.rb

@@ -0,0 +1,39 @@
+# Copyright (c) 2016 AppNeta, Inc.
+# All rights reserved.
+
+module TraceView
+  module Inst
+    #
+    # ActionController
+    #
+    # This modules contains the instrumentation code specific
+    # to Rails v5
+    #
+    module ActionController
+      include ::TraceView::Inst::RailsBase
+
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :process_action, :traceview
+          alias_method_chain :render, :traceview
+        end
+      end
+
+      def process_action_with_traceview(method_name, *args)
+        report_kvs = {
+          :Controller   => self.class.name,
+          :Action       => self.action_name,
+        }
+
+        TraceView::API.log_entry('rails', report_kvs)
+        process_action_without_traceview(method_name, *args)
+
+      rescue Exception => e
+        TraceView::API.log_exception(nil, e) if log_rails_error?(e)
+        raise
+      ensure
+        TraceView::API.log_exit('rails')
+      end
+    end
+  end
+end

data/lib/traceview/frameworks/rails/inst/action_view.rb

@@ -8,7 +8,7 @@ if defined?(ActionView::Base) && TraceView::Config[:action_view][:enabled]
   # and ActionView 3.0 is a special case.
   # Everything else goes here. (ActionView 3.1 - 4.0 as of this writing)
   #
-  if (Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR > 0) || Rails::VERSION::MAJOR == 4
+  if (Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR > 0) || Rails::VERSION::MAJOR >= 4
 
     TraceView.logger.info '[traceview/loading] Instrumenting actionview' if TraceView::Config[:verbose]
 

data/lib/traceview/frameworks/rails/inst/active_record.rb

@@ -1,20 +1,23 @@
 # Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
-require 'traceview/frameworks/rails/inst/connection_adapters/utils'
 require 'traceview/frameworks/rails/inst/connection_adapters/mysql'
 require 'traceview/frameworks/rails/inst/connection_adapters/mysql2'
 require 'traceview/frameworks/rails/inst/connection_adapters/postgresql'
-require 'traceview/frameworks/rails/inst/connection_adapters/oracle'
 
 if TraceView::Config[:active_record][:enabled] && !defined?(JRUBY_VERSION)
   begin
     adapter = ActiveRecord::Base.connection.adapter_name.downcase
 
+    if Rails::VERSION::MAJOR < 5
+      require 'traceview/frameworks/rails/inst/connection_adapters/utils'
+    else
+      require 'traceview/frameworks/rails/inst/connection_adapters/utils5x'
+    end
+
     TraceView::Inst::ConnectionAdapters::FlavorInitializers.mysql      if adapter == 'mysql'
     TraceView::Inst::ConnectionAdapters::FlavorInitializers.mysql2     if adapter == 'mysql2'
     TraceView::Inst::ConnectionAdapters::FlavorInitializers.postgresql if adapter == 'postgresql'
-    TraceView::Inst::ConnectionAdapters::FlavorInitializers.oracle     if adapter == 'oracleenhanced'
 
   rescue StandardError => e
     TraceView.logger.error "[traceview/error] TraceView/ActiveRecord error: #{e.inspect}"

data/lib/traceview/frameworks/rails/inst/connection_adapters/postgresql.rb

@@ -13,7 +13,7 @@ module TraceView
                                   ::TraceView::Inst::ConnectionAdapters::Utils)
 
           if (::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR > 0) ||
-                ::ActiveRecord::VERSION::MAJOR == 4
+                ::ActiveRecord::VERSION::MAJOR >= 4
 
             # ActiveRecord 3.1 and up
             TraceView::Util.method_alias(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_query)

data/lib/traceview/frameworks/rails/inst/connection_adapters/utils.rb

@@ -8,44 +8,41 @@ module TraceView
 
         def extract_trace_details(sql, name = nil, binds = [])
           opts = {}
+          if TraceView::Config[:sanitize_sql]
+            # Sanitize SQL and don't report binds
+            opts[:Query] = TraceView::Util.sanitize_sql(sql)
+          else
+            # Report raw SQL and any binds if they exist
+            opts[:Query] = sql.to_s
+            opts[:QueryArgs] = binds.map { |col, val| [col.name, val.to_s] } unless binds.empty?
+          end
 
-          begin
-            if TraceView::Config[:sanitize_sql]
-              # Sanitize SQL and don't report binds
-              opts[:Query] = TraceView::Util.sanitize_sql(sql)
-            else
-              # Report raw SQL and any binds if they exist
-              opts[:Query] = sql.to_s
-              opts[:QueryArgs] = binds.map { |col, val| type_cast(val, col) } unless binds.empty?
-            end
+          opts[:Name] = name.to_s if name
+          opts[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:active_record][:collect_backtraces]
 
-            opts[:Name] = name.to_s if name
-            opts[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:active_record][:collect_backtraces]
+          if ::Rails::VERSION::MAJOR == 2
+            config = ::Rails.configuration.database_configuration[::Rails.env]
+          else
+            config = ActiveRecord::Base.connection.instance_variable_get(:@config)
+          end
 
-            if ::Rails::VERSION::MAJOR == 2
-              config = ::Rails.configuration.database_configuration[::Rails.env]
-            else
-              config = ActiveRecord::Base.connection.instance_variable_get(:@config)
-            end
+          if config
+            opts[:Database]   = config['database'] if config.key?('database')
+            opts[:RemoteHost] = config['host']     if config.key?('host')
+            adapter_name = config[:adapter]
 
-            if config
-              opts[:Database]   = config['database'] if config.key?('database')
-              opts[:RemoteHost] = config['host']     if config.key?('host')
-              adapter_name = config[:adapter]
-
-              case adapter_name
-              when /mysql/i
-                opts[:Flavor] = 'mysql'
-              when /postgres/i
-                opts[:Flavor] = 'postgresql'
-              end
+            case adapter_name
+            when /mysql/i
+              opts[:Flavor] = 'mysql'
+            when /postgres/i
+              opts[:Flavor] = 'postgresql'
             end
-          rescue StandardError => e
-            TraceView.logger.debug "Exception raised capturing ActiveRecord KVs: #{e.inspect}"
-            TraceView.logger.debug e.backtrace.join('\n')
           end
-
-          return opts || {}
+        rescue StandardError => e
+          TraceView.logger.debug "Exception raised capturing ActiveRecord KVs: #{e.inspect}"
+          TraceView.logger.debug e.backtrace.join('\n')
+        ensure
+          return opts
         end
 
         # We don't want to trace framework caches.  Only instrument SQL that
@@ -110,10 +107,7 @@ module TraceView
 
         def begin_db_transaction_with_traceview
           if TraceView.tracing?
-            opts = {}
-
-            opts[:Query] = 'BEGIN'
-            TraceView::API.trace('activerecord', opts || {}) do
+            TraceView::API.trace('activerecord', { :Query => 'BEGIN' }) do
               begin_db_transaction_without_traceview
             end
           else