oboe 1.3.8 → 1.3.9.1

data/lib/method_profiling.rb

@@ -2,78 +2,76 @@
 # All rights reserved.
 
 module OboeMethodProfiling
-    def self.included klass
-        klass.extend ClassMethods
-    end
+  def self.included klass
+    klass.extend ClassMethods
+  end
 
-    module ClassMethods
-        def profile_method(method_name, profile_name, store_args=false, store_return=false, profile=false)
-            #this only gets file and line where profiling is turned on, presumably
-            #right after the function definition. ruby 1.9 has nice introspection (Method.source_location)
-            #but its appears no such luck for ruby 1.8
-            version = RbConfig::CONFIG['ruby_version']
-            file = nil
-            line = nil
-            if version and version.match(/^1.9/)
-                info = self.method(method_name).source_location
-                if !info.nil?
-                  file = info[0]
-                  line = info[1] 
-                end
-            else
-                info = Kernel.caller[0].split(':')
-                file = info.first
-                line = info.last
-            end
+  module ClassMethods
+    def profile_method(method_name, profile_name, store_args=false, store_return=false, profile=false)
+      #this only gets file and line where profiling is turned on, presumably
+      #right after the function definition. ruby 1.9 has nice introspection (Method.source_location)
+      #but its appears no such luck for ruby 1.8
+      version = RbConfig::CONFIG['ruby_version']
+      file = nil
+      line = nil
+      if version and version.match(/^1.9/)
+        info = self.instance_method(method_name).source_location
+        if !info.nil?
+          file = info[0]
+          line = info[1] 
+        end
+      else
+        info = Kernel.caller[0].split(':')
+        file = info.first
+        line = info.last
+      end
 
-            #profiling via ruby-prof, is it possible to get return value of profiled code?
-            code = "def _oboe_profiled_#{method_name}(*args, &block)
-                        def pps(*args)
-                            old_out = $stdout
-                            begin
-                                s = StringIO.new
-                                $stdout = s
-                                pp(*args)
-                            ensure
-                                $stdout = old_out
-                            end
-                            s.string
-                        end
+      #profiling via ruby-prof, is it possible to get return value of profiled code?
+      code = "def _oboe_profiled_#{method_name}(*args, &block)
+                def pps(*args)
+                  old_out = $stdout
+                  begin
+                    s = StringIO.new
+                    $stdout = s
+                    pp(*args)
+                  ensure
+                    $stdout = old_out
+                  end
+                  s.string
+                end
 
-                        # file and line number are fetched in Context.log
-                        # because we have access to the correct backtrace there
-                        entry_kvs = {'Language'     => 'ruby',
-                                     'ProfileName'  => '#{profile_name}',
-                                     'FunctionName' => '#{method_name}',
-                                     'Class'        => self.class.to_s.rpartition('::').last,
-                                     'Module'       => self.class.to_s.rpartition('::').first,
-                                     'File'         => '#{file}',
-                                     'LineNumber'    => '#{line}' 
-                                    }
+                entry_kvs = {'Language'     => 'ruby',
+                             'ProfileName'  => '#{profile_name}',
+                             'FunctionName' => '#{method_name}',
+                             'Class'        => self.class.to_s.rpartition('::').last,
+                             'Module'       => self.class.to_s.rpartition('::').first,
+                             'File'         => '#{file}',
+                             'LineNumber'    => '#{line}' 
+                            }
 
-                        if #{store_args}
-                            entry_kvs['Args'] = pps *args
-                        end
+                if #{store_args}
+                  entry_kvs['Args'] = pps *args
+                end
 
-                        Oboe::Context.log(nil, 'profile_entry', entry_kvs)
+                Oboe::Context.log(nil, 'profile_entry', entry_kvs)
 
-                        ret = _oboe_orig_#{method_name}(*args, &block)
+                ret = _oboe_orig_#{method_name}(*args, &block)
 
