oboe 2.6.6.1 → 2.6.7.1

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

@@ -11,7 +11,7 @@ module Oboe
           alias_method_chain :render, :oboe
         end
       end
-      
+
       def process_with_oboe(*args)
         Oboe::API.trace('rails', {}) do
           process_without_oboe *args
@@ -38,7 +38,7 @@ module Oboe
         end
       end
     end
-    
+
     module Rails4ActionController
       def self.included(base)
         base.class_eval do
@@ -46,7 +46,7 @@ module Oboe
           alias_method_chain :render, :oboe
         end
       end
-      
+
       def process_action_with_oboe(method_name, *args)
         return process_action_without_oboe(method_name, *args) if Oboe::Config[:action_blacklist].present? &&
           Oboe::Config[:action_blacklist][[self.controller_name, self.action_name].join('#')]
@@ -75,7 +75,7 @@ if defined?(ActionController::Base) and Oboe::Config[:action_controller][:enable
     class ActionController::Base
       include Oboe::Inst::Rails4ActionController
     end
-  
+
   elsif ::Rails::VERSION::MAJOR == 3
 
     class ActionController::Base

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

@@ -4,7 +4,7 @@
 if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
 
   ##
-  # ActionView Instrumentation is version dependent.  ActionView 2.x is separate 
+  # ActionView Instrumentation is version dependent.  ActionView 2.x is separate
   # and ActionView 3.0 is a special case.
   # Everything else goes here. (ActionView 3.1 - 4.0 as of this writing)
   #
@@ -48,7 +48,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           ret =  render_collection_without_oboe
         end
       end
-        
+
     end
   end
 end

data/lib/oboe/frameworks/rails/inst/action_view_2x.rb

@@ -29,7 +29,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           render_partial_without_oboe(options)
         end
       end
-      
+
       alias :render_partial_collection_without_oboe :render_partial_collection
       def render_partial_collection(options = {})
         entry_kvs = {}

data/lib/oboe/frameworks/rails/inst/action_view_30.rb

@@ -23,7 +23,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           render_partial_without_oboe(object)
         end
       end
-      
+
       alias :render_collection_without_oboe :render_collection
       def render_collection
         entry_kvs = {}

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

@@ -16,7 +16,7 @@ if Oboe::Config[:active_record][:enabled]
     Oboe::Inst::ConnectionAdapters::FlavorInitializers.postgresql if adapter == "postgresql"
     Oboe::Inst::ConnectionAdapters::FlavorInitializers.oracle     if adapter == "oracleenhanced"
 
-  rescue Exception => e
+  rescue StandardError => e
     Oboe.logger.error "[oboe/error] Oboe/ActiveRecord error: #{e.inspect}"
     Oboe.logger.debug e.backtrace.join("\n")
   end

data/lib/oboe/frameworks/rails/inst/connection_adapters/mysql.rb

@@ -9,7 +9,7 @@ module Oboe
           Oboe.logger.info "[oboe/loading] Instrumenting activerecord mysqladapter" if Oboe::Config[:verbose]
 
           # ActiveRecord 3.2 and higher
-          if (::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR >= 2) or 
+          if (::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR >= 2) or
               ::ActiveRecord::VERSION::MAJOR == 4
 
             # AbstractMysqlAdapter
@@ -24,13 +24,13 @@ module Oboe
 
           else
             # ActiveRecord 3.1 and below
-            
+
             # MysqlAdapter
             Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::MysqlAdapter,
                                       Oboe::Inst::ConnectionAdapters::Utils)
 
             Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :execute)
-              
+
             if ::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR == 1
               Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :begin_db_transaction)
               Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :exec_delete)

data/lib/oboe/frameworks/rails/inst/connection_adapters/mysql2.rb

@@ -7,12 +7,12 @@ module Oboe
       module FlavorInitializers
         def self.mysql2
           Oboe.logger.info "[oboe/loading] Instrumenting activerecord mysql2adapter" if Oboe::Config[:verbose]
-            
+
           Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::Mysql2Adapter,
                                     Oboe::Inst::ConnectionAdapters::Utils)
 
           if (::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR == 0) or
