oboe 2.2.0 → 2.2.5

data/lib/joboe_metal.rb

@@ -99,8 +99,8 @@ module Oboe
     # Assure defaults since SWIG enforces Strings
     opts[:layer]      ||= ''
     opts[:xtrace]     ||= ''
-    opts['X-TV-Meta'] ||= ''
-    Java::ComTracelyticsJoboeSettingsReader.shouldTraceRequest(opts[:layer], opts[:xtrace], opts['X-TV-Meta'])
+    opts['TV-Meta']   ||= ''
+    Java::ComTracelyticsJoboeSettingsReader.shouldTraceRequest(opts[:layer], opts[:xtrace], opts['TV-Meta'])
   end
 
   def self.through?

data/lib/oboe.rb

@@ -17,6 +17,7 @@ begin
     end
   end
   require 'oboe/logger'
+  require 'oboe/util'
   require 'oboe/config'
   require 'oboe/loading'
   require 'method_profiling'
@@ -27,7 +28,10 @@ begin
   require 'oboe/frameworks/rails' if defined?(::Rails)
 
 rescue LoadError
-  $stderr.puts "Unsupported Tracelytics environment (no libs).  Going No-op."
+  $stderr.puts "=============================================================="
+  $stderr.puts "Missing TraceView libraries.  Tracing disabled."
+  $stderr.puts "See: https://support.tv.appneta.com/solution/articles/137973" 
+  $stderr.puts "=============================================================="
 rescue Exception => e
   $stderr.puts "[oboe/error] Problem loading: #{e.inspect}"
 end

data/lib/oboe/config.rb

@@ -42,6 +42,11 @@ module Oboe
       # Setup an empty host blacklist (see: Oboe::API::Util.blacklisted?)
       @@config[:blacklist] = []
 
+      # The oboe Ruby client has the ability to sanitize query literals
+      # from SQL statements.  By default this is disabled.  Enable to
+      # avoid collecting and reporting query literals to TraceView.
+      @@config[:sanitize_sql] = false
+
       update!(data)
 
       # For Initialization, mark this as the default SampleRate
@@ -65,14 +70,21 @@ module Oboe
         # When setting SampleRate, note that it's been manually set
         # OBOE_SAMPLE_RATE_SOURCE_FILE == 1
         @@config[:sample_source] = 1 
+
+        unless value.is_a?(Integer) or value.is_a?(Float)
+          raise "oboe :sample_rate must be a number between 1 and 1000000 (1m)" 
+        end
        
         # Validate :sample_rate value
         unless value.between?(1, 1e6)
           raise "oboe :sample_rate must be between 1 and 1000000 (1m)" 
         end
 
+        # Assure value is an integer
+        @@config[key.to_sym] = value.to_i
+
         # Update liboboe with the new SampleRate value
-        Oboe::Context.setDefaultSampleRate(value)
+        Oboe::Context.setDefaultSampleRate(value.to_i)
       end
 
       # Update liboboe if updating :tracing_mode
@@ -104,7 +116,7 @@ end
 config = {
       :tracing_mode => "through",
       :reporter_host => "127.0.0.1",
-      :sample_rate => 1000000,
+      :sample_rate => 300000,
       :verbose => false }
 
 Oboe::Config.initialize(config)

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

@@ -17,7 +17,8 @@ if Oboe::Config[:active_record][:enabled]
     Oboe::Inst::ConnectionAdapters::FlavorInitializers.oracle     if adapter == "oracleenhanced"
 
   rescue Exception => e
-    Oboe.logger.error "[oboe/error] Oboe/ActiveRecord error: #{e.message}" if Oboe::Config[:verbose]
+    Oboe.logger.error "[oboe/error] Oboe/ActiveRecord error: #{e.inspect}"
+    Oboe.logger.debug e.backtrace.join("\n")
   end
 end
 # vim:set expandtab:tabstop=2

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

@@ -4,88 +4,39 @@
 module Oboe
   module Inst
     module ConnectionAdapters
+      module FlavorInitializers
+        def self.mysql
+          Oboe.logger.info "[oboe/loading] Instrumenting activerecord mysqladapter" if Oboe::Config[:verbose]
 