-                        exit_kvs =  {'Language'     => 'ruby',
-                                     'ProfileName'  => '#{profile_name}'
-                                    }
-                        
-                        if #{store_return}
-                            exit_kvs['ReturnValue'] = pps ret
-                        end
+                exit_kvs =  {'Language'     => 'ruby',
+                             'ProfileName'  => '#{profile_name}'
+                            }
+                
+                if #{store_return}
+                  exit_kvs['ReturnValue'] = pps ret
+                end
 
-                        Oboe::Context.log(nil, 'profile_exit', exit_kvs)
+                Oboe::Context.log(nil, 'profile_exit', exit_kvs)
 
-                        ret
-                    end"
-            class_eval code, __FILE__, __LINE__
-            alias_method "_oboe_orig_#{method_name}", method_name
-            alias_method method_name, "_oboe_profiled_#{method_name}"
-        end
+                ret
+              end"
+      class_eval code, __FILE__, __LINE__
+      alias_method "_oboe_orig_#{method_name}", method_name
+      alias_method method_name, "_oboe_profiled_#{method_name}"
     end
+  end
 end

data/lib/oboe.rb

@@ -10,10 +10,14 @@ begin
     require 'oboe_metal.so'
     require 'oboe_metal'
   end
-  require 'rbconfig'
-  require 'method_profiling'
   require 'oboe/config'
   require 'oboe/loading'
+  require 'method_profiling'
+  require 'oboe/instrumentation'
+  require 'oboe/ruby'
+
+  # Frameworks
+  require 'oboe/frameworks/rails' if defined?(::Rails)
 
 rescue LoadError
   puts "Unsupported Tracelytics environment (no libs).  Going No-op."

data/lib/oboe/api/layerinit.rb

@@ -6,11 +6,11 @@ module Oboe
       # layer.
       #
       def report_init(layer)
-        platform_info                  = { '__Init' => 1 }
-        platform_info['RubyPlatform']     = RUBY_PLATFORM
-        platform_info['RubyVersion']      = RUBY_VERSION
-        platform_info['RailsVersion']     = ::Rails.version if defined?(Rails)
-        platform_info['OboeVersion']      = Gem.loaded_specs['oboe'].try(:version).to_s
+        platform_info                         = { '__Init' => 1 }
+        platform_info['RubyPlatformVersion']  = RUBY_PLATFORM
+        platform_info['RubyVersion']          = RUBY_VERSION
+        platform_info['RailsVersion']         = ::Rails.version if defined?(Rails)
+        platform_info['OboeRubyVersion']      = Gem.loaded_specs['oboe'].version if Gem.loaded_specs['oboe']
 
         force_trace do
           start_trace(layer, nil, platform_info) { }

data/lib/oboe/api/logging.rb

@@ -40,11 +40,14 @@ module Oboe
       #
       # Returns nothing.
       def log_exception(layer, exn)
-        log(layer, 'error', {
-          :ErrorClass => exn.class.name,
-          :Message => exn.message,
-          :ErrorBacktrace => exn.backtrace.join("\r\n")
-        })
+        unless exn.instance_variable_get(:@oboe_logged)
+          log(layer, 'error', {
+            :ErrorClass => exn.class.name,
+            :Message => exn.message,
+            :ErrorBacktrace => exn.backtrace.join("\r\n")
+          })
+          exn.instance_variable_set(:@oboe_logged, true)
+        end
       end
   
       # Public: Decide whether or not to start a trace, and report an event

data/lib/oboe/api/tracing.rb

@@ -35,7 +35,7 @@ module Oboe
         begin 
           yield
         rescue Exception => e
-          log_exception(layer, e)
+            log_exception(layer, e) 
           raise
         ensure
           log_exit(layer, {}, protect_op)
@@ -78,7 +78,7 @@ module Oboe
         begin
           result = yield
         rescue Exception => e
-          log_exception(layer, e)
+          log_exception(layer, e) 
           e.instance_variable_set(:@xtrace, log_end(layer))
           raise
         end

