oboe 2.7.1.7 → 2.7.2.fuchs1

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

@@ -1,16 +1,16 @@
 # Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
-if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
+if defined?(ActionView::Base) && Oboe::Config[:action_view][:enabled]
 
   ##
   # 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)
   #
-  if (Rails::VERSION::MAJOR == 3 and Rails::VERSION::MINOR > 0) or Rails::VERSION::MAJOR == 4
+  if (Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR > 0) || Rails::VERSION::MAJOR == 4
 
-    Oboe.logger.info "[oboe/loading] Instrumenting actionview" if Oboe::Config[:verbose]
+    Oboe.logger.info '[oboe/loading] Instrumenting actionview' if Oboe::Config[:verbose]
 
     ActionView::PartialRenderer.class_eval do
       alias :render_partial_without_oboe :render_partial
@@ -45,7 +45,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
         end
 
         Oboe::API.profile(name, entry_kvs, Oboe::Config[:action_view][:collect_backtraces]) do
-          ret =  render_collection_without_oboe
+          render_collection_without_oboe
         end
       end
 

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

@@ -1,16 +1,16 @@
 # Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
-if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
+if defined?(ActionView::Base) && Oboe::Config[:action_view][:enabled]
 
   if Rails::VERSION::MAJOR == 2
 
-    Oboe.logger.info "[oboe/loading] Instrumenting actionview" if Oboe::Config[:verbose]
+    Oboe.logger.info '[oboe/loading] Instrumenting actionview' if Oboe::Config[:verbose]
 
     ActionView::Partials.module_eval do
       alias :render_partial_without_oboe :render_partial
       def render_partial(options = {})
-        if options.has_key?(:partial) and options[:partial].is_a?(String)
+        if options.key?(:partial) && options[:partial].is_a?(String)
           entry_kvs = {}
           begin
             name  = Oboe::Util.prettify(options[:partial]) if options.is_a?(Hash)
@@ -34,7 +34,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
       def render_partial_collection(options = {})
         entry_kvs = {}
         begin
-          name  = "partial_collection"
+          name  = 'partial_collection'
           entry_kvs[:FunctionName] = :render_partial_collection
           entry_kvs[:Class]        = :Partials
           entry_kvs[:Module]       = :ActionView

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

@@ -1,9 +1,9 @@
 # Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
-if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
+if defined?(ActionView::Base) && Oboe::Config[:action_view][:enabled]
 
-  if Rails::VERSION::MAJOR == 3 and Rails::VERSION::MINOR == 0
+  if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 0
 
     ActionView::Partials::PartialRenderer.class_eval do
       alias :render_partial_without_oboe :render_partial

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

@@ -9,12 +9,12 @@ require 'oboe/frameworks/rails/inst/connection_adapters/oracle'
 
 if Oboe::Config[:active_record][:enabled]
   begin
-    adapter = ActiveRecord::Base::connection.adapter_name.downcase
+    adapter = ActiveRecord::Base.connection.adapter_name.downcase
 
-    Oboe::Inst::ConnectionAdapters::FlavorInitializers.mysql      if adapter == "mysql"
-    Oboe::Inst::ConnectionAdapters::FlavorInitializers.mysql2     if adapter == "mysql2"
-    Oboe::Inst::ConnectionAdapters::FlavorInitializers.postgresql if adapter == "postgresql"
-    Oboe::Inst::ConnectionAdapters::FlavorInitializers.oracle     if adapter == "oracleenhanced"
+    Oboe::Inst::ConnectionAdapters::FlavorInitializers.mysql      if adapter == 'mysql'
+    Oboe::Inst::ConnectionAdapters::FlavorInitializers.mysql2     if adapter == 'mysql2'
+    Oboe::Inst::ConnectionAdapters::FlavorInitializers.postgresql if adapter == 'postgresql'
+    Oboe::Inst::ConnectionAdapters::FlavorInitializers.oracle     if adapter == 'oracleenhanced'
 
   rescue StandardError => e
     Oboe.logger.error "[oboe/error] Oboe/ActiveRecord error: #{e.inspect}"

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

@@ -6,20 +6,20 @@ module Oboe
     module ConnectionAdapters
       module FlavorInitializers
         def self.mysql
-          Oboe.logger.info "[oboe/loading] Instrumenting activerecord mysqladapter" if Oboe::Config[:verbose]
+          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 && ::ActiveRecord::VERSION::MINOR >= 2) ||
               ::ActiveRecord::VERSION::MAJOR == 4
 
             # AbstractMysqlAdapter
             Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter,