-      module AbstractMysqlAdapter
-        include Oboe::Inst::ConnectionAdapters::Utils
-      
-        def self.included(cls)
-          cls.class_eval do
-            if ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::method_defined? :execute
-              alias execute_without_oboe execute
-              alias execute execute_with_oboe
-            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
-            end
-          end
-        end
-      end # AbstractMysqlAdapter
+          # ActiveRecord 3.2 and higher
+          if (::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR >= 2) or 
+              ::ActiveRecord::VERSION::MAJOR == 4
 
-      module MysqlAdapter
-        include Oboe::Inst::ConnectionAdapters::Utils
-      
-        def self.included(cls)
-          cls.class_eval do
-            if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :exec_query
-              alias exec_query_without_oboe exec_query
-              alias exec_query exec_query_with_oboe
-            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
-            end
-          end
-        end
-      end # MysqlAdapter
+            # AbstractMysqlAdapter
+            Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter,
+                                      Oboe::Inst::ConnectionAdapters::Utils)
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter, :execute)
 
-      module LegacyMysqlAdapter
-        include Oboe::Inst::ConnectionAdapters::Utils
-      
-        def self.included(cls)
-          cls.class_eval do
-            if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :execute
-              alias execute_without_oboe execute
-              alias execute execute_with_oboe
-            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 Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
-              end
-            end
+            # MysqlAdapter
+            Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::MysqlAdapter,
+                                      Oboe::Inst::ConnectionAdapters::Utils)
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :exec_query)
+
+          else
+            # ActiveRecord 3.1 and below
             
-            if (::Rails::VERSION::MAJOR == 3 and ::Rails::VERSION::MINOR > 0) or ::Rails::VERSION::MAJOR == 4
-              if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :exec_query
-                alias exec_query_without_oboe exec_query
-                alias exec_query exec_query_with_oboe
-              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
-              end
+            # MysqlAdapter
+            Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::MysqlAdapter,
+                                      Oboe::Inst::ConnectionAdapters::Utils)
+
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::MysqlAdapter, :execute)
               
-              if ActiveRecord::ConnectionAdapters::MysqlAdapter::method_defined? :exec_delete
-                alias exec_delete_without_oboe exec_delete
-                alias exec_delete exec_delete_with_oboe
-              else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
-              end
+            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)
             end
           end
         end
-      end # LegacyMysqlAdapter
-
-      module FlavorInitializers
-        def self.mysql
-          Oboe.logger.info "[oboe/loading] Instrumenting activerecord mysqladapter" if Oboe::Config[:verbose]
-          if (::Rails::VERSION::MAJOR == 3 and ::Rails::VERSION::MINOR > 1) or ::Rails::VERSION::MAJOR == 4
-            ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.module_eval do
-              include Oboe::Inst::ConnectionAdapters::AbstractMysqlAdapter
-            end if defined?(::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter) 
-
-            ::ActiveRecord::ConnectionAdapters::MysqlAdapter.module_eval do
-              include Oboe::Inst::ConnectionAdapters::MysqlAdapter
-            end if defined?(::ActiveRecord::ConnectionAdapters::MysqlAdapter)
-          else
-            ::ActiveRecord::ConnectionAdapters::MysqlAdapter.module_eval do
-              include Oboe::Inst::ConnectionAdapters::LegacyMysqlAdapter
-            end if defined?(::ActiveRecord::ConnectionAdapters::MysqlAdapter)
-          end
-        end
       end
     end
   end

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

@@ -4,52 +4,25 @@
 module Oboe
   module Inst
     module ConnectionAdapters
