oboe 2.6.6.1 → 2.6.7.1

data/lib/joboe_metal.rb

@@ -15,30 +15,6 @@ module Oboe_metal
 
   class Context
     class << self
-      attr_accessor :layer_op
-      
-      def log(layer, label, options = {}, with_backtrace = false)
-        evt = Oboe::Context.createEvent()
-        evt.addInfo("Layer", layer.to_s)
-        evt.addInfo("Label", label.to_s)
-
-        options.each_pair do |k, v|
-          evt.addInfo(k.to_s, v.to_s)
-        end
-
-        evt.addInfo("Backtrace", Oboe::API.backtrace) if with_backtrace
-
-        Oboe.reporter.sendReport(evt)
-      end
-       
-      def tracing_layer_op?(operation)
-        if operation.is_a?(Array)
-          return operation.include?(@layer_op)
-        else
-          return @layer_op == operation
-        end
-      end
-      
       def toString
         md = getMetadata.toString
       end
@@ -52,7 +28,7 @@ module Oboe_metal
       end
     end
   end
-  
+
   class Event
     def self.metadataString(evt)
       evt.getMetadata.toHexString
@@ -62,11 +38,11 @@ module Oboe_metal
   def UdpReporter
     Java::ComTracelyticsJoboe
   end
-  
+
   module Metadata
     Java::ComTracelyticsJoboeMetaData
   end
-  
+
   module Reporter
     ##
     # Initialize the Oboe Context, reporter and report the initialization
@@ -75,7 +51,7 @@ module Oboe_metal
       begin
         return unless Oboe.loaded
 
-        Oboe_metal::Context.init() 
+        Oboe_metal::Context.init()
 
         if ENV['RACK_ENV'] == "test"
           Oboe.reporter = Oboe::FileReporter.new("/tmp/trace_output.bson")
@@ -88,36 +64,38 @@ module Oboe_metal
         unless defined?(::Rails) or defined?(::Sinatra) or defined?(::Padrino) or defined?(::Grape)
           Oboe::API.report_init
         end
-      
+
       rescue Exception => e
         $stderr.puts e.message
         raise
       end
     end
-    
+
     def self.sendReport(evt)
       evt.report
     end
   end
 end
 
-module Oboe 
+module Oboe
   extend OboeBase
   include Oboe_metal
-  
+
   class << self
     def sample?(opts = {})
+      return false unless Oboe.always?
+
       # 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'])
     end
-    
+
     def set_tracing_mode(mode)
       # FIXME: TBD
     end
-    
+
     def set_sample_rate(rate)
       # FIXME: TBD
     end

data/lib/method_profiling.rb