-                                      Oboe::Inst::ConnectionAdapters::Utils)
+                                    ::Oboe::Inst::ConnectionAdapters::Utils)
             Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter, :execute)
 
             # MysqlAdapter
             Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::MysqlAdapter,
-                                      Oboe::Inst::ConnectionAdapters::Utils)
+                                    ::Oboe::Inst::ConnectionAdapters::Utils)
             Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :exec_query)
 
           else
@@ -27,11 +27,11 @@ module Oboe
 
             # MysqlAdapter
             Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::MysqlAdapter,
-                                      Oboe::Inst::ConnectionAdapters::Utils)
+                                    ::Oboe::Inst::ConnectionAdapters::Utils)
 
             Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :execute)
 
-            if ::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR == 1
+            if ::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR == 1
               Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :begin_db_transaction)
               Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :exec_delete)
             end

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

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

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

@@ -6,7 +6,7 @@ module Oboe
     module ConnectionAdapters
       module FlavorInitializers
         def self.oracle
-          Oboe.logger.info "[oboe/loading] Instrumenting activerecord oracleenhancedadapter" if Oboe::Config[:verbose]
+          Oboe.logger.info '[oboe/loading] Instrumenting activerecord oracleenhancedadapter' if Oboe::Config[:verbose]
           ::ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.module_eval do
             include Oboe::Inst::ConnectionAdapters
           end if defined?(::ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)

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

@@ -7,12 +7,12 @@ module Oboe
       module FlavorInitializers
         def self.postgresql
 
-          Oboe.logger.info "[oboe/loading] Instrumenting activerecord postgresqladapter" if Oboe::Config[:verbose]
+          Oboe.logger.info '[oboe/loading] Instrumenting activerecord postgresqladapter' if Oboe::Config[:verbose]
 
           Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter,
-                                    Oboe::Inst::ConnectionAdapters::Utils)
+                                  ::Oboe::Inst::ConnectionAdapters::Utils)
 
-          if (::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR > 0) or
+          if (::ActiveRecord::VERSION::MAJOR == 3 && ::ActiveRecord::VERSION::MINOR > 0) ||
                 ::ActiveRecord::VERSION::MAJOR == 4
 
             # ActiveRecord 3.1 and up

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

@@ -28,12 +28,12 @@ module Oboe
               config = ::Rails.application.config.database_configuration[::Rails.env]
             end
 
-            opts[:Database]   = config["database"] if config.has_key?("database")
-            opts[:RemoteHost] = config["host"]     if config.has_key?("host")
-            opts[:Flavor]     = config["adapter"]  if config.has_key?("adapter")
+            opts[:Database]   = config['database'] if config.key?('database')
+            opts[:RemoteHost] = config['host']     if config.key?('host')
+            opts[:Flavor]     = config['adapter']  if config.key?('adapter')
           rescue StandardError => e
             Oboe.logger.debug "Exception raised capturing ActiveRecord KVs: #{e.inspect}"
-            Oboe.logger.debug e.backtrace.join("\n")
+            Oboe.logger.debug e.backtrace.join('\n')
           end
 
           return opts || {}
@@ -42,17 +42,17 @@ 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
-            (name and name.to_sym == :skip_logging) or
-              name == "ActiveRecord::SchemaMigration Load"
+          %w(SCHEMA EXPLAIN CACHE).include?(name.to_s) ||
+            (name && name.to_sym == :skip_logging) ||
+              name == 'ActiveRecord::SchemaMigration Load'
         end
 
-        #def cfg
-        #  @config
-        #end
+        # def cfg
+        #   @config
+        # end
 
         def execute_with_oboe(sql, name = nil)
-          if Oboe.tracing? and !ignore_payload?(name)
+          if Oboe.tracing? && !ignore_payload?(name)
 
             opts = extract_trace_details(sql, name)
             Oboe::API.trace('activerecord', opts || {}) do
@@ -64,7 +64,7 @@ module Oboe
         end
 
         def exec_query_with_oboe(sql, name = nil, binds = [])
-          if Oboe.tracing? and !ignore_payload?(name)
+          if Oboe.tracing? && !ignore_payload?(name)
 
             opts = extract_trace_details(sql, name, binds)
             Oboe::API.trace('activerecord', opts || {}) do
@@ -76,7 +76,7 @@ module Oboe
         end
 
         def exec_delete_with_oboe(sql, name = nil, binds = [])
-          if Oboe.tracing? and !ignore_payload?(name)
+          if Oboe.tracing? && !ignore_payload?(name)
 
             opts = extract_trace_details(sql, name, binds)
             Oboe::API.trace('activerecord', opts || {}) do