data/lib/oboe/frameworks/{rails/rails.rb → rails.rb}

@@ -8,9 +8,9 @@ module Oboe
           return unless Oboe::Config.has_key?(:rum_id)
           if Oboe::Config.tracing?
             if request.xhr?
-              header_tmpl = File.read(File.dirname(__FILE__) + '/helpers/rum/rum_ajax_header.js.erb')
+              header_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_ajax_header.js.erb')
             else
-              header_tmpl = File.read(File.dirname(__FILE__) + '/helpers/rum/rum_header.js.erb')
+              header_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_header.js.erb')
             end
             return raw(ERB.new(header_tmpl).result)
           end
@@ -26,7 +26,7 @@ module Oboe
           if Oboe::Config.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
-            footer_tmpl = File.read(File.dirname(__FILE__) + '/helpers/rum/rum_footer.js.erb')
+            footer_tmpl = File.read(File.dirname(__FILE__) + '/rails/helpers/rum/rum_footer.js.erb')
             return raw(footer_tmpl)
           end
         rescue Exception => e
@@ -55,7 +55,8 @@ module Oboe
 
 
     def self.load_instrumentation
-      pattern = File.join(File.dirname(__FILE__), 'inst', '*.rb')
+      # Load the Rails specific instrumentation
+      pattern = File.join(File.dirname(__FILE__), 'rails/inst', '*.rb')
       Dir.glob(pattern) do |f|
         begin
           require f
@@ -63,6 +64,7 @@ module Oboe
           $stderr.puts "[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."
       else
@@ -88,6 +90,8 @@ module Oboe
 end # Oboe
 
 if defined?(::Rails)
+  require 'oboe/inst/rack'
+
   if ::Rails::VERSION::MAJOR > 2
     module Oboe
       class Railtie < ::Rails::Railtie
@@ -96,8 +100,14 @@ if defined?(::Rails)
           Oboe::Rails.include_helpers        
         end
 
+        initializer 'oboe.rack' do |app|
+          puts "[oboe/loading] Instrumenting rack" if true or Oboe::Config[:verbose]
+          app.config.middleware.insert 0, "Oboe::Rack"
+        end
+
         config.after_initialize do
           Oboe::Loading.load_access_key
+          Oboe::Inst.load_instrumentation
           Oboe::Rails.load_instrumentation
         end
       end
@@ -105,8 +115,14 @@ if defined?(::Rails)
   else
     Oboe::Rails.load_initializer
     Oboe::Loading.load_access_key
+
+    puts "[oboe/loading] Instrumenting rack" if true or Oboe::Config[:verbose]
+    Rails.configuration.middleware.insert 0, "Oboe::Rack"
+
+    Oboe::Inst.load_instrumentation
     Oboe::Rails.load_instrumentation
-    Oboe::Rails.include_helpers        
+    Oboe::Rails.include_helpers
+    
   end
 end
 

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

@@ -6,8 +6,7 @@ module Oboe
     module Rails3ActionController
       def process(*args)
 
-        header = request.headers['X-Trace']
-        Oboe::API.start_trace_with_target('rails', header, response.headers) do
+        Oboe::API.trace('rails', {}) do
           super
         end
       end
@@ -32,7 +31,7 @@ module Oboe
       end
 
       def render(*args)
-        Oboe::API.trace('render', {}) do
+        Oboe::API.trace('actionview', {}) do
           super
         end
       end
@@ -57,8 +56,7 @@ if defined?(ActionController::Base)
       alias :render_without_oboe :render
 
       def process(*args)
-        header = args[0].headers['X-Trace']
-        Oboe::API.start_trace_with_target('rails', header, args[1].headers) do
+        Oboe::API.trace('rails', {}) do
           process_without_oboe(*args)
         end
       end
@@ -86,11 +84,11 @@ if defined?(ActionController::Base)
       end
 
       def render(options = nil, extra_options = {}, &block)