-              ::ActiveRecord::VERSION::MAJOR == 2 
+              ::ActiveRecord::VERSION::MAJOR == 2
             # ActiveRecord 3.0 and prior
             Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::Mysql2Adapter, :execute)
           else

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

@@ -12,7 +12,7 @@ module Oboe
           Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter,
                                     Oboe::Inst::ConnectionAdapters::Utils)
 
-          if (::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR > 0) or 
+          if (::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR > 0) or
                 ::ActiveRecord::VERSION::MAJOR == 4
 
             # ActiveRecord 3.1 and up

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

@@ -5,7 +5,7 @@ module Oboe
   module Inst
     module ConnectionAdapters
       module Utils
-        
+
         def extract_trace_details(sql, name = nil, binds = [])
           opts = {}
 
@@ -26,7 +26,7 @@ module Oboe
               config = ::Rails.configuration.database_configuration[::Rails.env]
             else
               config = ::Rails.application.config.database_configuration[::Rails.env]
-            end  
+            end
 
             opts[:Database]   = config["database"] if config.has_key?("database")
             opts[:RemoteHost] = config["host"]     if config.has_key?("host")
@@ -42,7 +42,7 @@ module Oboe
         # We don't want to trace framework caches.  Only instrument SQL that
         # directly hits the database.
         def ignore_payload?(name)
-          %w(SCHEMA EXPLAIN CACHE).include? name.to_s or 
+          %w(SCHEMA EXPLAIN CACHE).include? name.to_s or
             (name and name.to_sym == :skip_logging) or
               name == "ActiveRecord::SchemaMigration Load"
         end
@@ -50,7 +50,7 @@ module Oboe
         #def cfg
         #  @config
         #end
-        
+
         def execute_with_oboe(sql, name = nil)
           if Oboe.tracing? and !ignore_payload?(name)
 
@@ -62,7 +62,7 @@ module Oboe
             execute_without_oboe(sql, name)
           end
         end
-        
+
         def exec_query_with_oboe(sql, name = nil, binds = [])
           if Oboe.tracing? and !ignore_payload?(name)
 
@@ -74,7 +74,7 @@ module Oboe
             exec_query_without_oboe(sql, name, binds)
           end
         end
-        
+
         def exec_delete_with_oboe(sql, name = nil, binds = [])
           if Oboe.tracing? and !ignore_payload?(name)
 
@@ -86,7 +86,7 @@ module Oboe
             exec_delete_without_oboe(sql, name, binds)
           end
         end
-        
+
         def exec_insert_with_oboe(sql, name = nil, binds = [], *args)
           if Oboe.tracing? and !ignore_payload?(name)
 
@@ -98,7 +98,7 @@ module Oboe
             exec_insert_without_oboe(sql, name, binds, *args)
           end
         end
-        
+
         def begin_db_transaction_with_oboe()
           if Oboe.tracing?
             opts = {}

data/lib/oboe/frameworks/sinatra.rb

@@ -31,11 +31,41 @@ module Oboe
           dispatch_without_oboe
         end
       end
-      
+
       def handle_exception_with_oboe(boom)
         Oboe::API.log_exception(nil, boom) if Oboe.tracing?
         handle_exception_without_oboe(boom)
       end
+
+      @@rum_xhr_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_ajax_header.js.erb')
+      @@rum_hdr_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_header.js.erb')
+      @@rum_ftr_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_footer.js.erb')
+
+      def oboe_rum_header
+        return unless Oboe::Config.rum_id
+        if Oboe.tracing?
+          if request.xhr?
+            return ERB.new(@@rum_xhr_tmpl).result
+          else
+            return ERB.new(@@rum_hdr_tmpl).result
+          end
+        end
+      rescue StandardError => e
+        Oboe.logger.warn "oboe_rum_header: #{e.message}."
+        return ""
+      end
+
+      def oboe_rum_footer
+        return unless Oboe::Config.rum_id
+        if Oboe.tracing?
+          # Even though the footer template is named xxxx.erb, there are no ERB tags in it so we'll
+          # skip that step for now
+          return @@rum_ftr_tmpl
+        end
+      rescue StandardError => e
+        Oboe.logger.warn "oboe_rum_footer: #{e.message}."
+        return ""
+      end
     end
   end
 end
