oboe 2.6.2.0 → 2.6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 910571cb0ab799c3a6a2aa4ab7e3c9e4fce88032
-  data.tar.gz: 0ae240f38177e6eaef045e4fab5acbdb94eeb375
+  metadata.gz: 849242c14c945d9a5687e47d042729a919a29589
+  data.tar.gz: 3b21c37c48ea8b1813d9268b2c0acc10de8b4a34
 SHA512:
-  metadata.gz: 7328be6f93b8288d0ea86ca10f74f60ed7b30af07fc0e3f29faab9811fcbee3f61c3491d6618388169144575547129cf94fba948af7cc3a4599a80b4dcecb490
-  data.tar.gz: 0ec98782356c87a08eedcabb964bf21be6536a1c29dfb5abc334e357a3f93ece4190f2da0120d93a20a1060c14e110a433fe598e02a2ba9d7e01cdbaf21f9b36
+  metadata.gz: cc0243bcd66501f11e95eae0401b94721881e29baabf218286a5f78b440db4426b20a8e4ea3c0b91aac3bd46452b5943c25a7d841f1a0d44e7351451793cff0c
+  data.tar.gz: 5ccdaa4436264e9d2775909dfc4d9a8fca1dae95ba98e112339061df7e6c6342653796110a02508237bc50d70ad26991dc6ced62e952306f68f4dcaebba7b59a

data/.gitignore

@@ -6,4 +6,3 @@ ext/oboe_metal/Makefile
 ext/oboe_metal/mkmf.log
 ext/oboe_metal/oboe_metal.so
 ext/oboe_metal/oboe_wrap.o
-Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+
+# oboe 2.6.2.0 (03/24/14)
+
+* This patch release improves webserver detection on Heroku and adds in some c extension protections.  A oboe-heroku gem release will follow this release.
+
+# oboe 2.6.1.0 (03/12/14)
+
+This is a patch release to address "Unsupported digest algorithm (SHA256)" occurring under certain cases on Heroku. A oboe-heroku gem release will follow this release.
+
+* Support delayed Reporter Initialization for Forking Webservers
+* README syntax fixes
+
 # oboe 2.5.0.7 (02/13/14)
 
 * Added new Redis redis-rb gem (>= 3.0.0) instrumentation

data/Gemfile

@@ -29,7 +29,7 @@ gem 'redis'
 
 # Instrumented Frameworks
 gem 'sinatra'
-gem 'padrino' unless (RUBY_VERSION =~ /^1.8/) == 0
+gem 'padrino', '0.12.0' unless (RUBY_VERSION =~ /^1.8/) == 0
 
 # Import dependencies from oboe.gemspec
 gemspec :name => 'oboe'

data/Gemfile.lock

