oboe 1.4.2.2 → 2.1.1

data/lib/oboe/frameworks/rails.rb

@@ -18,7 +18,7 @@ module Oboe
             end
           end
         rescue Exception => e  
-          logger.warn "oboe_rum_header: #{e.message}." if defined?(logger)
+          Oboe.logger.warn "oboe_rum_header: #{e.message}."
           return ""
         end
       end
@@ -32,7 +32,7 @@ module Oboe
             return raw(@@rum_ftr_tmpl)
           end
         rescue Exception => e
-          logger.warn "oboe_rum_footer: #{e.message}." if defined?(logger)
+          Oboe.logger.warn "oboe_rum_footer: #{e.message}."
           return ""
         end
       end
@@ -62,14 +62,14 @@ module Oboe
         begin
           require f
         rescue => e
-          $stderr.puts "[oboe/loading] Error loading rails insrumentation file '#{f}' : #{e}"
+          Oboe.logger.error "[oboe/loading] Error loading rails insrumentation file '#{f}' : #{e}"
         end
       end
       
       if ::Rails::VERSION::MAJOR > 2
-        puts "Tracelytics oboe gem #{Gem.loaded_specs['oboe'].version.to_s} successfully loaded."
+        Oboe.logger.info "Tracelytics oboe gem #{Gem.loaded_specs['oboe'].version.to_s} successfully loaded."
       else
-        puts "Tracelytics oboe gem #{Oboe::Version::STRING} successfully loaded." 
+        Oboe.logger.info "Tracelytics oboe gem #{Oboe::Version::STRING} successfully loaded." 
       end
     end
 
@@ -102,11 +102,12 @@ if defined?(::Rails)
         end
 
         initializer 'oboe.rack' do |app|
-          puts "[oboe/loading] Instrumenting rack" if Oboe::Config[:verbose]
+          Oboe.logger.info "[oboe/loading] Instrumenting rack" if Oboe::Config[:verbose]
           app.config.middleware.insert 0, "Oboe::Rack"
         end
 
         config.after_initialize do
+          Oboe::Loading.setup_logger
           Oboe::Loading.load_access_key
           Oboe::Inst.load_instrumentation
           Oboe::Rails.load_instrumentation
@@ -114,11 +115,12 @@ if defined?(::Rails)
       end
     end
   else
+    Oboe::Loading.setup_logger
     Oboe::Rails.load_initializer
     Oboe::Loading.load_access_key
     
     Rails.configuration.after_initialize do
-      puts "[oboe/loading] Instrumenting rack" if Oboe::Config[:verbose]
+      Oboe.logger.info "[oboe/loading] Instrumenting rack" if Oboe::Config[:verbose]
       Rails.configuration.middleware.insert 0, "Oboe::Rack"
 
       Oboe::Inst.load_instrumentation

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