@@ -88,7 +88,7 @@ module Oboe
         end
 
         def exec_insert_with_oboe(sql, name = nil, binds = [], *args)
-          if Oboe.tracing? and !ignore_payload?(name)
+          if Oboe.tracing? && !ignore_payload?(name)
 
             opts = extract_trace_details(sql, name, binds)
             Oboe::API.trace('activerecord', opts || {}) do
@@ -99,20 +99,19 @@ module Oboe
           end
         end
 
-        def begin_db_transaction_with_oboe()
+        def begin_db_transaction_with_oboe
           if Oboe.tracing?
             opts = {}
 
-            opts[:Query] = "BEGIN"
+            opts[:Query] = 'BEGIN'
             Oboe::API.trace('activerecord', opts || {}) do
-              begin_db_transaction_without_oboe()
+              begin_db_transaction_without_oboe
             end
           else
-            begin_db_transaction_without_oboe()
+            begin_db_transaction_without_oboe
           end
         end
       end # Utils
     end
   end
 end
-

data/lib/oboe/frameworks/sinatra.rb

@@ -52,7 +52,7 @@ module Oboe
         end
       rescue StandardError => e
         Oboe.logger.warn "oboe_rum_header: #{e.message}."
-        return ""
+        return ''
       end
 
       def oboe_rum_footer
@@ -64,7 +64,7 @@ module Oboe
         end
       rescue StandardError => e
         Oboe.logger.warn "oboe_rum_footer: #{e.message}."
-        return ""
+        return ''
       end
     end
   end
@@ -74,7 +74,7 @@ if defined?(::Sinatra)
   require 'oboe/inst/rack'
   require 'oboe/frameworks/sinatra/templates'
 
-  Oboe.logger.info "[oboe/loading] Instrumenting Sinatra" if Oboe::Config[:verbose]
+  Oboe.logger.info '[oboe/loading] Instrumenting Sinatra' if Oboe::Config[:verbose]
 
   Oboe::Loading.load_access_key
   Oboe::Inst.load_instrumentation
@@ -83,7 +83,7 @@ if defined?(::Sinatra)
 
   # When in the gem TEST environment, we load this instrumentation regardless.
   # Otherwise, only when Padrino isn't around.
-  unless defined?(::Padrino) and not (ENV.has_key?("OBOE_GEM_TEST"))
+  unless defined?(::Padrino) and not (ENV.key?('OBOE_GEM_TEST'))
     # 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)
@@ -93,4 +93,3 @@ if defined?(::Sinatra)
     Oboe::API.report_init unless Oboe.heroku?
   end
 end
-

data/lib/oboe/inst/cassandra.rb

@@ -13,25 +13,25 @@ module Oboe
           report_kvs[:Key] = keys.inspect if keys
 
           # Open issue - how to handle multiple Cassandra servers
-          report_kvs[:RemoteHost], report_kvs[:RemotePort] = @servers.first.split(":")
+          report_kvs[:RemoteHost], report_kvs[:RemotePort] = @servers.first.split(':')
 
           report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:cassandra][:collect_backtraces]
 
-          if options.empty? and args.is_a?(Array)
+          if options.empty? && 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|
-              report_kvs[k.to_s.capitalize] = options[k] if options.has_key?(k)
+              report_kvs[k.to_s.capitalize] = options[k] if options.key?(k)
             end
 
             if op == :get_indexed_slices
               index_clause = columns_and_options[:index_clause] || {}
               unless index_clause.empty?
                 [:column_name, :value, :comparison].each do |k|
-                  report_kvs[k.to_s.capitalize] = index_clause[k] if index_clause.has_key?(k)
+                  report_kvs[k.to_s.capitalize] = index_clause[k] if index_clause.key?(k)
                 end
               end
             end
@@ -77,7 +77,7 @@ module Oboe
       def get_columns_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
 
-        if Oboe.tracing? and not Oboe.tracing_layer_op?(:multi_get_columns)
+        if Oboe.tracing? && !Oboe.tracing_layer_op?(:multi_get_columns)
           report_kvs = extract_trace_details(:get_columns, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -113,7 +113,7 @@ module Oboe
       def multi_get_with_oboe(column_family, key, *columns_and_options)
         args = [column_family, key] + columns_and_options
 
-        if Oboe.tracing? and not Oboe.tracing_layer_op?(:get)
+        if Oboe.tracing? && !Oboe.tracing_layer_op?(:get)
           report_kvs = extract_trace_details(:multi_get, column_family, key, columns_and_options)
 
           Oboe::API.trace('cassandra', report_kvs) do
@@ -136,9 +136,8 @@ module Oboe
       end
 
       def get_range_single_with_oboe(column_family, options = {})
-        if Oboe.tracing? and not Oboe.tracing_layer_op?(:get_range_batch)
+        if Oboe.tracing? && !Oboe.tracing_layer_op?(:get_range_batch)
           report_kvs = extract_trace_details(:get_range_single, column_family, nil, nil)
-          args = [column_family, options]
 
           Oboe::API.trace('cassandra', report_kvs) do
             get_range_single_without_oboe(column_family, options)
@@ -152,7 +151,6 @@ module Oboe
         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]
 
         Oboe::API.trace('cassandra', report_kvs, :get_range_batch) do
           get_range_batch_without_oboe(column_family, options)
