oboe 2.2.6 → 2.3.2

data/gemfiles/rails3.2.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "appraisal"
+gem "dalli"
+gem "memcache-client"
+gem "memcached"
+gem "cassandra"
+gem "mongo"
+gem "bson_ext"
+gem "moped"
+gem "resque"
+gem "rails", "~> 3.2.13"
+gem "oboe", :path=>"../"
+
+gemspec :name=>"oboe", :path=>"../"

data/gemfiles/rails3.2.gemfile.lock

@@ -0,0 +1,150 @@
+PATH
+  remote: /home/pglombardo/Projects/oboe-ruby
+  specs:
+    oboe (2.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (3.0.2)
+    bson (1.9.0)
+    bson_ext (1.9.0)
+      bson (~> 1.9.0)
+    builder (3.0.4)
+    cassandra (0.18.0)
+      json
+      rake
+      simple_uuid (~> 0.2.0)
+      thrift_client (>= 0.7.0, < 0.9)
+    dalli (2.6.4)
+    diff-lcs (1.2.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.8.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memcache-client (1.8.5)
+    memcached (1.6.1)
+    mime-types (1.23)
+    mongo (1.9.0)
+      bson (~> 1.9.0)
+    mono_logger (1.1.0)
+    moped (1.5.0)
+    multi_json (1.7.7)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-protection (1.5.0)
+      rack
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
+      redis (~> 3.0.0)
+    resque (1.24.1)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.2)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simple_uuid (0.2.0)
+    sinatra (1.4.3)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.18.1)
+    thrift (0.8.0)
+    thrift_client (0.8.4)
+      thrift (~> 0.8.0)
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bson_ext
+  cassandra
+  dalli
+  memcache-client
+  memcached
+  mongo
+  moped
+  oboe!
+  rails (~> 3.2.13)
+  rake
+  resque
+  rspec

data/init.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 require 'oboe'

data/lib/joboe_metal.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe_metal
@@ -12,7 +12,7 @@ module Oboe_metal
   import 'com.tracelytics.joboe.Event'
 
   class Context
-    def self.log(layer, label, options = {}, with_backtrace = true)
+    def self.log(layer, label, options = {}, with_backtrace = false)
       evt = Oboe::Context.createEvent()
       evt.addInfo("Layer", layer.to_s)
       evt.addInfo("Label", label.to_s)
@@ -70,6 +70,27 @@ module Oboe_metal
   end
   
   module Reporter
+    ##
+    # Initialize the Oboe Context, reporter and report the initialization
+    #
+    def self.start
+      begin
+        Oboe_metal::Context.init() 
+
+        if ENV['RACK_ENV'] == "test"
+          Oboe.reporter = Oboe::FileReporter.new("./tmp/trace_output.bson")
+        else
+          Oboe.reporter = Oboe::UdpReporter.new(Oboe::Config[:reporter_host])
+        end
+
+        Oboe::API.report_init('ruby') unless ["development", "test"].include? ENV['RACK_ENV']
+      
+      rescue Exception => e
+        $stderr.puts e.message
+        raise
+      end
+    end
+    
     def self.sendReport(evt)
       evt.report
     end
@@ -79,42 +100,39 @@ end
 module Oboe
   include Oboe_metal
   
-  def self.always?
-    Oboe::Config[:tracing_mode].to_s == "always"
-  end
-  
-  def self.log(layer, label, options = {})
-    Context.log(layer, label, options = options)
-  end
+  class << self
+    attr_accessor :reporter
   
-  def self.never?
-    Oboe::Config[:tracing_mode].to_s == "never"
-  end
-
-  def self.passthrough?
-    ["always", "through"].include?(Oboe::Config[:tracing_mode])
-  end
+    def always?
+      Oboe::Config[:tracing_mode].to_s == "always"
+    end
     
-  def self.sample?(opts = {})
-    # 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 self.through?
-    Oboe::Config[:tracing_mode] == "through"
-  end
+    def log(layer, label, options = {})
+      Context.log(layer, label, options = options)
+    end
     
-  def self.tracing?
-    Oboe::Context.isValid and not Oboe.never?
-  end
+    def never?
+      Oboe::Config[:tracing_mode].to_s == "never"
+    end
 
-  def self.reporter
-    if !@reporter
-      @reporter = Oboe::UdpReporter.new(Oboe::Config[:reporter_host])
+    def passthrough?
+      ["always", "through"].include?(Oboe::Config[:tracing_mode])
+    end
+      
+    def sample?(opts = {})
+      # 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 through?
+      Oboe::Config[:tracing_mode] == "through"
+    end
+      
+    def tracing?
+      Oboe::Context.isValid and not Oboe.never?
     end
-    return @reporter
   end
 end

data/lib/method_profiling.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module OboeMethodProfiling

data/lib/oboe.rb

@@ -1,9 +1,10 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 begin
-  require 'rbconfig'
-  require 'logger'
+  require 'oboe/version'
+  require 'oboe/logger'
+  require 'oboe/util'
   
   # If Oboe_metal is already defined then we are in a PaaS environment
   # with an alternate metal (such as Heroku: see the oboe-heroku gem)
@@ -16,8 +17,7 @@ begin
       require 'oboe_metal'
     end
   end
-  require 'oboe/logger'
-  require 'oboe/util'
+ 
   require 'oboe/config'
   require 'oboe/loading'
   require 'method_profiling'
@@ -34,4 +34,5 @@ rescue LoadError
   $stderr.puts "=============================================================="
 rescue Exception => e
   $stderr.puts "[oboe/error] Problem loading: #{e.inspect}"
+  $stderr.puts e.backtrace
 end

data/lib/oboe/api.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

data/lib/oboe/api/layerinit.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2013 AppNeta, Inc.
+# All rights reserved.
+
 module Oboe
   module API
     module LayerInit

data/lib/oboe/api/logging.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

data/lib/oboe/api/memcache.rb

@@ -1,6 +1,6 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
-#
+
 module Oboe
   module API
     module Memcache

data/lib/oboe/api/profiling.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe
@@ -11,7 +11,9 @@ module Oboe
       #
       # profile_name - A name used to identify the block being profiled.
       # report_kvs - A hash containing key/value pairs that will be reported along
-      # with the event of this profile (optional).
+      #              with the event of this profile (optional).
+      # with_backtrace - Boolean to indicate whether a backtrace should
+      #                  be collected with this trace event.
       #
       # Example
       #
@@ -22,12 +24,12 @@ module Oboe
       #   end
       #
       # Returns the result of the block.
-      def profile(profile_name, report_kvs={})
+      def profile(profile_name, report_kvs={}, with_backtrace=false)
         
         report_kvs[:Language] ||= :ruby
         report_kvs[:ProfileName] ||= profile_name
 
-        Oboe::Context.log(nil, 'profile_entry', report_kvs)
+        Oboe::Context.log(nil, 'profile_entry', report_kvs, with_backtrace)
 
         begin 
           yield

data/lib/oboe/api/tracing.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

data/lib/oboe/api/util.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe

data/lib/oboe/config.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2012 by Tracelytics, Inc.
+# Copyright (c) 2013 AppNeta, Inc.
 # All rights reserved.
 
 module Oboe
@@ -27,9 +27,23 @@ module Oboe
       @@instrumentation.each do |k|
         @@config[k] = {}
         @@config[k][:enabled] = true
+        @@config[k][:collect_backtraces] = false
         @@config[k][:log_args] = true
       end
 
+      # Set collect_backtraces defaults
+      Oboe::Config[:action_controller][:collect_backtraces] = true
+      Oboe::Config[:active_record][:collect_backtraces] = true
+      Oboe::Config[:action_view][:collect_backtraces] = true
+      Oboe::Config[:cassandra][:collect_backtraces] = true
+      Oboe::Config[:dalli][:collect_backtraces] = false
+      Oboe::Config[:memcache][:collect_backtraces] = false
+      Oboe::Config[:memcached][:collect_backtraces] = false
+      Oboe::Config[:mongo][:collect_backtraces] = true
+      Oboe::Config[:moped][:collect_backtraces] = true
+      Oboe::Config[:nethttp][:collect_backtraces] = true
+      Oboe::Config[:resque][:collect_backtraces] = true
+
       # Special instrument specific flags
       #
       # :link_workers - associates enqueue operations with the jobs they queue by piggybacking
@@ -47,8 +61,15 @@ module Oboe
       # avoid collecting and reporting query literals to TraceView.
       @@config[:sanitize_sql] = false
 
-      update!(data)
-
+      # The default configuration
+      default_config = {
+        :tracing_mode => "through",
+        :reporter_host => "127.0.0.1",
+        :sample_rate => 300000,
+        :verbose => false 
+      }
+      update!(default_config)
+      
       # For Initialization, mark this as the default SampleRate
       @@config[:sample_source] = 2 # OBOE_SAMPLE_RATE_SOURCE_DEFAULT
     end
@@ -66,6 +87,10 @@ module Oboe
     def self.[]=(key, value)
       @@config[key.to_sym] = value
 
+      if key == :sampling_rate
+        Oboe.logger.warn "WARNING: :sampling_rate is not a supported setting for Oboe::Config.  Please use :sample_rate."
+      end
+
       if key == :sample_rate
         # When setting SampleRate, note that it's been manually set
         # OBOE_SAMPLE_RATE_SOURCE_FILE == 1
@@ -113,11 +138,5 @@ module Oboe
   end
 end
 
-config = {
-      :tracing_mode => "through",
-      :reporter_host => "127.0.0.1",
-      :sample_rate => 300000,
-      :verbose => false }
-
-Oboe::Config.initialize(config)
+Oboe::Config.initialize