-
-      module Mysql2Adapter
-        include Oboe::Inst::ConnectionAdapters::Utils
-      
-        def self.included(cls)
-          cls.class_eval do
-            if ::Rails::VERSION::MAJOR == 2 or (::Rails::VERSION::MAJOR == 3 and ::Rails::VERSION::MINOR == 0)
-              if ActiveRecord::ConnectionAdapters::Mysql2Adapter::method_defined? :execute
-                alias execute_without_oboe execute
-                alias execute execute_with_oboe
-              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 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
-              if ActiveRecord::ConnectionAdapters::Mysql2Adapter::method_defined? :exec_query or
-                ActiveRecord::ConnectionAdapters::Mysql2Adapter::private_method_defined? :exec_query
-                alias exec_query_without_oboe exec_query
-                alias exec_query exec_query_with_oboe
-              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 Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
-              end
-            end
-          end
-        end
-      end # Mysql2Adapter
-
       module FlavorInitializers
         def self.mysql2
           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)
+            
+          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 3.0 and prior
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::Mysql2Adapter, :execute)
+          else
+            # ActiveRecord 3.1 and above
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::Mysql2Adapter, :exec_insert)
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::Mysql2Adapter, :exec_query)
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::Mysql2Adapter, :exec_delete)
+          end
         end
       end
-
     end
   end
 end

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

@@ -4,54 +4,27 @@
 module Oboe
   module Inst
     module ConnectionAdapters
-
-      module PostgreSQLAdapter
-        include Oboe::Inst::ConnectionAdapters::Utils
-      
-        def self.included(cls)
-          cls.class_eval do
-            if ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::method_defined? :exec_query
-              alias exec_query_without_oboe exec_query
-              alias exec_query exec_query_with_oboe
-            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 Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
-            end
-          end
-        end
-      end # PostgreSQLAdapter
-
-      module LegacyPostgreSQLAdapter
-        include Oboe::Inst::ConnectionAdapters::Utils
-      
-        def self.included(cls)
-          cls.class_eval do
-            if ActiveRecord::ConnectionAdapters::PostgreSQLAdapter::method_defined? :execute
-              alias execute_without_oboe execute
-              alias execute execute_with_oboe
-            else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument activerecord layer.  Partial traces may occur."
-            end
-          end
-        end
-      end # LegacyPostgreSQLAdapter
-
       module FlavorInitializers
         def self.postgresql
+
           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) or ::Rails::VERSION::MAJOR == 4
-              include Oboe::Inst::ConnectionAdapters::PostgreSQLAdapter
-            else
-              include Oboe::Inst::ConnectionAdapters::LegacyPostgreSQLAdapter
-            end
-          end if defined?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+
+          Oboe::Util.send_include(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter,
+                                    Oboe::Inst::ConnectionAdapters::Utils)
+
+          if (::ActiveRecord::VERSION::MAJOR == 3 and ::ActiveRecord::VERSION::MINOR > 0) or 
+                ::ActiveRecord::VERSION::MAJOR == 4
+
+            # ActiveRecord 3.1 and up
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_query)
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :exec_delete)
+
+          else
+            # ActiveRecord 3.0 and prior
+            Oboe::Util.method_alias(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter, :execute)
+          end
         end
       end
-
     end
   end
 end

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

@@ -5,11 +5,28 @@ module Oboe
   module Inst
     module ConnectionAdapters
       module Utils
-        def extract_trace_details(sql, name = nil)
+        
+        def extract_trace_details(sql, name = nil, binds = [])
           opts = {}
 
           begin
-            opts[:Query] = sql.to_s
+            if binds.empty? 
+              # Raw SQL.  Sanitize if requested
+              if Oboe::Config[:sanitize_sql]
+                opts[:Query] = sql.gsub(/\'[\s\S][^\']*\'/, '?')
+              else
+                opts[:Query] = sql.to_s
+              end
+            else
+              # We have bind parameters.  Only report if :sanitize_sql isn't true
+              unless Oboe::Config[:sanitize_sql]
+                opts[:Query] = sql.to_s
+                opts[:QueryArgs] = binds.map { |col, val| type_cast(val, col) }
+              else
+                opts[:Query] = sql.gsub(/\'[\s\S][^\']*\'/, '?')
+              end
+            end
+
             opts[:Name] = name.to_s if name
             opts[:Backtrace] = Oboe::API.backtrace
 
@@ -23,6 +40,8 @@ module Oboe
             opts[:RemoteHost] = config["host"]     if config.has_key?("host")
             opts[:Flavor]     = config["adapter"]  if config.has_key?("adapter")
           rescue Exception => e
+            Oboe.logger.debug "Exception raised capturing ActiveRecord KVs: #{e.inspect}"
+            Oboe.logger.debug e.backtrace.join("\n")
           end
 
           return opts || {}
@@ -31,12 +50,14 @@ 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)
+          %w(SCHEMA EXPLAIN CACHE).include? name.to_s or 
+            (name and name.to_sym == :skip_logging) or
+              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)
@@ -53,7 +74,7 @@ module Oboe
         def exec_query_with_oboe(sql, name = nil, binds = [])
           if Oboe.tracing? and !ignore_payload?(name)
 
