oboe 2.7.9.6-java → 2.7.10.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ed9e41f9666afe02baa1c1052e552478ebc7b69
-  data.tar.gz: d48538a8be6ce71406a22c9cf749342c68d3e9d3
+  metadata.gz: 1fcc957b05aaa4db312a9c3489c0afa9db8e7abc
+  data.tar.gz: 66c1e08d4e7a5347e639d5331fe18befd3ea65df
 SHA512:
-  metadata.gz: 42b5479c04c6c057f3f670b1419ca6ca93b2f2d8af9d8ff81fac0fb5082b6e48090c175579c136c09e4fef581fdae8249d61187a2a74b44b7433337fcf4778c8
-  data.tar.gz: 5d0dc460872f60977390181bba08a242fcf71d4ed1d25e17fb13dfd509330605732652bd5ceaef7565183ca0595e434d881d5e704b972a8edf8b3cfd933ff59b
+  metadata.gz: 05e988b3c4820b76ac96cbaecda16b08d443449c444b8c083545f4b8fc5d27d3c35439eb2c9e56ac09d5970ed7652e0c7f7a4f71fb92e480ede3ecf12eb3e9cc
+  data.tar.gz: ca9686165ac5240eac0c4d706a73f16317362682c4a00e4108dc133c21fc24848373bfa152b1ecb7bd5ec8356215599070b6520f10cadbe274032c9fc6649261

data/.travis.yml

@@ -6,6 +6,7 @@ cache:
   - vendor/bundle
 
 rvm:
+  - 2.2.0
   - 2.1.1
   - 2.0.0
   - 1.9.3

data/lib/oboe/config.rb

@@ -71,6 +71,34 @@ module Oboe
       # avoid collecting and reporting query literals to TraceView.
       @@config[:sanitize_sql] = false
 
+      # Do Not Trace
+      # These two values allow you to configure specific URL patterns to
+      # never be traced.  By default, this is set to common static file
+      # extensions but you may want to customize this list for your needs.
+      #
+      # dnt_regexp and dnt_opts is passed to Regexp.new to create
+      # a regular expression object.  That is then used to match against
+      # the incoming request path.
+      #
+      # The path string originates from the rack layer and is retrieved
+      # as follows:
+      #
+      #   req = ::Rack::Request.new(env)
+      #   path = URI.unescape(req.path)
+      #
+      # Usage:
+      #   Oboe::Config[:dnt_regexp] = "lobster$"
+      #   Oboe::Config[:dnt_opts]   = Regexp::IGNORECASE
+      #
+      # This will ignore all requests that end with the string lobster
+      # regardless of case
+      #
+      # Requests with positive matches (non nil) will not be traced.
+      # See lib/oboe/util.rb: Oboe::Util.static_asset?
+      #
+      @@config[:dnt_regexp] = "\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf|ttf|woff|svg|less)$"
+      @@config[:dnt_opts]   = Regexp::IGNORECASE
+
       if ENV.key?('OPENSHIFT_TRACEVIEW_TLYZER_IP')
         # We're running on OpenShift
         @@config[:tracing_mode] = 'always'

data/lib/oboe/util.rb

@@ -103,7 +103,7 @@ module Oboe
       # solely on filename)
       #
       def static_asset?(path)
-        (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)
+        (path =~ Regexp.new(Oboe::Config[:dnt_regexp], Oboe::Config[:dnt_opts]))
       end
 
       ##

data/lib/oboe/version.rb

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

data/test/support/config_test.rb

@@ -59,6 +59,8 @@ describe Oboe::Config do
 
     Oboe::Config[:resque][:link_workers].must_equal false
     Oboe::Config[:blacklist].is_a?(Array).must_equal true
-  end
 
+    Oboe::Config[:dnt_regexp].must_equal "\.(jpg|jpeg|gif|png|ico|css|zip|tgz|gz|rar|bz2|pdf|txt|tar|wav|bmp|rtf|js|flv|swf|ttf|woff|svg|less)$"
+    Oboe::Config[:dnt_opts].must_equal Regexp::IGNORECASE
+  end
 end

data/test/support/dnt_test.rb

@@ -0,0 +1,73 @@
+require 'minitest_helper'
+require 'rack/test'
+require 'rack/lobster'
+require 'oboe/inst/rack'
+
+class RackTestApp < Minitest::Test
+  include Rack::Test::Methods
+
+  def app
+    @app = Rack::Builder.new {
+      use Rack::CommonLogger
+      use Rack::ShowExceptions
+      use Oboe::Rack
+      map "/lobster" do
+        use Rack::Lint
+        run Rack::Lobster.new
+      end
+    }
+  end
+
+  def test_custom_do_not_trace
+    clear_all_traces
+
+    dnt_original = Oboe::Config[:dnt_regexp]
+    Oboe::Config[:dnt_regexp] = "lobster$"
+
+    get "/lobster"
+
+    traces = get_all_traces
+    assert traces.empty?
+
+    Oboe::Config[:dnt_regexp] = dnt_original
+  end
+
+  def test_do_not_trace_static_assets
+    clear_all_traces
+
+    get "/assets/static_asset.png"
+
+    traces = get_all_traces
+    assert traces.empty?
+
+    assert last_response.status == 404
+  end
+
+  def test_complex_do_not_trace
+    skip "not supported" if RUBY_VERSION < '1.9'
+
+    clear_all_traces
+
+    dnt_original = Oboe::Config[:dnt_regexp]
+
+    # Do not trace .js files _except for_ show.js
+    Oboe::Config[:dnt_regexp] = "(\.js$)(?<!show.js)"
+
+    # First: We shouldn't trace general .js files
+    get "/javascripts/application.js"
+
+    traces = get_all_traces
+    assert traces.empty?
+
+    # Second: We should trace show.js
+    clear_all_traces
+
+    get "/javascripts/show.js"
+
+    traces = get_all_traces
+    assert !traces.empty?
+
+    Oboe::Config[:dnt_regexp] = dnt_original
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oboe
 version: !ruby/object:Gem::Version
-  version: 2.7.9.6
+  version: 2.7.10.1
 platform: java
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -158,6 +158,7 @@ files:
 - test/minitest_helper.rb
 - test/profiling/method_test.rb
 - test/support/config_test.rb
+- test/support/dnt_test.rb
 - test/support/liboboe_settings_test.rb
 - test/support/xtrace_test.rb
 homepage: http://www.appneta.com/products/traceview/
@@ -218,3 +219,4 @@ test_files:
 - test/support/liboboe_settings_test.rb
 - test/support/config_test.rb
 - test/support/xtrace_test.rb
+- test/support/dnt_test.rb