@@ -208,7 +206,7 @@ module Oboe
 
         report_kvs = extract_trace_details(:add_column_family, nil, nil, nil)
         begin
-          report_kvs[:Cf] = cf_def[:name] if cf_def.is_a?(Hash) and cf_def.has_key?(:name)
+          report_kvs[:Cf] = cf_def[:name] if cf_def.is_a?(Hash) && cf_def.key?(:name)
         rescue
         end
 
@@ -231,7 +229,7 @@ module Oboe
         return add_keyspace_without_oboe(ks_def) unless Oboe.tracing?
 
         report_kvs = extract_trace_details(:add_keyspace, nil, nil, nil)
-        report_kvs[:Name] = ks_def.name rescue ""
+        report_kvs[:Name] = ks_def.name rescue ''
 
         Oboe::API.trace('cassandra', report_kvs) do
           add_keyspace_without_oboe(ks_def)
@@ -242,7 +240,7 @@ module Oboe
         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 ""
+        report_kvs[:Name] = keyspace.to_s rescue ''
 
         Oboe::API.trace('cassandra', report_kvs) do
           drop_keyspace_without_oboe(keyspace)
@@ -252,16 +250,16 @@ module Oboe
   end
 end
 
-if defined?(::Cassandra) and Oboe::Config[:cassandra][:enabled]
-  Oboe.logger.info "[oboe/loading] Instrumenting cassandra" if Oboe::Config[:verbose]
+if defined?(::Cassandra) && 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,
-      :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|
+    [: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|
       if method_defined?(m)
         class_eval "alias #{m}_without_oboe #{m}"
         class_eval "alias #{m} #{m}_with_oboe"
@@ -273,7 +271,7 @@ if defined?(::Cassandra) and Oboe::Config[:cassandra][:enabled]
     if method_defined?(:exists?)
       alias exists_without_oboe? exists?
       alias exists? exists_with_oboe?
-    else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Cassandra (exists?).  Partial traces may occur."
+    else Oboe.logger.warn '[oboe/loading] Couldn\'t properly instrument Cassandra (exists?).  Partial traces may occur.'
     end
   end # class Cassandra
 end

data/lib/oboe/inst/dalli.rb

@@ -8,11 +8,11 @@ module Oboe
 
       def self.included(cls)
         cls.class_eval do
-          Oboe.logger.info "[oboe/loading] Instrumenting memcache (dalli)" if Oboe::Config[:verbose]
+          Oboe.logger.info '[oboe/loading] Instrumenting memcache (dalli)' if Oboe::Config[:verbose]
           if ::Dalli::Client.private_method_defined? :perform
             alias perform_without_oboe perform
             alias perform perform_with_oboe
-          else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Memcache (Dalli).  Partial traces may occur."
+          else Oboe.logger.warn '[oboe/loading] Couldn\'t properly instrument Memcache (Dalli).  Partial traces may occur.'
           end
 
           if ::Dalli::Client.method_defined? :get_multi
@@ -25,12 +25,12 @@ module Oboe
       def perform_with_oboe(*all_args, &blk)
         op, key, *args = *all_args
 
-        if Oboe.tracing? and not Oboe.tracing_layer_op?(:get_multi)
+        if Oboe.tracing? && !Oboe.tracing_layer_op?(:get_multi)
           Oboe::API.trace('memcache', { :KVOp => op, :KVKey => key }) do
             result = perform_without_oboe(*all_args, &blk)
 
             info_kvs = {}
-            info_kvs[:KVHit] = memcache_hit?(result) if op == :get and key.class == String
+            info_kvs[:KVHit] = memcache_hit?(result) if op == :get && 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?
@@ -68,7 +68,7 @@ module Oboe
   end
 end
 
-if defined?(Dalli) and Oboe::Config[:dalli][:enabled]
+if defined?(Dalli) && Oboe::Config[:dalli][:enabled]
   ::Dalli::Client.module_eval do
     include Oboe::Inst::Dalli
   end