oboe 2.6.6.1 → 2.6.7.1

data/lib/oboe/inst/resque.rb

@@ -21,7 +21,7 @@ module Oboe
 
           if Oboe::Config[:resque][:log_args]
             kv_args = args.to_json
-            
+
             # Limit the argument json string to 1024 bytes
             if kv_args.length > 1024
               report_kvs[:Args] = kv_args[0..1023] + '...[snipped]'
@@ -29,7 +29,7 @@ module Oboe
               report_kvs[:Args] = kv_args
             end
           end
-          
+
           report_kvs[:Backtrace] = Oboe::API.backtrace if Oboe::Config[:resque][:collect_backtraces]
         rescue
         end
@@ -94,12 +94,12 @@ module Oboe
           report_kvs[:URL] = '/resque/' + job.queue
           report_kvs[:Method] = 'NONE'
           report_kvs[:Queue] = job.queue
-            
+
           report_kvs[:Class] = job.payload['class']
 
           if Oboe::Config[:resque][:log_args]
             kv_args = job.payload['args'].to_json
-            
+
             # Limit the argument json string to 1024 bytes
             if kv_args.length > 1024
               report_kvs[:Args] = kv_args[0..1023] + '...[snipped]'

data/lib/oboe/loading.rb

@@ -27,13 +27,13 @@ module Oboe
   end
 
   ##
-  # This module houses all of the loading functionality for the oboe gem.  
+  # This module houses all of the loading functionality for the oboe gem.
   #
-  # Note that this does not necessarily _have_ to include initialization routines 
+  # Note that this does not necessarily _have_ to include initialization routines
   # (although it can).
   #
   # Actual initialization is often separated out as it can be dependent on on the state
-  # of the stack boot process.  e.g. code requiring that initializers, frameworks or 
+  # of the stack boot process.  e.g. code requiring that initializers, frameworks or
   # instrumented libraries are already loaded...
   #
   module Loading
@@ -52,7 +52,7 @@ module Oboe
           if Oboe::Config.access_key.empty?
             config_file = '/etc/tracelytics.conf'
             return unless File.exists?(config_file)
-            
+
             File.open(config_file).each do |line|
               if line =~ /^tracelyzer.access_key=/ or line =~ /^access_key/
                 bits = line.split(/=/)
@@ -63,14 +63,14 @@ module Oboe
             end
           end
         end
-      rescue Exception => e
+      rescue StandardError => e
         Oboe.logger.error "Trouble obtaining access_key and rum_id: #{e.inspect}"
       end
     end
 
     ##
     # Load the oboe tracing API
-    # 
+    #
     def self.require_api
       pattern = File.join(File.dirname(__FILE__), 'api', '*.rb')
       Dir.glob(pattern) do |f|

data/lib/oboe/logger.rb

@@ -13,22 +13,22 @@ module Oboe
     def fatal(string, exception = nil)
       Oboe.logger.fatal(string) if Oboe.logger
     end
-    
+
     # Error message
     def error(msg, exception = nil)
       Oboe.logger.error(string) if Oboe.logger
     end
-    
+
     # Warn message
     def warn(msg, exception = nil)
       Oboe.logger.warn(string) if Oboe.logger
     end
-    
+
     # Info message
     def info(msg, exception = nil)
       Oboe.logger.info(string) if Oboe.logger
     end
-    
+
     # Debug message
     def debug(msg, exception = nil)
       Oboe.logger.debug(string) if Oboe.logger

data/lib/oboe/version.rb

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

data/lib/oboe_metal.rb

@@ -3,40 +3,9 @@
 
 require 'base'
 
-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
-    end
-  end
-
-  class Event
-    def self.metadataString(evt)
-      evt.metadataString()
-    end
-  end
+module Oboe
+  extend OboeBase
+  include Oboe_metal
 
   class Reporter
     ##
@@ -46,7 +15,7 @@ module Oboe_metal
       return unless Oboe.loaded
 
       begin
-        Oboe_metal::Context.init() 
+        Oboe_metal::Context.init()
 
         if ENV['RACK_ENV'] == "test"
           Oboe.reporter = Oboe::FileReporter.new("/tmp/trace_output.bson")
@@ -70,15 +39,18 @@ module Oboe_metal
       Oboe.reporter.sendReport(evt)
     end
   end
-end
 