-            opts = extract_trace_details(sql, name)
+            opts = extract_trace_details(sql, name, binds)
             Oboe::API.trace('activerecord', opts || {}) do
               exec_query_without_oboe(sql, name, binds)
             end
@@ -65,7 +86,7 @@ module Oboe
         def exec_delete_with_oboe(sql, name = nil, binds = [])
           if Oboe.tracing? and !ignore_payload?(name)
 
-            opts = extract_trace_details(sql, name)
+            opts = extract_trace_details(sql, name, binds)
             Oboe::API.trace('activerecord', opts || {}) do
               exec_delete_without_oboe(sql, name, binds)
             end
@@ -77,7 +98,7 @@ module Oboe
         def exec_insert_with_oboe(sql, name = nil, binds = [], *args)
           if Oboe.tracing? and !ignore_payload?(name)
 
-            opts = extract_trace_details(sql, name)
+            opts = extract_trace_details(sql, name, binds)
             Oboe::API.trace('activerecord', opts || {}) do
               exec_insert_without_oboe(sql, name, binds, *args)
             end

data/lib/oboe/inst/http.rb

@@ -21,15 +21,17 @@ Net::HTTP.class_eval do
         opts['RemoteProtocol'] = use_ssl? ? 'HTTPS' : 'HTTP'
         opts['RemoteHost'] = addr_port
         opts['ServiceArg'] = req.path
-        opts['Method'] = req.method
+        opts['HTTPMethod'] = req.method
         opts['Blacklisted'] = true if blacklisted
       
-        Oboe::API.log('net-http', 'info', opts)
         req['X-Trace'] = Oboe::Context.toString() unless blacklisted
       end
 
       resp = request_without_oboe(*args, &block)
 
+      opts['HTTPStatus'] = resp.code
+      Oboe::API.log('net-http', 'info', opts)
+
       unless blacklisted
         xtrace = resp.get_fields('X-Trace')
         if xtrace and xtrace.size and Oboe.tracing? 

data/lib/oboe/inst/rack.rb

@@ -27,12 +27,12 @@ module Oboe
         report_kvs[:Method]            = req.request_method
         report_kvs['AJAX']             = true if req.xhr?
         report_kvs['ClientIP']         = req.ip
-         
-        report_kvs['TV-Meta']          = env['HTTP_X-TV-META']          if env.has_key?('HTTP_X-TV-META')
-        report_kvs['Forwarded-For']    = env['HTTP_X-FORWARDED-FOR']    if env.has_key?('HTTP_X-FORWARDED-FOR')
-        report_kvs['Forwarded-Host']   = env['HTTP_X-FORWARDED-HOST']   if env.has_key?('HTTP_X-FORWARDED-HOST')
-        report_kvs['Forwarded-Proto']  = env['HTTP_X-FORWARDED-PROTO']  if env.has_key?('HTTP_X-FORWARDED-PROTO')
-        report_kvs['Forwarded-Port']   = env['HTTP_X-FORWARDED-PORT']   if env.has_key?('HTTP_X-FORWARDED-PORT')
+
+        report_kvs['TV-Meta']          = env['HTTP_X_TV_META']          if env.has_key?('HTTP_X_TV_META')
+        report_kvs['Forwarded-For']    = env['HTTP_X_FORWARDED_FOR']    if env.has_key?('HTTP_X_FORWARDED_FOR')
+        report_kvs['Forwarded-Host']   = env['HTTP_X_FORWARDED_HOST']   if env.has_key?('HTTP_X_FORWARDED_HOST')
+        report_kvs['Forwarded-Proto']  = env['HTTP_X_FORWARDED_PROTO']  if env.has_key?('HTTP_X_FORWARDED_PROTO')
+        report_kvs['Forwarded-Port']   = env['HTTP_X_FORWARDED_PORT']   if env.has_key?('HTTP_X_FORWARDED_PORT')
       rescue
         # Discard any potential exceptions. Report whatever we can.
       end