@@ -54,11 +84,11 @@ if defined?(::Sinatra)
   # When in TEST environment, we load this instrumentation regardless.
   # Otherwise, only when Padrino isn't around.
   unless defined?(::Padrino) and not (ENV['RACK_ENV'] == "test")
-    # Padrino has 'enhanced' routes and rendering so the Sinatra 
+    # Padrino has 'enhanced' routes and rendering so the Sinatra
     # instrumentation won't work anyways.  Only load for pure Sinatra apps.
     ::Oboe::Util.send_include(::Sinatra::Base,      ::Oboe::Sinatra::Base)
     ::Oboe::Util.send_include(::Sinatra::Templates, ::Oboe::Sinatra::Templates)
-      
+
     # Report __Init after fork when in Heroku
     Oboe::API.report_init unless Oboe.heroku?
   end

data/lib/oboe/frameworks/sinatra/templates.rb

@@ -3,7 +3,7 @@
 
 module Oboe
   module Sinatra
-    module Templates 
+    module Templates
       def self.included(klass)
         ::Oboe::Util.method_alias(klass, :render, ::Sinatra::Templates)
       end
@@ -16,7 +16,7 @@ module Oboe
           report_kvs[:template] = data
 
           if Oboe::Context.tracing_layer_op?('render')
-            # For recursive calls to :render (for sub-partials and layouts), 
+            # For recursive calls to :render (for sub-partials and layouts),
             # use method profiling.
             begin
               name = data

data/lib/oboe/inst/cassandra.rb

@@ -11,7 +11,7 @@ module Oboe
           report_kvs[:Op] = op.to_s
           report_kvs[:Cf] = column_family.to_s if column_family
           report_kvs[:Key] = keys.inspect if keys
-         
+
           # Open issue - how to handle multiple Cassandra servers
           report_kvs[:RemoteHost], report_kvs[:RemotePort] = @servers.first.split(":")
 
@@ -20,7 +20,7 @@ module Oboe
           if options.empty? and args.is_a?(Array)
             options = args.last if args.last.is_a?(Hash)
           end
-          
+
           unless options.empty?
             [:start_key, :finish_key, :key_count, :batch_size, :columns, :count, :start,
              :stop, :finish, :finished, :reversed, :consistency, :ttl].each do |k|
@@ -73,10 +73,10 @@ module Oboe
           send :count_columns_without_oboe, *args
         end
       end
-      
+
       def get_columns_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
-        
+
         if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:multi_get_columns)
           report_kvs = extract_trace_details(:get_columns, column_family, key, columns_and_options)
 
@@ -87,7 +87,7 @@ module Oboe
           send :get_columns_without_oboe, *args
         end
       end
-      
+
       def multi_get_columns_with_oboe(column_family, key, *columns_and_options)
         return send :multi_get_columns_without_oboe, *args unless Oboe.tracing?
 
@@ -109,10 +109,10 @@ module Oboe
           send :get_without_oboe, *args
         end
       end
-      
+
       def multi_get_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
-        
+
         if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:get)
           report_kvs = extract_trace_details(:multi_get, column_family, key, columns_and_options)
 
@@ -134,7 +134,7 @@ module Oboe
           send :exists_without_oboe?, *args
         end
       end
-      
+
       def get_range_single_with_oboe(column_family, options = {})
         if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:get_range_batch)
           report_kvs = extract_trace_details(:get_range_single, column_family, nil, nil)
@@ -147,10 +147,10 @@ module Oboe
           get_range_single_without_oboe(column_family, options)
         end
       end
-      
+
       def get_range_batch_with_oboe(column_family, options = {})
         return get_range_batch_without_oboe(column_family, options) unless Oboe.tracing?
-          
+
         report_kvs = extract_trace_details(:get_range_batch, column_family, nil, nil)
         args = [column_family, options]
 
@@ -158,7 +158,7 @@ module Oboe
           get_range_batch_without_oboe(column_family, options)
         end
       end
-      
+
       def get_indexed_slices_with_oboe(column_family, index_clause, *columns_and_options)
         return send :get_indexed_slices_without_oboe, *args unless Oboe.tracing?
 