-        Oboe::API.trace('render', {}) do
+        Oboe::API.trace('actionview', {}) do
           render_without_oboe(options, extra_options, &block)
         end
       end
     end
   end
-  puts "[oboe/loading] Instrumenting ActionControler" if Oboe::Config[:verbose]
+  puts "[oboe/loading] Instrumenting actioncontroler" if Oboe::Config[:verbose]
 end

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

@@ -3,7 +3,7 @@
 
 if defined?(ActionView::Base)
   if Rails::VERSION::MAJOR == 3
-    puts "[oboe/loading] Instrumenting ActionView" 
+    puts "[oboe/loading] Instrumenting actionview" 
 
     if Rails::VERSION::MINOR == 0
       ActionView::Partials::PartialRenderer.class_eval do

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

@@ -40,7 +40,7 @@ module Oboe
           if Oboe::Config.tracing? and !ignore_payload?(name)
 
             opts = extract_trace_details(sql, name)
-            Oboe::API.trace('ActiveRecord', opts || {}) do
+            Oboe::API.trace('activerecord', opts || {}) do
               execute_without_oboe(sql, name)
             end
           else
@@ -52,7 +52,7 @@ module Oboe
           if Oboe::Config.tracing? and !ignore_payload?(name)
 
             opts = extract_trace_details(sql, name)
-            Oboe::API.trace('ActiveRecord', opts || {}) do
+            Oboe::API.trace('activerecord', opts || {}) do
               exec_query_without_oboe(sql, name, binds)
             end
           else
@@ -64,7 +64,7 @@ module Oboe
           if Oboe::Config.tracing? and !ignore_payload?(name)
 
             opts = extract_trace_details(sql, name)
-            Oboe::API.trace('ActiveRecord', opts || {}) do
+            Oboe::API.trace('activerecord', opts || {}) do
               exec_delete_without_oboe(sql, name, binds)
             end
           else
@@ -76,7 +76,7 @@ module Oboe
           if Oboe::Config.tracing? and !ignore_payload?(name)
 
             opts = extract_trace_details(sql, name)
-            Oboe::API.trace('ActiveRecord', opts || {}) do
+            Oboe::API.trace('activerecord', opts || {}) do
               exec_insert_without_oboe(sql, name, binds)
             end
           else
@@ -89,7 +89,7 @@ module Oboe
             opts = {}
 
             opts[:Query] = "BEGIN"
-            Oboe::API.trace('ActiveRecord', opts || {}) do
+            Oboe::API.trace('activerecord', opts || {}) do
               begin_db_transaction_without_oboe()
             end
           else
@@ -106,13 +106,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 puts "[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 puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
           end
         end
@@ -126,7 +126,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 puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
           end
         end
@@ -140,7 +140,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 puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
           end
         end
@@ -154,7 +154,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 puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
             end
           end
         end
@@ -168,14 +168,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 puts "[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 puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
             end
             
@@ -183,13 +183,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 puts "[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 puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
             end
           end