data/lib/oboe/util.rb

@@ -0,0 +1,45 @@
+
+module Oboe
+  module Util
+    class << self
+      ##
+      # oboe_alias
+      #
+      # Centralized utility method to alias a method on an arbitrary
+      # class or module.
+      #
+      def method_alias(cls, method, name=nil)
+        # Attempt to infer a contextual name if not indicated
+        #
+        # For example:
+        # ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.to_s.split(/::/).last
+        # => "AbstractMysqlAdapter"
+        #
+        begin
+          name ||= cls.to_s.split(/::/).last 
+        rescue
+        end
+
+        if cls.method_defined? method.to_sym or cls.private_method_defined? method.to_sym
+          cls.class_eval do
+            alias_method "#{method}_without_oboe", "#{method}"
+            alias_method "#{method}", "#{method}_with_oboe"
+          end
+        else Oboe.logger.warn "[oboe/loading] Couldn't properly instrument #{name}.  Partial traces may occur."
+        end
+      end
+  
+      ##
+      # oboe_send_include
+      #
+      # Centralized utility method to send a include call for an
+      # arbitrary class
+      def send_include(target_cls, cls)
+        if defined?(target_cls)
+          target_cls.send(:include, cls)
+        end
+      end
+    end
+  end
+end
+

data/lib/oboe/version.rb

@@ -2,7 +2,7 @@ module Oboe
   module Version
     MAJOR = 2
     MINOR = 2
-    PATCH = 0
+    PATCH = 5
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/oboe_metal.rb

@@ -69,8 +69,8 @@ module Oboe
       # Assure defaults since SWIG enforces Strings
       opts[:layer]      ||= ''
       opts[:xtrace]     ||= ''
-      opts['X-TV-Meta'] ||= ''
-      Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['X-TV-Meta'])
+      opts['TV-Meta']   ||= ''
+      Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['TV-Meta'])
     end
 
     def through?

data/lib/rails/generators/oboe/install_generator.rb

@@ -11,11 +11,11 @@ module Oboe
       @verbose = 'false'
 
       say ""
-      say set_color "Welcome to the TraceView Ruby instrumentation setup.", :green, :bold
+      say shell.set_color "Welcome to the TraceView Ruby instrumentation setup.", :green, :bold
       say ""
       say "To instrument your Rails application, you have the option to setup sampling strategies here."
       say ""
-      say set_color "Documentation Links", :magenta
+      say shell.set_color "Documentation Links", :magenta
       say "-------------------"
       say ""
       say "Details on configuring your sampling rate:"
@@ -25,47 +25,28 @@ module Oboe
       say "http://support.tv.appneta.com/support/solutions/articles/86393-instrumenting-ruby-apps"
       while true do
         say ""
-        say set_color "Tracing Mode", :magenta
+        say shell.set_color "Tracing Mode", :magenta
         say "------------"
         say "Tracing Mode determines when traces should be initiated for incoming requests.  Valid"
-        say "options are #{set_color "always", :yellow}, #{set_color "through", :yellow} (when using an instrumented Apache or Nginx) and #{set_color "never", :yellow}."
+        say "options are #{shell.set_color "always", :yellow}, #{shell.set_color "through", :yellow} (when using an instrumented Apache or Nginx) and #{shell.set_color "never", :yellow}."
         say ""
-        say "If you're not using an instrumented Apache or Nginx, set this directive to #{set_color "always", :yellow} in"
+        say "If you're not using an instrumented Apache or Nginx, set this directive to #{shell.set_color "always", :yellow} in"
         say "order to initiate tracing from Ruby."
         say ""