@@ -30,7 +30,7 @@ module OboeMethodProfiling
         # Safety:  Make sure there are no quotes or double quotes to break the class_eval
         file = file.gsub /[\'\"]/, ''
         line = line.gsub /[\'\"]/, ''
-      
+
         # profiling via ruby-prof, is it possible to get return value of profiled code?
         code = "def _oboe_profiled_#{method_name}(*args, &block)
                   entry_kvs                  = {}
@@ -42,7 +42,7 @@ module OboeMethodProfiling
                   entry_kvs['Args']          = Oboe::API.pps(*args) if #{store_args}
                   entry_kvs.merge!(::Oboe::API.get_class_name(self))
 
-                  Oboe::Context.log(nil, 'profile_entry', entry_kvs)
+                  Oboe::API.log(nil, 'profile_entry', entry_kvs)
 
                   ret = _oboe_orig_#{method_name}(*args, &block)
 
@@ -51,7 +51,7 @@ module OboeMethodProfiling
                   exit_kvs['ProfileName'] = '#{Oboe::Util.prettify(profile_name)}'
                   exit_kvs['ReturnValue'] = Oboe::API.pps(ret) if #{store_return}
 
-                  Oboe::Context.log(nil, 'profile_exit', exit_kvs)
+                  Oboe::API.log(nil, 'profile_exit', exit_kvs)
                   ret
                 end"
       rescue Exception => e

data/lib/oboe/api/layerinit.rb

@@ -16,7 +16,7 @@ module Oboe
         return unless Oboe.loaded
 
         platform_info = { '__Init' => 1 }
-        
+
         begin
           platform_info['Force']                   = true
           platform_info['Ruby.Platform.Version']   = RUBY_PLATFORM
@@ -34,18 +34,18 @@ module Oboe
           elsif defined?(::Sinatra)
             platform_info['Ruby.Sinatra.Version'] = "Sinatra-#{::Sinatra::VERSION}"
           end
-          
-          # Report the instrumented libraries 
+
+          # Report the instrumented libraries
           platform_info['Ruby.Cassandra.Version'] = "Cassandra-#{::Cassandra.VERSION}" if defined?(::Cassandra)
           platform_info['Ruby.Dalli.Version']     = "Dalli-#{::Dalli::VERSION}"        if defined?(::Dalli)
           platform_info['Ruby.MemCache.Version']  = "MemCache-#{::MemCache::VERSION}"  if defined?(::MemCache)
           platform_info['Ruby.Moped.Version']     = "Moped-#{::Moped::VERSION}"        if defined?(::Moped)
           platform_info['Ruby.Redis.Version']     = "Redis-#{::Redis::VERSION}"        if defined?(::Redis)
           platform_info['Ruby.Resque.Version']    = "Resque-#{::Resque::VERSION}"      if defined?(::Resque)
-         
+
           # Special case since the Mongo 1.x driver doesn't embed the version number in the gem directly
           if ::Gem.loaded_specs.has_key?('mongo')
-            platform_info['Ruby.Mongo.Version']     = "Mongo-#{::Gem.loaded_specs['mongo'].version.to_s}" 
+            platform_info['Ruby.Mongo.Version']     = "Mongo-#{::Gem.loaded_specs['mongo'].version.to_s}"
           end
 
           # Report the server in use (if possible)
@@ -66,20 +66,20 @@ module Oboe
           elsif defined?(::WEBrick)
             platform_info['Ruby.AppContainer.Version'] = "WEBrick-#{::WEBrick::VERSION}"
           else
-            platform_info['Ruby.AppContainer.Version'] = "Unknown"
-          end
-          
-          # If we couldn't load the c extension correctly, report the error to the dashboard.
-          unless Oboe.loaded
-            platform_info['Error'] = "Missing TraceView libraries.  Tracing disabled."
+            platform_info['Ruby.AppContainer.Version'] = File.basename($0)
           end
-        
-        rescue StandardError => e
+
+        rescue StandardError, ScriptError => e
+          # Also rescue ScriptError (aka SyntaxError) in case one of the expected
+          # version defines don't exist
+
+          platform_info['Error'] = "Error in layerinit: #{e.message}"
+
           Oboe.logger.debug "Error in layerinit: #{e.message}"
           Oboe.logger.debug e.backtrace
         end
 
-        start_trace(layer, nil, platform_info) { }
+        start_trace(layer, nil, platform_info.merge('Force' => true)) { }
       end
 
       ##

data/lib/oboe/api/logging.rb

@@ -23,7 +23,7 @@ module Oboe
       def log(layer, label, opts={})
         log_event(layer, label, Oboe::Context.createEvent, opts)
       end
-  
+
       # Public: Report an exception.
       #
       # layer - The layer the reported event belongs to
@@ -49,7 +49,7 @@ module Oboe
           exn.instance_variable_set(:@oboe_logged, true)
         end
       end
-  
+
       # Public: Decide whether or not to start a trace, and report an event
       # appropriately.
       #
@@ -61,18 +61,18 @@ module Oboe
       # Returns nothing.
       def log_start(layer, xtrace, opts={})
         return if Oboe.never? or (opts.has_key?(:URL) and ::Oboe::Util.static_asset?(opts[:URL]))
-  
+
         if xtrace
           Oboe::Context.fromString(xtrace)
         end
-  
+
         if Oboe.tracing?
           log_entry(layer, opts)
-        elsif Oboe.always? and (Oboe.sample?(opts.merge(:layer => layer, :xtrace => xtrace)) or opts.has_key?('Force'))
+        elsif opts.has_key?('Force') or Oboe.sample?(opts.merge(:layer => layer, :xtrace => xtrace))
           log_event(layer, 'entry', Oboe::Context.startTrace, opts)
         end
       end
-  
+
       # Public: Report an exit event.
       #
       # layer - The layer the reported event belongs to
@@ -84,7 +84,7 @@ module Oboe
         Oboe::Context.clear
         xtrace
       end
-  
+
       def log_entry(layer, opts={}, protect_op=nil)
         Oboe::Context.layer_op = protect_op if protect_op
         log_event(layer, 'entry', Oboe::Context.createEvent, opts)
@@ -94,7 +94,7 @@ module Oboe
         Oboe::Context.layer_op = nil if protect_op
         log_event(layer, 'exit', Oboe::Context.createEvent, opts)
       end
-  
+
       # Internal: Report an event.
       #
       # layer - The layer the reported event belongs to
@@ -117,13 +117,13 @@ module Oboe
             event.addInfo('Layer', layer.to_s)
         end
         event.addInfo('Label', label.to_s)
-  
+
         opts.each do |k, v|
           event.addInfo(k.to_s, v.to_s) if valid_key? k
         end if !opts.nil? and opts.any?
- 
+
         Oboe::Reporter.sendReport(event) if Oboe.loaded
       end
     end
-  end 
+  end
 end

data/lib/oboe/api/profiling.rb

@@ -3,7 +3,7 @@
 
 module Oboe
   module API
-    module Profiling 
+    module Profiling
 
       ##
       # Public: Profile a given block of code. Detect any exceptions thrown by
@@ -25,23 +25,24 @@ module Oboe
       #
       # Returns the result of the block.
       def profile(profile_name, report_kvs={}, with_backtrace=false)
-        
+
         report_kvs[:Language] ||= :ruby
         report_kvs[:ProfileName] ||= profile_name
+        report_kvs[:Backtrace] = Oboe::API.backtrace if with_backtrace
 
-        Oboe::Context.log(nil, 'profile_entry', report_kvs, with_backtrace)
+        Oboe::API.log(nil, 'profile_entry', report_kvs)
 
-        begin 
+        begin
           yield
         rescue Exception => e
-          log_exception(nil, e) 
+          log_exception(nil, e)
           raise
         ensure
           exit_kvs = {}
           exit_kvs[:Language] = :ruby
           exit_kvs[:ProfileName] = report_kvs[:ProfileName]
 
-          Oboe::Context.log(nil, 'profile_exit', exit_kvs, false)
+          Oboe::API.log(nil, 'profile_exit', exit_kvs)
         end
       end
     end

data/lib/oboe/api/tracing.rb

@@ -32,10 +32,10 @@ module Oboe
       # Returns the result of the block.
       def trace(layer, opts={}, protect_op=nil)
         log_entry(layer, opts, protect_op)
-        begin 
+        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/api/util.rb

@@ -56,7 +56,7 @@ module Oboe
       def blacklisted?(addr_port)
         return false unless Oboe::Config.blacklist
 
-        # Ensure that the blacklist is an array 
+        # Ensure that the blacklist is an array
         unless Oboe::Config.blacklist.is_a?(Array)
           val = Oboe::Config[:blacklist]
           Oboe::Config[:blacklist] = [ val.to_s ]
@@ -68,7 +68,7 @@ module Oboe
 
         false
       end
-      
+
       # Internal: Pretty print a list of arguments for reporting
       #
       # args - the list of arguments to work on
@@ -99,11 +99,11 @@ module Oboe
           if klass.is_a?(Class) and klass.is_a?(Module)
             # Class
             kv["Class"] = klass.to_s
-        
+
           elsif (not klass.is_a?(Class) and not klass.is_a?(Module))
             # Class instance
             kv["Class"] = klass.class.to_s
-          
+
           else
             # Module
             kv["Module"] = klass.to_s

data/lib/oboe/config.rb

@@ -12,7 +12,7 @@ module Oboe
     @@config = {}
 
     @@instrumentation = [ :cassandra, :dalli, :nethttp, :memcached, :memcache, :mongo,
-                          :moped, :rack, :redis, :resque, :action_controller, :action_view, 
+                          :moped, :rack, :redis, :resque, :action_controller, :action_view,
                           :active_record ]
 
     ##
@@ -48,7 +48,7 @@ module Oboe
       # Special instrument specific flags
       #
       # :link_workers - associates enqueue operations with the jobs they queue by piggybacking
-      #                 an additional argument that is stripped prior to job proecessing 
+      #                 an additional argument that is stripped prior to job proecessing
       #                 !!Note: Make sure both the queue side and the Resque workers are instrumented
       #                 or jobs will fail
       #                 (Default: false)
@@ -76,7 +76,7 @@ module Oboe
         @@config[:reporter_host] = "127.0.0.1"
         @@config[:reporter_port] = "7831"
       end
-        
+
       @@config[:verbose] = false
     end
 
@@ -103,17 +103,17 @@ module Oboe
 
       if key == :sample_rate
         unless value.is_a?(Integer) or value.is_a?(Float)
-          raise "oboe :sample_rate must be a number between 1 and 1000000 (1m)" 
+          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)" 
+          raise "oboe :sample_rate must be between 1 and 1000000 (1m)"
         end
 
         # Assure value is an integer
         @@config[key.to_sym] = value.to_i
- 
+
         Oboe.set_sample_rate(value)
       end
 

data/lib/oboe/frameworks/padrino.rb

@@ -42,7 +42,7 @@ module Oboe
 end
 
 if defined?(::Padrino)
-  # This instrumentation is a superset of the Sinatra instrumentation similar 
+  # This instrumentation is a superset of the Sinatra instrumentation similar
   # to how Padrino is a superset of Sinatra itself.
   ::Oboe.logger.info "[oboe/loading] Instrumenting Padrino" if Oboe::Config[:verbose]
 
@@ -57,7 +57,7 @@ if defined?(::Padrino)
     if defined?(::Padrino::Rendering)
       ::Oboe::Util.send_include(::Padrino::Rendering::InstanceMethods, ::Oboe::PadrinoInst::Rendering)
     end
-  
+
     # Report __Init after fork when in Heroku
     Oboe::API.report_init unless Oboe.heroku?
   end

data/lib/oboe/frameworks/rails.rb

@@ -20,12 +20,12 @@ module Oboe
               return raw(ERB.new(@@rum_hdr_tmpl).result)
             end
           end
-        rescue Exception => e  
+        rescue StandardError => e
           Oboe.logger.warn "oboe_rum_header: #{e.message}."
           return ""
         end
       end
-      
+
       def oboe_rum_footer
         begin
           return unless Oboe::Config.rum_id
@@ -34,13 +34,13 @@ module Oboe
             # skip that step for now
             return raw(@@rum_ftr_tmpl)
           end
-        rescue Exception => e
+        rescue StandardError => e
           Oboe.logger.warn "oboe_rum_footer: #{e.message}."
           return ""
         end
       end
     end # Helpers
-      
+
     def self.load_initializer
       # Force load the TraceView Rails initializer if there is one
       # Prefer oboe.rb but give priority to the legacy tracelytics.rb if it exists
@@ -52,7 +52,7 @@ module Oboe
 
       if File.exists?("#{rails_root}/config/initializers/tracelytics.rb")
         tr_initializer = "#{rails_root}/config/initializers/tracelytics.rb"
-      else 
+      else
         tr_initializer = "#{rails_root}/config/initializers/oboe.rb"
       end
       require tr_initializer if File.exists?(tr_initializer)
@@ -68,8 +68,8 @@ module Oboe
           Oboe.logger.error "[oboe/loading] Error loading rails insrumentation file '#{f}' : #{e}"
         end
       end
-      
-      Oboe.logger.info "TraceView oboe gem #{Oboe::Version::STRING} successfully loaded." 
+
+      Oboe.logger.info "TraceView oboe gem #{Oboe::Version::STRING} successfully loaded."
     end
 
     def self.include_helpers
@@ -95,9 +95,9 @@ if defined?(::Rails)
   if ::Rails::VERSION::MAJOR > 2
     module Oboe
       class Railtie < ::Rails::Railtie
-        
+
         initializer 'oboe.helpers' do
-          Oboe::Rails.include_helpers        
+          Oboe::Rails.include_helpers
         end
 
         initializer 'oboe.rack' do |app|
@@ -122,7 +122,7 @@ if defined?(::Rails)
 
     Oboe::Rails.load_initializer
     Oboe::Loading.load_access_key
-    
+
     Rails.configuration.after_initialize do
       Oboe.logger.info "[oboe/loading] Instrumenting rack" if Oboe::Config[:verbose]
       Rails.configuration.middleware.insert 0, "Oboe::Rack"
@@ -130,7 +130,7 @@ if defined?(::Rails)
       Oboe::Inst.load_instrumentation
       Oboe::Rails.load_instrumentation
       Oboe::Rails.include_helpers
-      
+
       # Report __Init after fork when in Heroku
       Oboe::API.report_init unless Oboe.heroku?
     end