-module Oboe 
-  extend OboeBase
-  include Oboe_metal
+  class Event
+    def self.metadataString(evt)
+      evt.metadataString()
+    end
+  end
 
   class << self
     def sample?(opts = {})
       begin
+        return false unless Oboe.always?
+
         # Assure defaults since SWIG enforces Strings
         layer   = opts[:layer]      ? opts[:layer].strip      : ''
         xtrace  = opts[:xtrace]     ? opts[:xtrace].strip     : ''

data/test/frameworks/apps/grape_simple.rb

@@ -2,7 +2,7 @@ require 'grape'
 
 class GrapeSimple < Grape::API
   set :reload, true
-  
+
   get '/json_endpoint' do
     present({ :test => true })
   end

data/test/frameworks/apps/sinatra_simple.rb

@@ -2,7 +2,7 @@ require 'sinatra'
 
 class SinatraSimple < Sinatra::Base
   set :reload, true
-  
+
   get "/" do
     'The magick number is: 2767356926488785838763860464013972991031534522105386787489885890443740254365!' # Change only the number!!!
   end

data/test/frameworks/padrino_test.rb

@@ -4,14 +4,14 @@ if RUBY_VERSION >= '1.9.3'
 
   describe Padrino do
     before do
-      clear_all_traces 
+      clear_all_traces
     end
 
     it "should trace a request to a simple padrino stack" do
       @app = SimpleDemo
-      
+
       r = get "/render"
-      
+
       traces = get_all_traces
       traces.count.must_equal 9
 

data/test/frameworks/sinatra_test.rb

@@ -3,14 +3,14 @@ require File.expand_path(File.dirname(__FILE__) + '/apps/sinatra_simple')
 
 describe Sinatra do
   before do
-    clear_all_traces 
+    clear_all_traces
   end
 
   it "should trace a request to a simple sinatra stack" do
     @app = SinatraSimple
-    
+
     r = get "/render"
-    
+
     traces = get_all_traces
     traces.count.must_equal 9
 

data/test/instrumentation/cassandra_test.rb

@@ -2,26 +2,26 @@ require 'minitest_helper'
 
 describe Oboe::Inst::Cassandra do
   before do
-    clear_all_traces 
+    clear_all_traces
 
     @client = Cassandra.new("system", "127.0.0.1:9160", { :timeout => 10 })
     @client.disable_node_auto_discovery!
 
     @ks_name = "AppNetaCassandraTest"
-    
+
     ks_def = CassandraThrift::KsDef.new(:name => @ks_name,
               :strategy_class => "SimpleStrategy",
               :strategy_options => { 'replication_factor' => '2' },
               :cf_defs => [])
-      
+
     @client.add_keyspace(ks_def) unless @client.keyspaces.include? @ks_name
     @client.keyspace = @ks_name
-   
+
     unless @client.column_families.include? "Users"
       cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => "Users")
       @client.add_column_family(cf_def)
     end
-    
+
     unless @client.column_families.include? "Statuses"
       cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => "Statuses")
       @client.add_column_family(cf_def)
@@ -44,7 +44,7 @@ describe Oboe::Inst::Cassandra do
   end
 
   it 'Stock Cassandra should be loaded, defined and ready' do
-    defined?(::Cassandra).wont_match nil 
+    defined?(::Cassandra).wont_match nil
   end
 
   it 'Cassandra should have oboe methods defined' do
@@ -57,15 +57,15 @@ describe Oboe::Inst::Cassandra do
     # Special 'exists?' case
     ::Cassandra.method_defined?("exists_with_oboe?").must_equal true
   end
-  
+
   it 'should trace insert' do
     Oboe::API.start_trace('cassandra_test', '', {}) do
       user = {'screen_name' => 'larry', "blah" => "ok"}
       @client.insert(:Users, '5', user, { :ttl => 600, :consistency => 1})
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -83,9 +83,9 @@ describe Oboe::Inst::Cassandra do
     Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.remove(:Users, '5', 'blah')
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -96,16 +96,16 @@ describe Oboe::Inst::Cassandra do
     traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
     validate_event_keys(traces[2], @exit_kvs)
   end
-  
+
   it 'should trace count_columns' do
     @client.insert(:Statuses, '12', {'body' => 'v1', 'user' => 'v2'})