@@ -174,7 +174,7 @@ module Oboe
         unless Oboe.tracing?
           return create_index_without_oboe(keyspace, column_family, column_name, validation_class)
         end
-          
+
         report_kvs = extract_trace_details(:create_index, column_family, nil, nil)
         begin
           report_kvs[:Keyspace] = keyspace.to_s
@@ -190,7 +190,7 @@ module Oboe
 
       def drop_index_with_oboe(keyspace, column_family, column_name)
         return drop_index_without_oboe(keyspace, column_family, column_name) unless Oboe.tracing?
-        
+
         report_kvs = extract_trace_details(:drop_index, column_family, nil, nil)
         begin
           report_kvs[:Keyspace] = keyspace.to_s
@@ -216,7 +216,7 @@ module Oboe
           add_column_family_without_oboe(cf_def)
         end
       end
-      
+
       def drop_column_family_with_oboe(column_family)
         return drop_column_family_without_oboe(column_family) unless Oboe.tracing?
 
@@ -226,7 +226,7 @@ module Oboe
           drop_column_family_without_oboe(column_family)
         end
       end
-      
+
       def add_keyspace_with_oboe(ks_def)
         return add_keyspace_without_oboe(ks_def) unless Oboe.tracing?
 
@@ -237,10 +237,10 @@ module Oboe
           add_keyspace_without_oboe(ks_def)
         end
       end
-      
+
       def drop_keyspace_with_oboe(keyspace)
         return drop_keyspace_without_oboe(keyspace) unless Oboe.tracing?
-          
+
         report_kvs = extract_trace_details(:drop_keyspace, nil, nil, nil)
         report_kvs[:Name] = keyspace.to_s rescue ""
 
@@ -254,11 +254,11 @@ end
 
 if defined?(::Cassandra) and Oboe::Config[:cassandra][:enabled]
   Oboe.logger.info "[oboe/loading] Instrumenting cassandra" if Oboe::Config[:verbose]
-  
+
   class ::Cassandra
     include Oboe::Inst::Cassandra
 
-    [ :insert, :remove, :count_columns, :get_columns, :multi_get_columns, :get, 
+    [ :insert, :remove, :count_columns, :get_columns, :multi_get_columns, :get,
       :multi_get, :get_range_single, :get_range_batch, :get_indexed_slices,
       :create_index, :drop_index, :add_column_family, :drop_column_family,
       :add_keyspace, :drop_keyspace].each do |m|

data/lib/oboe/inst/dalli.rb

@@ -24,7 +24,7 @@ module Oboe
 
       def perform_with_oboe(*all_args, &blk)
         op, key, *args = *all_args
-        
+
         if Oboe.tracing? and not Oboe::Context.tracing_layer_op?(:get_multi)
           Oboe::API.trace('memcache', { :KVOp => op, :KVKey => key }) do
             result = perform_without_oboe(*all_args, &blk)
@@ -32,7 +32,7 @@ module Oboe
             info_kvs = {}
             info_kvs[:KVHit] = memcache_hit?(result) if op == :get and key.class == String
             info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:dalli][:collect_backtraces]
-            
+
             Oboe::API.log('memcache', 'info', info_kvs) unless info_kvs.empty?
             result
           end
@@ -43,11 +43,11 @@ module Oboe
 
       def get_multi_with_oboe(*keys)
         return get_multi_without_oboe(keys) unless Oboe.tracing?
-          
+
         info_kvs = {}
-          
+
         begin
-          info_kvs[:KVKeyCount] = keys.flatten.length 
+          info_kvs[:KVKeyCount] = keys.flatten.length
           info_kvs[:KVKeyCount] = (info_kvs[:KVKeyCount] - 1) if keys.last.is_a?(Hash) || keys.last.nil?
         rescue
           Oboe.logger.debug "[oboe/debug] Error collecting info keys: #{e.message}"
@@ -56,12 +56,12 @@ module Oboe
 
         Oboe::API.trace('memcache', { :KVOp => :get_multi }, :get_multi) do
           values = get_multi_without_oboe(keys)
-          
+
           info_kvs[:KVHitCount] = values.length
           info_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:dalli][:collect_backtraces]
           Oboe::API.log('memcache', 'info', info_kvs)
 
-          values 
+          values
         end
       end
     end