@@ -205,13 +205,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 puts "[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 puts "[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
@@ -219,13 +219,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 puts "[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 puts "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
               end
             end
           end
@@ -235,50 +235,51 @@ module Oboe
       module FlavorInitializers
         def self.mysql
           if ActiveRecord::Base::connection.adapter_name.downcase.to_sym == :mysql
-            puts "[oboe/loading] Instrumenting ActiveRecord MysqlAdapter" if Oboe::Config[:verbose]
+            puts "[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
+              ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.module_eval do
                 include Oboe::Inst::ConnectionAdapters::AbstractMysqlAdapter
-              end
-              ActiveRecord::ConnectionAdapters::MysqlAdapter.module_eval do
+              end if defined?(::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter) 
+
+              ::ActiveRecord::ConnectionAdapters::MysqlAdapter.module_eval do
                 include Oboe::Inst::ConnectionAdapters::MysqlAdapter
-              end
+              end if defined?(::ActiveRecord::ConnectionAdapters::MysqlAdapter)
             else
-              ActiveRecord::ConnectionAdapters::MysqlAdapter.module_eval do
+              ::ActiveRecord::ConnectionAdapters::MysqlAdapter.module_eval do
                 include Oboe::Inst::ConnectionAdapters::LegacyMysqlAdapter
-              end
+              end if defined?(::ActiveRecord::ConnectionAdapters::MysqlAdapter)
             end
           end
         end
 
         def self.mysql2
           if ActiveRecord::Base::connection.adapter_name.downcase.to_sym == :mysql2
-            puts "[oboe/loading] Instrumenting ActiveRecord Mysql2Adapter" if Oboe::Config[:verbose]
-            ActiveRecord::ConnectionAdapters::Mysql2Adapter.module_eval do
+            puts "[oboe/loading] Instrumenting activerecord mysql2adapter" if Oboe::Config[:verbose]
+            ::ActiveRecord::ConnectionAdapters::Mysql2Adapter.module_eval do
               include Oboe::Inst::ConnectionAdapters::Mysql2Adapter
-            end
+            end if defined?(::ActiveRecord::ConnectionAdapters::Mysql2Adapter)
           end
         end
 
         def self.postgresql
           if ActiveRecord::Base::connection.adapter_name.downcase.to_sym == :postgresql
-            puts "[oboe/loading] Instrumenting ActiveRecord PostgreSQLAdapter" if Oboe::Config[:verbose]
-            ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.module_eval do
+            puts "[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
               else
                 include Oboe::Inst::ConnectionAdapters::LegacyPostgreSQLAdapter
               end
-            end
+            end if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
           end
         end
 
         def self.oracle
           if ActiveRecord::Base::connection.adapter_name.downcase.to_sym == :oracleenhanced
-            puts "[oboe/loading] Instrumenting ActiveRecord OracleEnhancedAdapter" if Oboe::Config[:verbose]
-            ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.module_eval do
+            puts "[oboe/loading] Instrumenting activerecord oracleenhancedadapter" if Oboe::Config[:verbose]
+            ::ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter.module_eval do
               include Oboe::Inst::ConnectionAdapters
-            end
+            end if defined?(::ActiveRecord::ConnectionAdapters::OracleEnhancedAdapter)
           end
         end
       end

data/lib/oboe/{frameworks/rails/inst → inst}/cassandra.rb

@@ -15,6 +15,8 @@ module Oboe
           # Open issue - how to handle multiple Cassandra servers
           report_kvs[:RemoteHost], report_kvs[:RemotePort] = @servers.first.split(":")
 
+          report_kvs[:Backtrace] = Oboe::API.backtrace
+
           if options.empty? and args.is_a?(Array)
             options = args.last if args.last.is_a?(Hash)
           end
@@ -283,7 +285,7 @@ module Oboe
 end
 
 if defined?(::Cassandra)
-  puts "[oboe/loading] Instrumenting Cassandra"
+  puts "[oboe/loading] Instrumenting cassandra"
   class ::Cassandra
     include Oboe::Inst::Cassandra
 

data/lib/oboe/{frameworks/rails/inst → inst}/dalli.rb

@@ -8,7 +8,7 @@ module Oboe
 
       def self.included(cls)
         cls.class_eval do
-          puts "[oboe/loading] Instrumenting Memcache (Dalli)" if Oboe::Config[:verbose]
+          puts "[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

data/lib/oboe/{frameworks/rails/inst → inst}/http.rb

@@ -13,16 +13,17 @@ Net::HTTP.class_eval do
         opts = {}
         if args.length and args[0]
           req = args[0]
-          req['X-Trace'] = Oboe::Context.toString()
 
           opts['IsService'] = 1
           opts['RemoteProtocol'] = use_ssl? ? 'HTTPS' : 'HTTP'
           opts['RemoteHost'] = addr_port
           opts['ServiceArg'] = req.path
           opts['Method'] = req.method
+        
+          Oboe::API.log('net-http', 'info', opts)
+          req['X-Trace'] = Oboe::Context.toString()
         end
 
-        Oboe::API.log('net-http', 'info', opts)
         resp = request_without_oboe(*args, &block)
 
         xtrace = resp.get_fields('X-Trace')

data/lib/oboe/{frameworks/rails/inst → inst}/mongo.rb

@@ -41,6 +41,8 @@ if defined?(::Mongo::DB)
 
             report_kvs[:New_Collection_Name] = args[0] if m == :create_collection
             report_kvs[:Collection_Name] = args[0]     if m == :drop_collection
+
+            report_kvs[:Backtrace] = Oboe::API.backtrace
           rescue
             logger.warn "[oboe/error] Problem processing mongo args (#{m})" if defined?(logger)
           end
@@ -113,6 +115,8 @@ if defined?(::Mongo::Collection)
         report_kvs[:RemoteHost] = @db.connection.host
         report_kvs[:RemotePort] = @db.connection.port
         report_kvs[:Collection] = @name
+            
+        report_kvs[:Backtrace] = Oboe::API.backtrace
 
         report_kvs[:QueryOp] = m 
         report_kvs[:Query] = args[0].try(:to_json) if args and not args.empty? and args[0].class == Hash

data/lib/oboe/inst/rack.rb

@@ -0,0 +1,32 @@
+# Copyright (c) 2012 by Tracelytics, Inc.
+# All rights reserved.
+
+require 'rack'
+
+module Oboe
+  class Rack
+    attr_reader :app
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      xtrace = env['HTTP_X_TRACE']
+
+      report_kvs = {}
+      report_kvs[:SampleRate] = Oboe::Config[:sample_rate]
+
+      response, xtrace = Oboe::API.start_trace('rack', xtrace, report_kvs) do
+        @app.call(env)
+      end
+    rescue Exception => e
+      xtrace = e.instance_variable_get(:@xtrace)
+      raise
+    ensure
+      response[1].merge!({'X-Trace' => xtrace}) if xtrace
+      return response
+    end
+  end
+end
+

data/lib/oboe/instrumentation.rb

@@ -0,0 +1,15 @@
+module Oboe
+  module Inst
+    def self.load_instrumentation
+      # Load the general instrumentation
+      pattern = File.join(File.dirname(__FILE__), 'inst', '*.rb')
+      Dir.glob(pattern) do |f|
+        begin
+          require f
+        rescue => e
+          $stderr.puts "[oboe/loading] Error loading insrumentation file '#{f}' : #{e}"
+        end
+      end
+    end
+  end
+end

data/lib/oboe/ruby.rb

@@ -0,0 +1,9 @@
+module Oboe
+  module Ruby
+    def self.initialize
+      Oboe::API.report_init('ruby')
+      Oboe::Loading.load_access_key
+      Oboe::Inst.load_instrumentation
+    end
+  end
+end

data/lib/oboe/version.rb

@@ -2,8 +2,8 @@ module Oboe
   module Version
     MAJOR = 1
     MINOR = 3
-    PATCH = 8
-    BUILD = nil
+    PATCH = 9
+    BUILD = 1
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,55 +1,66 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oboe
-version: !ruby/object:Gem::Version
-  version: 1.3.8
+version: !ruby/object:Gem::Version 
+  hash: 97
   prerelease: 
+  segments: 
+  - 1
+  - 3
+  - 9
+  - 1
+  version: 1.3.9.1
 platform: ruby
-authors:
+authors: 
 - Tracelytics, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+
+date: 2013-01-29 00:00:00 Z
 dependencies: []
+
 description: The oboe gem provides AppNeta instrumentation for Ruby and Ruby frameworks.
 email: contact@tracelytics.com
 executables: []
-extensions:
+
+extensions: 
 - ext/oboe_metal/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - LICENSE
-files:
-- lib/oboe_metal.rb
-- lib/joboe_metal.rb
+files: 
 - lib/oboe.rb
-- lib/oboe/loading.rb
+- lib/oboe_fu.rb
+- lib/method_profiling.rb
+- lib/joboe_metal.rb
+- lib/oboe_metal.rb
+- lib/oboe/config.rb
+- lib/oboe/version.rb
 - lib/oboe/api.rb
-- lib/oboe/api/memcache.rb
-- lib/oboe/api/layerinit.rb
-- lib/oboe/api/util.rb
+- lib/oboe/loading.rb
+- lib/oboe/ruby.rb
+- lib/oboe/inst/cassandra.rb
+- lib/oboe/inst/dalli.rb
+- lib/oboe/inst/rack.rb
+- lib/oboe/inst/mongo.rb
+- lib/oboe/inst/memcached.rb
+- lib/oboe/inst/moped.rb
+- lib/oboe/inst/http.rb
+- lib/oboe/inst/memcache.rb
 - lib/oboe/api/logging.rb
+- lib/oboe/api/layerinit.rb
 - lib/oboe/api/tracing.rb
-- lib/oboe/version.rb
-- lib/oboe/config.rb
-- lib/oboe/frameworks/rails/inst/memcache.rb
-- lib/oboe/frameworks/rails/inst/mongo.rb
-- lib/oboe/frameworks/rails/inst/http.rb
-- lib/oboe/frameworks/rails/inst/rack.rb
-- lib/oboe/frameworks/rails/inst/action_controller.rb
-- lib/oboe/frameworks/rails/inst/moped.rb
-- lib/oboe/frameworks/rails/inst/dalli.rb
+- lib/oboe/api/util.rb
+- lib/oboe/api/memcache.rb
+- lib/oboe/frameworks/rails.rb
 - lib/oboe/frameworks/rails/inst/active_record.rb
+- lib/oboe/frameworks/rails/inst/action_controller.rb
 - lib/oboe/frameworks/rails/inst/action_view.rb
-- lib/oboe/frameworks/rails/inst/cassandra.rb
-- lib/oboe/frameworks/rails/inst/memcached.rb
-- lib/oboe/frameworks/rails/rails.rb
-- lib/method_profiling.rb
-- lib/oboe_fu.rb
-- lib/rails/generators/oboe/install_generator.rb
+- lib/oboe/instrumentation.rb
 - lib/rails/generators/oboe/templates/oboe_initializer.rb
-- lib/oboe/frameworks/rails/helpers/rum/rum_footer.js.erb
-- lib/oboe/frameworks/rails/helpers/rum/rum_ajax_header.js.erb
+- lib/rails/generators/oboe/install_generator.rb
 - lib/oboe/frameworks/rails/helpers/rum/rum_header.js.erb
+- lib/oboe/frameworks/rails/helpers/rum/rum_ajax_header.js.erb
+- lib/oboe/frameworks/rails/helpers/rum/rum_footer.js.erb
 - ext/oboe_metal/noop/noop.c
 - ext/oboe_metal/src/oboe_wrap.cxx
 - ext/oboe_metal/src/oboe.hpp
@@ -59,26 +70,36 @@ files:
 - ext/oboe_metal/extconf.rb
 homepage: http://tracelytics.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Tracelytics instrumentation gem
 test_files: []
+

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

@@ -1,29 +0,0 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
-# All rights reserved.
-
-module Oboe
-  class Middleware
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      header = env['HTTP_X_TRACE']
-      result, header = Oboe::API.start_trace('rack', header) do
-        env['HTTP_X_TRACE'] = Oboe::Context.toString()
-        @app.call(env)
-      end
-      result
-    rescue Exception => e
-      header = e.instance_variable_get(:@xtrace)
-      raise
-    ensure
-      env['HTTP_X_TRACE'] = header if header
-    end
-  end
-end
-
-if false and defined?(::Rails.configuration.middleware)
-  puts "[oboe/loading] Instrumenting rack" if Oboe::Config[:verbose]
-  ::Rails.configuration.middleware.insert 0, Oboe::Middleware
-end