-    
+
     Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.count_columns(:Statuses, '12', :count => 50)
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -122,9 +122,9 @@ describe Oboe::Inst::Cassandra do
     Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.get_columns(:Statuses, '12', ['body'])
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -140,9 +140,9 @@ describe Oboe::Inst::Cassandra do
     Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.multi_get_columns(:Users, ['12', '5'], ['body'])
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -158,9 +158,9 @@ describe Oboe::Inst::Cassandra do
     Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.get(:Statuses, '12', :reversed => true)
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -178,9 +178,9 @@ describe Oboe::Inst::Cassandra do
       @client.exists?(:Statuses, '12')
       @client.exists?(:Statuses, '12', 'body')
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 6
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -190,7 +190,7 @@ describe Oboe::Inst::Cassandra do
     traces[1]['Key'].must_equal "\"12\""
     traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
     validate_event_keys(traces[2], @exit_kvs)
-    
+
     traces[3]['Op'].must_equal "exists?"
     traces[3]['Cf'].must_equal "Statuses"
     traces[3]['Key'].must_equal "\"12\""
@@ -201,9 +201,9 @@ describe Oboe::Inst::Cassandra do
     Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.get_range_keys(:Statuses, :key_count => 4)
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -220,7 +220,7 @@ describe Oboe::Inst::Cassandra do
     end
 
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -232,11 +232,11 @@ describe Oboe::Inst::Cassandra do
     traces[1]['Validation_class'].must_equal "LongType"
     traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
     validate_event_keys(traces[2], @exit_kvs)
-    
+
     # Clean up
     @client.drop_index(@ks_name, 'Statuses', 'column_name')
   end
-  
+
   it 'should trace drop_index' do
     # Prep
     @client.create_index(@ks_name, 'Statuses', 'column_name', 'LongType')
@@ -244,9 +244,9 @@ describe Oboe::Inst::Cassandra do
     Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.drop_index(@ks_name, 'Statuses', 'column_name')
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -271,9 +271,9 @@ describe Oboe::Inst::Cassandra do
                            :comparison => ">"} ]
       @client.get_indexed_slices(:Statuses, expressions).length
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -283,7 +283,7 @@ describe Oboe::Inst::Cassandra do
     traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
     validate_event_keys(traces[2], @exit_kvs)
   end
-  
+
   it 'should trace add and remove of column family' do
     cf_name = (0...10).map{ ('a'..'z').to_a[rand(26)] }.join
     cf_def = CassandraThrift::CfDef.new(:keyspace => @ks_name, :name => cf_name)
@@ -292,9 +292,9 @@ describe Oboe::Inst::Cassandra do
       @client.add_column_family(cf_def)
       @client.drop_column_family(cf_name)
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 6
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -302,12 +302,12 @@ describe Oboe::Inst::Cassandra do
     traces[1]['Op'].must_equal "add_column_family"
     traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
     validate_event_keys(traces[2], @exit_kvs)
-    
+
     traces[3]['Op'].must_equal "drop_column_family"
     traces[3]['Cf'].must_equal cf_name
     traces[3].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
   end
-  
+
   it 'should trace adding a keyspace' do
     ks_name = (0...10).map{ ('a'..'z').to_a[rand(26)] }.join
     column_families = [{:name =>"a"}, {:name => "b", :type => :super}]
@@ -320,9 +320,9 @@ describe Oboe::Inst::Cassandra do
       @client.add_keyspace(ks_def)
       @client.keyspace = ks_name
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -332,14 +332,14 @@ describe Oboe::Inst::Cassandra do
     traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
     validate_event_keys(traces[2], @exit_kvs)
   end
-  
+
   it 'should trace the removal of a keyspace' do
     Oboe::API.start_trace('cassandra_test', '', {}) do
       @client.drop_keyspace(@ks_name)
     end
-    
+
     traces = get_all_traces
-    
+
     traces.count.must_equal 4
     validate_outer_layers(traces, 'cassandra_test')
 
@@ -349,7 +349,7 @@ describe Oboe::Inst::Cassandra do
     traces[1].has_key?('Backtrace').must_equal Oboe::Config[:cassandra][:collect_backtraces]
     validate_event_keys(traces[2], @exit_kvs)
   end
-  
+
   it "should obey :collect_backtraces setting when true" do
     Oboe::Config[:cassandra][:collect_backtraces] = true
 
@@ -373,5 +373,5 @@ describe Oboe::Inst::Cassandra do
     traces = get_all_traces
     layer_doesnt_have_key(traces, 'cassandra', 'Backtrace')
   end
-  
+
 end