@@ -84,7 +84,7 @@ if defined?(ActionController::Base) and Oboe::Config[:action_controller][:enable
       end
     end
   end
-  puts "[oboe/loading] Instrumenting actioncontroler" if Oboe::Config[:verbose]
+  Oboe.logger.info "[oboe/loading] Instrumenting actioncontroler" if Oboe::Config[:verbose]
 end
 # vim:set expandtab:tabstop=2
 

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

@@ -4,7 +4,7 @@
 if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
 
   if Rails::VERSION::MAJOR == 3
-    puts "[oboe/loading] Instrumenting actionview" if Oboe::Config[:verbose]
+    Oboe.logger.info "[oboe/loading] Instrumenting actionview" if Oboe::Config[:verbose]
 
     if Rails::VERSION::MINOR == 0
       ActionView::Partials::PartialRenderer.class_eval do
@@ -13,12 +13,12 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           entry_kvs = {}
           begin
             entry_kvs[:Language]     = :ruby
-            entry_kvs[:ProfileName]  = @options[:partial] if @options.is_a?(Hash)
             entry_kvs[:FunctionName] = :render_partial
             entry_kvs[:Class]        = :PartialRenderer
             entry_kvs[:Module]       = 'ActionView::Partials'
             entry_kvs[:File]         = __FILE__
             entry_kvs[:LineNumber]   = __LINE__
+            entry_kvs[:ProfileName]  = @options[:partial].to_s if @options.is_a?(Hash)
           rescue
           end
 
@@ -28,7 +28,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           exit_kvs = {}
           begin
             exit_kvs[:Language] = :ruby
-            exit_kvs[:ProfileName]  = @options[:partial] if @options.is_a?(Hash)
+            exit_kvs[:ProfileName]  = @options[:partial].to_s if @options.is_a?(Hash)
           rescue
           end
 
@@ -71,12 +71,12 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           entry_kvs = {}
           begin
             entry_kvs[:Language]     = :ruby
-            entry_kvs[:ProfileName]  = @options[:partial] if @options.is_a?(Hash)
             entry_kvs[:FunctionName] = :render_partial
             entry_kvs[:Class]        = :PartialRenderer
             entry_kvs[:Module]       = :ActionView
             entry_kvs[:File]         = __FILE__
             entry_kvs[:LineNumber]   = __LINE__
+            entry_kvs[:ProfileName]  = @options[:partial].to_s if @options.is_a?(Hash)
           rescue
           end
 
@@ -86,7 +86,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           exit_kvs = {}
           begin
             exit_kvs[:Language] = :ruby
-            exit_kvs[:ProfileName]  = @options[:partial] if @options.is_a?(Hash)
+            exit_kvs[:ProfileName]  = @options[:partial].to_s if @options.is_a?(Hash)
           rescue
           end
 
@@ -124,7 +124,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
       end
     end
   elsif Rails::VERSION::MAJOR == 2
-    puts "[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
@@ -133,12 +133,12 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           entry_kvs = {}
           begin
             entry_kvs[:Language]     = :ruby
-            entry_kvs[:ProfileName]  = options[:partial]
             entry_kvs[:FunctionName] = :render_partial
             entry_kvs[:Class]        = :Partials
             entry_kvs[:Module]       = :ActionView
             entry_kvs[:File]         = __FILE__
             entry_kvs[:LineNumber]   = __LINE__
+            entry_kvs[:ProfileName]  = options[:partial].to_s if options.is_a?(Hash)
           rescue
           end
 
@@ -148,7 +148,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
           exit_kvs = {}
           begin
             exit_kvs[:Language] = :ruby
-            exit_kvs[:ProfileName] = options[:partial]
+            exit_kvs[:ProfileName] = options[:partial].to_s if options.is_a?(Hash)
           rescue
           end
 

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

@@ -108,13 +108,13 @@ module Oboe
             if ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::method_defined? :exec_query
               alias exec_query_without_oboe exec_query
               alias exec_query exec_query_with_oboe
-            else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
               
             if ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::method_defined? :exec_delete
               alias exec_delete_without_oboe exec_delete
               alias exec_delete exec_delete_with_oboe
-            else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
           end
         end
@@ -128,7 +128,7 @@ module Oboe
             if ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::method_defined? :execute
               alias execute_without_oboe execute
               alias execute execute_with_oboe
-            else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
           end
         end
@@ -142,7 +142,7 @@ module Oboe
             if ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::method_defined? :execute
               alias execute_without_oboe execute
               alias execute execute_with_oboe
-            else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
           end
         end
@@ -156,7 +156,7 @@ module Oboe
             if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :exec_query
               alias exec_query_without_oboe exec_query
               alias exec_query exec_query_with_oboe
-            else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
           end
         end
@@ -170,14 +170,14 @@ module Oboe
             if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :execute
               alias execute_without_oboe execute
               alias execute execute_with_oboe
-            else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
             
             if ::Rails::VERSION::MAJOR == 3 and ::Rails::VERSION::MINOR == 1
               if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :begin_db_transaction
                 alias begin_db_transaction_without_oboe begin_db_transaction
                 alias begin_db_transaction begin_db_transaction_with_oboe
-              else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
             end
             
@@ -185,13 +185,13 @@ module Oboe
               if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :exec_query
                 alias exec_query_without_oboe exec_query
                 alias exec_query exec_query_with_oboe
-              else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
               
               if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :exec_delete
                 alias exec_delete_without_oboe exec_delete
                 alias exec_delete exec_delete_with_oboe
-              else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
             end
           end
@@ -207,13 +207,13 @@ module Oboe
               if ActiveRecord::ConnectionAdapters::Mysql2Adapter::method_defined? :execute
                 alias execute_without_oboe execute
                 alias execute execute_with_oboe
-              else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
             else
               if ActiveRecord::ConnectionAdapters::Mysql2Adapter::method_defined? :exec_insert
                 alias exec_insert_without_oboe exec_insert
                 alias exec_insert exec_insert_with_oboe
-              else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
              
               # In Rails 3.1, exec_query was defined as a private method
@@ -221,13 +221,13 @@ module Oboe
                 ActiveRecord::ConnectionAdapters::Mysql2Adapter::private_method_defined? :exec_query
                 alias exec_query_without_oboe exec_query
                 alias exec_query exec_query_with_oboe
-              else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
               
               if ActiveRecord::ConnectionAdapters::Mysql2Adapter::method_defined? :exec_delete
                 alias exec_delete_without_oboe exec_delete
                 alias exec_delete exec_delete_with_oboe
-              else puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
+              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
             end
           end
@@ -236,7 +236,7 @@ module Oboe
 
       module FlavorInitializers
         def self.mysql
-          puts "[oboe/loading] Instrumenting activerecord mysqladapter" if Oboe::Config[:verbose]
+          Oboe.logger.info "[oboe/loading] Instrumenting activerecord mysqladapter" if Oboe::Config[:verbose]
           if ::Rails::VERSION::MAJOR == 3 and ::Rails::VERSION::MINOR > 1
             ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.module_eval do
               include Oboe::Inst::ConnectionAdapters::AbstractMysqlAdapter
@@ -253,14 +253,14 @@ module Oboe
         end
 
         def self.mysql2
-          puts "[oboe/loading] Instrumenting activerecord mysql2adapter" if Oboe::Config[:verbose]
+          Oboe.logger.info "[oboe/loading] Instrumenting activerecord mysql2adapter" if Oboe::Config[:verbose]
           ::ActiveRecord::ConnectionAdapters::Mysql2Adapter.module_eval do
             include Oboe::Inst::ConnectionAdapters::Mysql2Adapter
           end if defined?(::ActiveRecord::ConnectionAdapters::Mysql2Adapter)
         end
 
         def self.postgresql
-          puts "[oboe/loading] Instrumenting activerecord postgresqladapter" if Oboe::Config[:verbose]
+          Oboe.logger.info "[oboe/loading] Instrumenting activerecord postgresqladapter" if Oboe::Config[:verbose]
           ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.module_eval do
             if ::Rails::VERSION::MAJOR == 3 and ::Rails::VERSION::MINOR > 0
               include Oboe::Inst::ConnectionAdapters::PostgreSQLAdapter
@@ -271,7 +271,7 @@ module Oboe
         end
 
         def self.oracle
-          puts "[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)
@@ -291,7 +291,7 @@ if Oboe::Config[:active_record][:enabled]
     Oboe::Inst::ConnectionAdapters::FlavorInitializers.oracle     if adapter == "oracleenhanced"
 
   rescue Exception => e
-    puts "[oboe/error] Oboe/ActiveRecord error: #{e.message}" if Oboe::Config[:verbose]
+    Oboe.logger.error "[oboe/error] Oboe/ActiveRecord error: #{e.message}" if Oboe::Config[:verbose]
   end
 end
 # vim:set expandtab:tabstop=2

data/lib/oboe/inst/cassandra.rb

@@ -285,7 +285,7 @@ module Oboe
 end
 
 if defined?(::Cassandra) and Oboe::Config[:cassandra][:enabled]
-  puts "[oboe/loading] Instrumenting cassandra" if Oboe::Config[:verbose]
+  Oboe.logger.info "[oboe/loading] Instrumenting cassandra" if Oboe::Config[:verbose]
   
   class ::Cassandra
     include Oboe::Inst::Cassandra
@@ -297,7 +297,7 @@ if defined?(::Cassandra) and Oboe::Config[:cassandra][:enabled]
       if method_defined?(m)
         class_eval "alias #{m}_without_oboe #{m}"
         class_eval "alias #{m} #{m}_with_oboe"
-      else puts "[oboe/loading] Couldn't properly instrument Cassandra (#{m}).  Partial traces may occur."
+      else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Cassandra (#{m}).  Partial traces may occur."
       end
     end
 
@@ -305,7 +305,7 @@ if defined?(::Cassandra) and Oboe::Config[:cassandra][:enabled]
     if method_defined?(:exists?)
       alias exists_without_oboe? exists?
       alias exists? exists_with_oboe?
-    else puts "[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
-          puts "[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 puts "[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

data/lib/oboe/inst/http.rb

@@ -37,5 +37,5 @@ Net::HTTP.class_eval do
   alias request_without_oboe request
   alias request request_with_oboe
 
-  puts "[oboe/loading] Instrumenting net/http" if Oboe::Config[:verbose]
+  Oboe.logger.info "[oboe/loading] Instrumenting net/http" if Oboe::Config[:verbose]
 end

data/lib/oboe/inst/memcache.rb

@@ -7,7 +7,7 @@ module Oboe
       include Oboe::API::Memcache
       
       def self.included(cls)
-        puts "[oboe/loading] Instrumenting memcache" if Oboe::Config[:verbose]
+        Oboe.logger.info "[oboe/loading] Instrumenting memcache" if Oboe::Config[:verbose]
 
         cls.class_eval do
           MEMCACHE_OPS.reject { |m| not method_defined?(m) }.each do |m|
@@ -33,21 +33,21 @@ module Oboe
             alias request_setup_without_oboe request_setup
             alias request_setup request_setup_with_oboe
           elsif Oboe::Config[:verbose]
-            puts "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur."
+            Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur."
           end
 
           if ::MemCache.method_defined? :cache_get
             alias cache_get_without_oboe cache_get
             alias cache_get cache_get_with_oboe
           elsif Oboe::Config[:verbose]
-            puts "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur." 
+            Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur." 
           end
           
           if ::MemCache.method_defined? :get_multi
             alias get_multi_without_oboe get_multi
             alias get_multi get_multi_with_oboe
           elsif Oboe::Config[:verbose]
-            puts "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur." 
+            Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Memcache.  Partial traces may occur." 
           end
         end
       end

data/lib/oboe/inst/memcached.rb

@@ -8,7 +8,7 @@ module Oboe
       include Oboe::API::Memcache
       
       def self.included(cls)
-        puts "[oboe/loading] Instrumenting memcached" if Oboe::Config[:verbose]
+        Oboe.logger.info "[oboe/loading] Instrumenting memcached" if Oboe::Config[:verbose]
 
         cls.class_eval do
           MEMCACHE_OPS.reject { |m| not method_defined?(m) }.each do |m|
@@ -44,7 +44,7 @@ module Oboe
             alias get_multi_without_oboe get_multi
             alias get_multi get_multi_with_oboe
           elsif Oboe::Config[:verbose]
-            puts "[oboe/loading] Couldn't properly instrument Memcached.  Partial traces may occur." 
+            Oboe.logger.warn "[oboe/loading] Couldn't properly instrument Memcached.  Partial traces may occur." 
           end
         end
       end

data/lib/oboe/inst/mongo.rb

@@ -21,7 +21,7 @@ module Oboe
 end
 
 if defined?(::Mongo) and Oboe::Config[:mongo][:enabled]
-  puts "[oboe/loading] Instrumenting mongo" if Oboe::Config[:verbose]
+  Oboe.logger.info "[oboe/loading] Instrumenting mongo" if Oboe::Config[:verbose]
 
   if defined?(::Mongo::DB)
     module ::Mongo

data/lib/oboe/inst/moped.rb

@@ -23,7 +23,7 @@ module Oboe
 end
 
 if defined?(::Moped) and Oboe::Config[:moped][:enabled]
-  puts "[oboe/loading] Instrumenting moped" if Oboe::Config[:verbose]
+  Oboe.logger.info "[oboe/loading] Instrumenting moped" if Oboe::Config[:verbose]
 
   if defined?(::Moped::Database)
     module ::Moped
@@ -73,7 +73,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           if method_defined?(m)
             class_eval "alias #{m}_without_oboe #{m}"
             class_eval "alias #{m} #{m}_with_oboe"
-          else puts "[oboe/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
+          else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
           end
         end
       end
@@ -133,7 +133,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           if method_defined?(m)
             class_eval "alias #{m}_without_oboe #{m}"
             class_eval "alias #{m} #{m}_with_oboe"
-          else puts "[oboe/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
+          else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
           end
         end
       end
@@ -314,7 +314,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           if method_defined?(m)
             class_eval "alias #{m}_without_oboe #{m}"
             class_eval "alias #{m} #{m}_with_oboe"
-          else puts "[oboe/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
+          else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
           end
         end
       end
@@ -408,7 +408,7 @@ if defined?(::Moped) and Oboe::Config[:moped][:enabled]
           if method_defined?(m)
             class_eval "alias #{m}_without_oboe #{m}"
             class_eval "alias #{m} #{m}_with_oboe"
-          else puts "[oboe/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
+          else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument moped (#{m}).  Partial traces may occur."
           end
         end
       end