-        user_tracing_mode = ask set_color "* Tracing Mode? [through]:", :yellow
+        user_tracing_mode = ask shell.set_color "* Tracing Mode? [through]:", :yellow
         user_tracing_mode.downcase!
 
         break if user_tracing_mode.blank?
         valid = ['always', 'through', 'never'].include?(user_tracing_mode)
-        say set_color "Valid values are 'always', 'through' or 'never'", :red, :bold unless valid
+        say shell.set_color "Valid values are 'always', 'through' or 'never'", :red, :bold unless valid
         if valid
           @tracing_mode = user_tracing_mode
           break
         end
       end
 
-      if @tracing_mode == "always"
-        while true do
-          say ""
-          say set_color "Sampling Rate", :green
-          say "-------------"
-          say "This value reflects the number of requests out of every million that will be traced, and must be an integer between 0 and 1000000. Default is 300000 (30%)."
-          say ""
-          user_sampling_rate = ask set_color "* Sampling Rate? [300000]:", :yellow
-          break if user_sampling_rate.blank?
-
-          valid = user_sampling_rate.to_i.between?(1, 1000000)
-          say set_color "Sampling Rate must be a number between 1 and 1000000", :red, :bold unless valid
-          if valid
-            @sampling_rate = user_sampling_rate.to_i
-            break
-          end
-        end
-      end
-
       say ""
-      say "You can change these values in the future by modifying config/initializers/oboe.rb"
+      say "You can change configuration values in the future by modifying config/initializers/oboe.rb"
       say ""
       say "Thanks! Creating the TraceView initializer..."
       say ""

data/lib/rails/generators/oboe/templates/oboe_initializer.rb

@@ -2,10 +2,10 @@
 # http://www.appneta.com/products/traceview/
 #
 # Details on configuring your sampling rate:
-# http://support.tv.appneta.com/support/solutions/articles/86336-configuring-sampling
+# http://support.tv.appneta.com/support/solutions/articles/86336
 #
 # More information on instrumenting Ruby applications can be found here:
-# http://support.tv.appneta.com/support/solutions/articles/86393-instrumenting-ruby-apps
+# http://support.tv.appneta.com/support/solutions/articles/86393
 
 if defined?(Oboe::Config) 
   # Tracing Mode determines when traces should be initiated for incoming requests.  Valid
@@ -14,13 +14,10 @@ if defined?(Oboe::Config)
   # If you're not using an instrumented Apache or Nginx, set this directive to always in
   # order to initiate tracing from Ruby.
   Oboe::Config[:tracing_mode] = '<%= @tracing_mode %>'
-<% if ['through', 'never'].include?(@tracing_mode) %>
+  
   # sample_rate is a value from 0 - 1m indicating the fraction of requests per million to trace
   # Oboe::Config[:sample_rate] = <%= @sampling_rate %>
-<% else %>
-  # sample_rate is a value from 0 - 1m indicating the fraction of requests per million to trace
-  Oboe::Config[:sample_rate] = <%= @sampling_rate %>
-<% end %>
+  
   # Verbose output of instrumentation initialization
   # Oboe::Config[:verbose] = <%= @verbose %>
 
@@ -38,6 +35,11 @@ if defined?(Oboe::Config)
   # Set to true to disable Resque argument logging (Default: false)
   # Oboe::Config[:resque][:log_args] = false
  
+  # The oboe Ruby client has the ability to sanitize query literals
+  # from SQL statements.  By default this is disabled.  Enable to
+  # avoid collecting and reporting query literals to TraceView.
+  # Oboe::Config[:sanitize_sql] = false
+
   #
   # Enabling/Disabling Instrumentation
   #

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oboe
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 5
+  version: 2.2.5
 platform: ruby
 authors: 
 - Tracelytics, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-03 00:00:00 Z
+date: 2013-09-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -111,6 +111,7 @@ files:
 - lib/oboe/loading.rb
 - lib/oboe/logger.rb
 - lib/oboe/ruby.rb
+- lib/oboe/util.rb
 - lib/oboe/version.rb
 - lib/oboe_fu.rb
 - lib/oboe_metal.rb