@@ -0,0 +1,177 @@
+PATH
+  remote: .
+  specs:
+    oboe (2.6.3.dev8)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    ansi (1.4.3)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    archive-tar-minitar (0.5.2)
+    bson (1.9.2)
+    bson_ext (1.9.2)
+      bson (~> 1.9.2)
+    builder (3.2.2)
+    byebug (2.7.0)
+      columnize (~> 0.3)
+      debugger-linecache (~> 1.2)
+    cassandra (0.23.0)
+      json
+      rake
+      simple_uuid (~> 0.3)
+      thrift_client (~> 0.7, < 0.9)
+    coderay (1.1.0)
+    columnize (0.3.6)
+    dalli (2.7.0)
+    debugger-linecache (1.2.0)
+    hashie (2.0.5)
+    http_router (0.11.1)
+      rack (>= 1.0.0)
+      url_mount (~> 0.2.1)
+    i18n (0.6.9)
+    json (1.8.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memcache-client (1.8.5)
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    minitest (5.3.2)
+    minitest-reporters (1.0.2)
+      ansi
+      builder
+      minitest (>= 5.0)
+      powerbar
+    moneta (0.7.20)
+    mongo (1.9.2)
+      bson (~> 1.9.2)
+    mono_logger (1.1.0)
+    moped (1.5.2)
+    multi_json (1.9.2)
+    padrino (0.12.0)
+      padrino-admin (= 0.12.0)
+      padrino-cache (= 0.12.0)
+      padrino-core (= 0.12.0)
+      padrino-gen (= 0.12.0)
+      padrino-helpers (= 0.12.0)
+      padrino-mailer (= 0.12.0)
+    padrino-admin (0.12.0)
+      padrino-core (= 0.12.0)
+      padrino-helpers (= 0.12.0)
+    padrino-cache (0.12.0)
+      moneta (~> 0.7.0)
+      padrino-core (= 0.12.0)
+      padrino-helpers (= 0.12.0)
+    padrino-core (0.12.0)
+      activesupport (>= 3.1)
+      http_router (~> 0.11.0)
+      rack-protection (>= 1.5.0)
+      sinatra (~> 1.4.2)
+      thor (~> 0.17.0)
+      tilt (~> 1.4.1)
+    padrino-gen (0.12.0)
+      bundler (~> 1.0)
+      padrino-core (= 0.12.0)
+    padrino-helpers (0.12.0)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-core (= 0.12.0)
+    padrino-mailer (0.12.0)
+      mail (~> 2.5.3)
+      padrino-core (= 0.12.0)
+    perftools.rb (2.0.1)
+    polyglot (0.3.4)
+    powerbar (1.0.11)
+      ansi (~> 1.4.0)
+      hashie (>= 1.1.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-protection (1.5.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.2.2)
+    rbx-require-relative (0.0.9)
+    redis (3.0.7)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    resque (1.25.2)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    simple_uuid (0.4.0)
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slop (3.5.0)
+    thor (0.17.0)
+    thrift (0.8.0)
+    thrift_client (0.8.4)
+      thrift (~> 0.8.0)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    url_mount (0.2.1)
+      rack
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  bson
+  bson_ext
+  byebug
+  cassandra
+  dalli
+  memcache-client
+  minitest
+  minitest-reporters
+  mongo
+  moped
+  oboe!
+  padrino (= 0.12.0)
+  perftools.rb
+  pry
+  rack-test
+  rake
+  redis
+  resque
+  ruby-debug
+  ruby-debug19
+  sinatra

data/lib/method_profiling.rb

@@ -35,8 +35,8 @@ module OboeMethodProfiling
         code = "def _oboe_profiled_#{method_name}(*args, &block)
                   entry_kvs                  = {}
                   entry_kvs['Language']      = 'ruby'
-                  entry_kvs['ProfileName']   = '#{profile_name}'
-                  entry_kvs['FunctionName']  = '#{method_name}'
+                  entry_kvs['ProfileName']   = '#{Oboe::Util.prettify(profile_name)}'
+                  entry_kvs['FunctionName']  = '#{Oboe::Util.prettify(method_name)}'
                   entry_kvs['File']          = '#{file}'
                   entry_kvs['LineNumber']    = '#{line}'
                   entry_kvs['Args']          = Oboe::API.pps(*args) if #{store_args}
@@ -48,7 +48,7 @@ module OboeMethodProfiling
 
                   exit_kvs =  {}
                   exit_kvs['Language'] = 'ruby'
-                  exit_kvs['ProfileName'] = '#{profile_name}'
+                  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)

data/lib/oboe/api/logging.rb

@@ -60,7 +60,7 @@ module Oboe
       #
       # Returns nothing.
       def log_start(layer, xtrace, opts={})
-        return if Oboe.never?
+        return if Oboe.never? or (opts.has_key?(:URL) and ::Oboe::Util.static_asset?(opts[:URL]))
   
         if xtrace
           Oboe::Context.fromString(xtrace)
@@ -68,7 +68,7 @@ module Oboe
   
         if Oboe.tracing?
           log_entry(layer, opts)
-        elsif Oboe.sample?(opts.merge(:layer => layer, :xtrace => xtrace)) or opts.has_key?('Force')
+        elsif Oboe.always? and (Oboe.sample?(opts.merge(:layer => layer, :xtrace => xtrace)) or opts.has_key?('Force'))
           log_event(layer, 'entry', Oboe::Context.startTrace, opts)
         end
       end

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

@@ -17,7 +17,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
       def render_partial
         entry_kvs = {}
         begin
-          name = @options[:partial].to_s if @options.is_a?(Hash)
+          name = Oboe::Util.prettify(@options[:partial]) if @options.is_a?(Hash)
           entry_kvs[:FunctionName] = :render_partial
           entry_kvs[:Class]        = :PartialRenderer
           entry_kvs[:Module]       = :ActionView
@@ -35,7 +35,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
       def render_collection
         entry_kvs = {}
         begin
-          name = @path.to_s
+          name = Oboe::Util.prettify(@path)
           entry_kvs[:FunctionName] = :render_collection
           entry_kvs[:Class]        = :PartialRenderer
           entry_kvs[:Module]       = :ActionView

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

@@ -13,7 +13,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
         if options.has_key?(:partial) and options[:partial].is_a?(String)
           entry_kvs = {}
           begin
-            name  = options[:partial].to_s if options.is_a?(Hash)
+            name  = Oboe::Util.prettify(options[:partial]) if options.is_a?(Hash)
             entry_kvs[:FunctionName] = :render_partial
             entry_kvs[:Class]        = :Partials
             entry_kvs[:Module]       = :ActionView

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

@@ -10,7 +10,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
       def render_partial(object = @object)
         entry_kvs = {}
         begin
-          name  = @options[:partial].to_s if @options.is_a?(Hash)
+          name  = Oboe::Util.prettify(@options[:partial]) if @options.is_a?(Hash)
           entry_kvs[:FunctionName] = :render_partial
           entry_kvs[:Class]        = :PartialRenderer
           entry_kvs[:Module]       = 'ActionView::Partials'
@@ -28,7 +28,7 @@ if defined?(ActionView::Base) and Oboe::Config[:action_view][:enabled]
       def render_collection
         entry_kvs = {}
         begin
-          name  = @path
+          name  = Oboe::Util.prettify(@path)
           entry_kvs[:FunctionName] = :render_collection
           entry_kvs[:Class]        = :PartialRenderer
           entry_kvs[:Module]       = 'ActionView::Partials'

data/lib/oboe/inst/rack.rb

@@ -11,12 +11,10 @@ module Oboe
       @app = app
     end
 
-    def collect(env)
+    def collect(req, env)
       report_kvs = {}
 
       begin
-        req = ::Rack::Request.new(env)
-
         if Oboe.always?
           # Only report these KVs under tracing_mode 'always' (never for 'through')
           report_kvs[:SampleRate]        = Oboe.sample_rate
@@ -53,7 +51,11 @@ module Oboe
     end
 
     def call(env)
+      req = ::Rack::Request.new(env)
+
       report_kvs = {}
+      report_kvs[:URL] = URI.unescape(req.path)
+
       xtrace = env.is_a?(Hash) ? env['HTTP_X_TRACE'] : nil
 
       result, xtrace = Oboe::API.start_trace('rack', xtrace, report_kvs) do
@@ -61,7 +63,7 @@ module Oboe
         status, headers, response = @app.call(env)
 
         if Oboe.tracing?
-          report_kvs = collect(env) 
+          report_kvs = collect(req, env) 
           Oboe::API.log(nil, 'info', report_kvs.merge!({ :Status => status }))
         end
 

data/lib/oboe/util.rb

@@ -5,7 +5,7 @@ module Oboe
   module Util
     class << self
       ##
-      # oboe_alias
+      # method_alias
       #
       # Centralized utility method to alias a method on an arbitrary
       # class or module.
@@ -45,7 +45,7 @@ module Oboe
       end
   
       ##
-      # oboe_send_include
+      # send_include
       #
       # Centralized utility method to send a include call for an
       # arbitrary class
@@ -54,6 +54,33 @@ module Oboe
           target_cls.send(:include, cls)
         end
       end
+
+      ##
+      # static_asset?
+      #
+      # Given a path, this method determines whether it is a static asset or not (based
+      # solely on filename)
+      #
+      def static_asset?(path)
+        return (path =~ /\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf|ttf|woff|svg|less)$/i)
+      end
+
+      ##
+      # prettify
+      #
+      # Even to my surprise, 'prettify' is a real word:
+      # transitive v. To make pretty or prettier, especially in a superficial or insubstantial way.
+      #   from The American Heritage® Dictionary of the English Language, 4th Edition
+      #
+      # This method makes things 'purty' for reporting.
+      def prettify(x)
+        if (x.to_s =~ /^#</) == 0
+          x.class.to_s
+        else
+          x.to_s
+        end
+      end
+
     end
   end
 end

data/lib/oboe/version.rb

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

data/lib/oboe_metal.rb

@@ -78,22 +78,25 @@ module Oboe
 
   class << self
     def sample?(opts = {})
-      # Assure defaults since SWIG enforces Strings
-      opts[:layer]      ||= ''
-      opts[:xtrace]     ||= ''
-      opts['X-TV-Meta'] ||= ''
-
-      rv = Oboe::Context.sampleRequest(opts[:layer], opts[:xtrace], opts['X-TV-Meta'])
-
-      # For older liboboe that returns true/false, just return that.
-      return rv if [TrueClass, FalseClass].include?(rv.class) or (rv == 0)
-
-      # liboboe version > 1.3.1 returning a bit masked integer with SampleRate and
-      # source embedded
-      Oboe.sample_rate = (rv & SAMPLE_RATE_MASK)
-      Oboe.sample_source = (rv & SAMPLE_SOURCE_MASK) >> 24
-
-      rv
+      begin
+        # Assure defaults since SWIG enforces Strings
+        layer   = opts[:layer]      ? opts[:layer].strip      : ''
+        xtrace  = opts[:xtrace]     ? opts[:xtrace].strip     : ''
+        tv_meta = opts['X-TV-Meta'] ? opts['X-TV-Meta'].strip : ''
+
+        rv = Oboe::Context.sampleRequest(layer, xtrace, tv_meta)
+
+        # For older liboboe that returns true/false, just return that.
+        return rv if [TrueClass, FalseClass].include?(rv.class) or (rv == 0)
+
+        # liboboe version > 1.3.1 returning a bit masked integer with SampleRate and
+        # source embedded
+        Oboe.sample_rate = (rv & SAMPLE_RATE_MASK)
+        Oboe.sample_source = (rv & SAMPLE_SOURCE_MASK) >> 24
+      rescue StandardError => e
+        Oboe.logger.debug "[oboe/error] sample? error: #{e.inspect}"
+        false
+      end
     end
 
     def set_tracing_mode(mode)

data/test/frameworks/apps/padrino_simple.rb

@@ -8,6 +8,7 @@ PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 #
 
 class SimpleDemo < Padrino::Application
+  set :public_folder, File.dirname(__FILE__)
   set :reload, true
   before { true }
   after  { true }
@@ -37,3 +38,4 @@ end
 #
 
 Padrino.load!
+

data/test/instrumentation/rack_test.rb

@@ -3,10 +3,7 @@ require 'rack/test'
 require 'rack/lobster'
 require 'oboe/inst/rack'
 
-Oboe::Config[:tracing_mode] = 'always'
-Oboe::Config[:sample_rate] = 1e6
-    
-class RackTestApp < MiniTest::Unit::TestCase
+class RackTestApp < Minitest::Test
   include Rack::Test::Methods
 
   def app
@@ -51,5 +48,16 @@ class RackTestApp < MiniTest::Unit::TestCase
     assert last_response.ok?
     assert last_response['X-Trace']
   end
+  
+  def test_dont_trace_static_assets
+    clear_all_traces 
+
+    get "/assets/static_asset.png"
+
+    traces = get_all_traces
+    assert traces.empty?
+
+    assert last_response.status == 404
+  end
 end
 

data/test/minitest_helper.rb

@@ -7,6 +7,8 @@ ENV["RACK_ENV"] = "test"
 # not defined under Ruby 1.8.7 and 1.9.3
 RUBY_ENGINE = "ruby" unless defined?(RUBY_ENGINE)
 
+Minitest::Spec.new 'pry'
+
 unless RUBY_VERSION =~ /^1.8/
   MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new
 end

data/test/support/{srv1_localset_test.rb → liboboe_settings_test.rb}

@@ -6,7 +6,7 @@ require 'oboe/inst/rack'
 Oboe::Config[:tracing_mode] = 'always'
 Oboe::Config[:sample_rate] = 1e6
     
-class RackTestApp < MiniTest::Unit::TestCase
+class RackTestApp < Minitest::Test
   include Rack::Test::Methods
 
   def app

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.6.2.0
+  version: 2.6.3.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,6 +52,7 @@ files:
 - Appraisals
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -148,7 +149,7 @@ files:
 - test/minitest_helper.rb
 - test/profiling/method_test.rb
 - test/support/config_test.rb
-- test/support/srv1_localset_test.rb
+- test/support/liboboe_settings_test.rb
 - test/support/xtrace_test.rb
 homepage: http://www.appneta.com/products/traceview/
 licenses:
@@ -197,7 +198,7 @@ test_files:
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/memcached_test.rb
 - test/profiling/method_test.rb
-- test/support/srv1_localset_test.rb
+- test/support/liboboe_settings_test.rb
 - test/support/config_test.rb
 - test/support/xtrace_test.rb
 has_rdoc: