traceview 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3029be0337827c7de7eca2889e8f3aa3732dcbc
-  data.tar.gz: c0ba1fa22930d6dfa53c26e8353060dbcaa766a2
+  metadata.gz: 1bda294e0067e87b9af61f29fcbcbba2067fd303
+  data.tar.gz: eb61919fb53e67280672a1eb802b4c1ecf755b02
 SHA512:
-  metadata.gz: da0fcc463baf1ca59741a56ebd153a79a535715fdc9afae715f0eea852066a5f0f1a724594ecbf962c85500746ac7202bfb60608ee6088aea544b8ac1af31a6b
-  data.tar.gz: d2f690d069e77c88ec1bd9e9beef10eb190607ea6eba3f65485e132b6f0cb4bd61610295e950c9b0af009c060c7dbf85f406cde92cd72b44381aa72a1644004e
+  metadata.gz: 617b228a1328c791c90c69342bb033e45fde13c09a07c882113077251cbc8daaeeda68550aa8be000cf612a230d4e50fc6e603837a733ac1636c0f6b406ed448
+  data.tar.gz: b56c282a787c2e1826d4eb87ba37e2ee62ec1f10bdd880860a08eb49301294d97ef6d36b05932f2b28cf55997b965c4894dbaa537804e2d24831e47ce7a48ebb

data/.travis.yml

@@ -35,14 +35,6 @@ matrix:
     - rvm: 1.8.7
       gemfile: gemfiles/frameworks.gemfile
 
-  allow_failures:
-    - rvm: jruby-9.0.4.0
-      gemfile: gemfiles/rails32.gemfile
-
-    - rvm: jruby-9.0.4.0
-      gemfile: gemfiles/rails42.gemfile
-
-
 # Attempt Travis/Cassandra fix re: https://github.com/travis-ci/travis-ci/issues/1484
 # Updated Cassandra: https://github.com/travis-ci/travis-ci/issues/1650
 before_install:

data/CHANGELOG.md

@@ -4,6 +4,20 @@ https://github.com/appneta/oboe-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# traceview 3.4.1
+
+This patch release includes the following fixes:
+
+* Instrumentation updates to support Grape version 0.14: #153
+* Fix Rack layer AVW header handling and analysis: #154
+* Sidekiq workers are now auto instrumented: #155
+* Fix ActiveRecord reporting invalid SQL Flavor: #156
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/traceview/versions/3.4.1
+https://rubygems.org/gems/traceview/versions/3.4.1-java
+
 # traceview 3.4.0
 
 This minor release includes the following features & fixes:

data/gemfiles/delayed_job.gemfile

@@ -10,18 +10,6 @@ group :development, :test do
   gem 'bson'
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/gemfiles/frameworks.gemfile

@@ -14,26 +14,21 @@ group :development, :test do
   end
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
 else
   gem 'sinatra'
 end
 
-gem "grape", "< 0.14"
-gem "padrino", '< 0.13'
+gem "grape"
+
+if defined?(JRUBY_VERSION)
+  # Limit padrino gem under JRuby as version 0.13.0 throws
+  # a bundler load error
+  gem "padrino", '< 0.13.0'
+else
+  gem 'padrino'
+end
 
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/libraries.gemfile

@@ -24,18 +24,6 @@ group :development, :test do
   end
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
 else

data/gemfiles/rails23.gemfile

@@ -27,18 +27,6 @@ group :development, :test do
   end
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
 else

data/gemfiles/rails30.gemfile

@@ -27,18 +27,6 @@ group :development, :test do
   end
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/gemfiles/rails31.gemfile

@@ -27,18 +27,6 @@ group :development, :test do
   end
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/gemfiles/rails32.gemfile

@@ -27,18 +27,6 @@ group :development, :test do
   end
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/gemfiles/rails40.gemfile

@@ -10,18 +10,6 @@ group :development, :test do
   gem 'bson'
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/gemfiles/rails41.gemfile

@@ -10,18 +10,6 @@ group :development, :test do
   gem 'bson'
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/gemfiles/rails42.gemfile

@@ -10,18 +10,6 @@ group :development, :test do
   gem 'bson'
 end
 
-group :development do
-  gem 'ruby-debug',   :platforms => [ :mri_18, :jruby ]
-  gem 'debugger',     :platform  =>   :mri_19
-  gem 'byebug',       :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  if RUBY_VERSION > '1.8.7'
-    gem 'pry'
-    gem 'pry-byebug', :platforms => [ :mri_20, :mri_21, :mri_22 ]
-  else
-    gem 'pry', '0.9.12.4'
-  end
-end
-
 if defined?(JRUBY_VERSION)
   gem 'sinatra', :require => false
   gem 'activerecord-jdbc-adapter'

data/lib/joboe_metal.rb

@@ -145,9 +145,13 @@ module TraceView
   class << self
     def sample?(opts = {})
       begin
-        return false unless TraceView.always? && TraceView.loaded
+        # Return false if no-op mode
+        return false if !TraceView.loaded
 
-        return true if ENV.key?('TRACEVIEW_GEM_TEST')
+        # Return false if never or through mode without AVW flag
+        return false if TraceView.never? || (TraceView.through? && !opts.key?('X-TV-Meta'))
+
+        return true if ENV.key?('TRACEVIEW_GEM_TEST') && !opts.key?('X-TV-Meta')
 
         # Validation to make Joboe happy.  Assure that we have the KVs and that they
         # are not empty strings.

data/lib/oboe_metal.rb

@@ -98,7 +98,11 @@ module TraceView
   class << self
     def sample?(opts = {})
       begin
-        return false unless TraceView.always? && TraceView.loaded
+        # Return false if no-op mode
+        return false if !TraceView.loaded
+
+        # Return false if never or through mode without AVW flag
+        return false if TraceView.never? || (TraceView.through? && !opts.key?('X-TV-Meta'))
 
         # Assure defaults since SWIG enforces Strings
         layer   = opts[:layer]      ? opts[:layer].to_s.strip      : ''

data/lib/traceview/api/logging.rb

@@ -125,7 +125,12 @@ module TraceView
           # sample rate and sample source
           opts[:SampleRate]        = TraceView.sample_rate
           opts[:SampleSource]      = TraceView.sample_source
-          opts[:TraceOrigin]       = :always_sampled
+
+          if TraceView.through? && opts.key?('X-TV-Meta')
+            opts[:TraceOrigin]       = :avw_sampled
+          else
+            opts[:TraceOrigin]       = :always_sampled
+          end
 
           log_event(layer, 'entry', TraceView::Context.startTrace, opts)
         end

data/lib/traceview/base.rb

@@ -142,7 +142,7 @@ module TraceViewBase
   # DelayedJob or Sidekiq workers.
   #
   def entry_layer?(layer)
-    %w(delayed_job-worker).include?(layer.to_s)
+    %w(delayed_job-worker sidekiq-worker).include?(layer.to_s)
   end
 
   ##

data/lib/traceview/frameworks/grape.rb

@@ -20,12 +20,17 @@ module TraceView
         ::TraceView::Util.method_alias(klass, :run, ::Grape::Endpoint)
       end
 
-      def run_with_traceview(env)
+      def run_with_traceview(*args)
         if TraceView.tracing?
           report_kvs = {}
 
           report_kvs[:Controller] = self.class
-          report_kvs[:Action] = env['PATH_INFO']
+
+          if args.empty?
+            report_kvs[:Action] = env['PATH_INFO']
+          else
+            report_kvs[:Action] = args[0]['PATH_INFO']
+          end
 
           # Fall back to the raw tracing API so we can pass KVs
           # back on exit (a limitation of the TraceView::API.trace
@@ -34,12 +39,12 @@ module TraceView
           ::TraceView::API.log_entry('grape', {})
 
           begin
-            run_without_traceview(env)
+            run_without_traceview(*args)
           ensure
             ::TraceView::API.log_exit('grape', report_kvs)
           end
         else
-          run_without_traceview(env)
+          run_without_traceview(*args)
         end
       end
     end

data/lib/traceview/frameworks/rails/inst/connection_adapters/utils.rb

@@ -25,12 +25,21 @@ module TraceView
             if ::Rails::VERSION::MAJOR == 2
               config = ::Rails.configuration.database_configuration[::Rails.env]
             else
-              config = ::Rails.application.config.database_configuration[::Rails.env]
+              config = ActiveRecord::Base.connection.instance_variable_get(:@config)
             end
 
-            opts[:Database]   = config['database'] if config && config.key?('database')
-            opts[:RemoteHost] = config['host']     if config && config.key?('host')
-            opts[:Flavor]     = config['adapter']  if config && config.key?('adapter')
+            if config
+              opts[:Database]   = config['database'] if config.key?('database')
+              opts[:RemoteHost] = config['host']     if config.key?('host')
+              adapter_name = config[:adapter]
+
+              case adapter_name
+              when /mysql/i
+                opts[:Flavor] = 'mysql'
+              when /postgres/i
+                opts[:Flavor] = 'postgresql'
+              end
+            end
           rescue StandardError => e
             TraceView.logger.debug "Exception raised capturing ActiveRecord KVs: #{e.inspect}"
             TraceView.logger.debug e.backtrace.join('\n')

data/lib/traceview/inst/rack.rb

@@ -27,8 +27,6 @@ module TraceView
           report_kvs['Query-String']     = ::CGI.unescape(req.query_string) unless req.query_string.empty?
         end
 
-        report_kvs['X-TV-Meta']         = env['HTTP_X_TV_META']          if env.key?('HTTP_X_TV_META')
-
         # Report any request queue'ing headers.  Report as 'Request-Start' or the summed Queue-Time
         report_kvs['Request-Start']     = env['HTTP_X_REQUEST_START']    if env.key?('HTTP_X_REQUEST_START')
         report_kvs['Request-Start']     = env['HTTP_X_QUEUE_START']      if env.key?('HTTP_X_QUEUE_START')
@@ -73,6 +71,9 @@ module TraceView
         report_kvs[:URL] = ::CGI.unescape(req.path)
       end
 
+      # Detect and log AVW headers for sampling analysis
+      report_kvs['X-TV-Meta'] = env['HTTP_X_TV_META'] if env.key?('HTTP_X_TV_META')
+
       # Check for and validate X-Trace request header to pick up tracing context
       xtrace = env.is_a?(Hash) ? env['HTTP_X_TRACE'] : nil
       xtrace_header = xtrace if xtrace && TraceView::XTrace.valid?(xtrace)

data/lib/traceview/version.rb

@@ -8,7 +8,7 @@ module TraceView
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/test/frameworks/apps/padrino_simple.rb

@@ -9,7 +9,7 @@ PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
 
 class SimpleDemo < Padrino::Application
   set :public_folder, File.dirname(__FILE__)
-  set :reload, true
+  set :reload, false
   before { true }
   after  { true }
   error(404) { "404" }

data/test/frameworks/rails3x_test.rb

@@ -5,7 +5,7 @@ require "minitest_helper"
 
 if defined?(::Rails)
 
-  describe "Rails" do
+  describe "Rails3x" do
     before do
       clear_all_traces
     end
@@ -97,5 +97,45 @@ if defined?(::Rails)
       r.header.key?('X-Trace').must_equal true
       r.header['X-Trace'].must_equal traces[4]['X-Trace']
     end
+
+    it "should trace rails db calls" do
+      # Skip for JRuby since the java instrumentation
+      # handles DB instrumentation for JRuby
+      skip if defined?(JRUBY_VERSION)
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/db')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 12
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[4]['Layer'].must_equal "activerecord"
+      traces[4]['Label'].must_equal "entry"
+      traces[4]['Flavor'].must_equal "postgresql"
+      traces[4]['Query'].must_equal "SELECT \"widgets\".* FROM \"widgets\" "
+      traces[4]['Name'].must_equal "Widget Load"
+      traces[4].key?('Backtrace').must_equal true
+
+      traces[5]['Layer'].must_equal "activerecord"
+      traces[5]['Label'].must_equal "exit"
+
+      traces[6]['Layer'].must_equal "activerecord"
+      traces[6]['Label'].must_equal "entry"
+      traces[6]['Flavor'].must_equal "postgresql"
+      traces[6]['Query'].must_equal "INSERT INTO \"widgets\" (\"created_at\", \"description\", \"name\", \"updated_at\") VALUES ($1, $2, $3, $4) RETURNING \"id\""
+      traces[6]['Name'].must_equal "SQL"
+      traces[6].key?('Backtrace').must_equal true
+      traces[6].key?('QueryArgs').must_equal true
+
+      traces[7]['Layer'].must_equal "activerecord"
+      traces[7]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r.header.key?('X-Trace').must_equal true
+      r.header['X-Trace'].must_equal traces[11]['X-Trace']
+    end
   end
 end

data/test/frameworks/rails4x_test.rb

@@ -5,7 +5,7 @@ require "minitest_helper"
 
 if defined?(::Rails)
 
-  describe "Rails" do
+  describe "Rails4x" do
     before do
       clear_all_traces
     end
@@ -55,6 +55,46 @@ if defined?(::Rails)
       r.header['X-Trace'].must_equal traces[6]['X-Trace']
     end
 
+    it "should trace rails db calls" do
+      # Skip for JRuby since the java instrumentation
+      # handles DB instrumentation for JRuby
+      skip if defined?(JRUBY_VERSION)
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/db')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 11
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[3]['Layer'].must_equal "activerecord"
+      traces[3]['Label'].must_equal "entry"
+      traces[3]['Flavor'].must_equal "postgresql"
+      traces[3]['Query'].must_equal "SELECT  \"widgets\".* FROM \"widgets\"  ORDER BY \"widgets\".\"id\" ASC LIMIT 1"
+      traces[3]['Name'].must_equal "Widget Load"
+      traces[3].key?('Backtrace').must_equal true
+
+      traces[4]['Layer'].must_equal "activerecord"
+      traces[4]['Label'].must_equal "exit"
+
+      traces[5]['Layer'].must_equal "activerecord"
+      traces[5]['Label'].must_equal "entry"
+      traces[5]['Flavor'].must_equal "postgresql"
+      traces[5]['Query'].must_equal "INSERT INTO \"widgets\" (\"name\", \"description\", \"created_at\", \"updated_at\") VALUES ($1, $2, $3, $4) RETURNING \"id\""
+      traces[5]['Name'].must_equal "SQL"
+      traces[5].key?('Backtrace').must_equal true
+      traces[5].key?('QueryArgs').must_equal true
+
+      traces[6]['Layer'].must_equal "activerecord"
+      traces[6]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r.header.key?('X-Trace').must_equal true
+      r.header['X-Trace'].must_equal traces[10]['X-Trace']
+    end
+
     it "should trace a request to a rails metal stack" do
 
       uri = URI.parse('http://127.0.0.1:8140/hello/metal')

data/test/models/widget.rb

@@ -1,19 +1,24 @@
-class Widget < ActiveRecord::Base
-  def do_work(*args)
-    Widget.first
-  end
+# Somehow the Padrino::Reloader v14 is detecting and loading
+# this file when it shouldn't.  Block it from loading for
+# Padrino for now.
+unless defined?(Padrino)
+  class Widget < ActiveRecord::Base
+    def do_work(*args)
+      Widget.first
+    end
 
-  def do_error(*args)
-    raise "FakeTestError"
+    def do_error(*args)
+      raise "FakeTestError"
+    end
   end
-end
 
-class CreateWidgets < ActiveRecord::Migration
-  def change
-    create_table :widgets do |t|
-      t.string :name
-      t.text :description
-      t.timestamps
+  class CreateWidgets < ActiveRecord::Migration
+    def change
+      create_table :widgets do |t|
+        t.string :name
+        t.text :description
+        t.timestamps
+      end
     end
   end
 end

data/test/servers/rails3x_8140.rb

@@ -39,6 +39,7 @@ class Rails32MetalStack < Rails::Application
   routes.append do
     get "/hello/world" => "hello#world"
     get "/hello/metal" => "ferro#world"
+    get "/hello/db"    => "hello#db"
   end
 
   # Enable cache classes. Production style.
@@ -72,6 +73,13 @@ class HelloController < ActionController::Base
   def world
     render :text => "Hello world!"
   end
+
+  def db
+    Widget.all.first
+    w = Widget.new(:name => 'blah', :description => 'This is an amazing widget.')
+    w.save
+    render :text => "Hello database!"
+  end
 end
 
 class FerroController < ActionController::Metal

data/test/servers/rails4x_8140.rb

@@ -40,6 +40,7 @@ class Rails40MetalStack < Rails::Application
   routes.append do
     get "/hello/world" => "hello#world"
     get "/hello/metal" => "ferro#world"
+    get "/hello/db"    => "hello#db"
   end
 
   # Enable cache classes. Production style.
@@ -73,6 +74,13 @@ class HelloController < ActionController::Base
   def world
     render :text => "Hello world!"
   end
+
+  def db
+    Widget.all.first
+    w = Widget.new(:name => 'blah', :description => 'This is an amazing widget.')
+    w.save
+    render :text => "Hello database!"
+  end
 end
 
 class FerroController < ActionController::Metal

data/test/support/{auto_tracing.rb → auto_tracing_test.rb}

@@ -14,6 +14,7 @@ class AutoTraceTest  < Minitest::Test
 
   def test_entry_layers
     TraceView.entry_layer?('delayed_job-worker').must_equal true
+    TraceView.entry_layer?('sidekiq-worker').must_equal true
     TraceView.entry_layer?('asdf-worker').must_equal false
   end
 
@@ -22,7 +23,7 @@ class AutoTraceTest  < Minitest::Test
     TraceView.entry_layer?(:asdfworker).must_equal false
   end
 
-  def test_trace_when_default_tm
+  def test_trace_when_default_tm_dj
     TraceView::Config[:tracing_mode] = :through
 
     TV::API.start_trace('delayed_job-worker') do
@@ -30,11 +31,23 @@ class AutoTraceTest  < Minitest::Test
     end
   end
 
+  def test_trace_when_default_tm_sidekiq
+    TraceView::Config[:tracing_mode] = :through
+
+    TV::API.start_trace('sidekiq-worker') do
+      TraceView.tracing?.must_equal true
+    end
+  end
+
   def test_dont_trace_when_never
     TraceView::Config[:tracing_mode] = :never
 
     TV::API.start_trace('delayed_job-worker') do
       TraceView.tracing?.must_equal false
     end
+
+    TV::API.start_trace('asdf') do
+      TraceView.tracing?.must_equal false
+    end
   end
 end

data/test/support/avw_handling_test.rb

@@ -0,0 +1,76 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+require 'rack/test'
+require 'rack/lobster'
+require 'traceview/inst/rack'
+
+class AVWTraceTest  < Minitest::Test
+  include Rack::Test::Methods
+
+  def app
+    @app = Rack::Builder.new {
+      use Rack::CommonLogger
+      use Rack::ShowExceptions
+      use TraceView::Rack
+      map "/lobster" do
+        use Rack::Lint
+        run Rack::Lobster.new
+      end
+    }
+  end
+
+  def setup
+    clear_all_traces
+    @tm = TraceView::Config[:tracing_mode]
+  end
+
+  def teardown
+    TraceView::Config[:tracing_mode] = @tm
+  end
+
+  def test_avw_collection_with_through
+    # Skip under JRuby/Joboe for now. Due to Java instrumentation
+    # variation that is being investigated in TVI-2348
+    skip if defined?(JRUBY_VERSION)
+
+    TV::Config[:tracing_mode] = :through
+    header('X-TV-Meta', 'abcdefghijklmnopqrstuvwxyz')
+
+    get "/lobster"
+
+    traces = get_all_traces
+
+    traces.count.must_equal 3
+    traces[0]['TraceOrigin'].must_equal "avw_sampled"
+    validate_outer_layers(traces, 'rack')
+  end
+
+  def test_avw_collection_with_always
+    # Skip under JRuby/Joboe for now. Due to Java instrumentation
+    # variation that is being investigated in TVI-2348
+    skip if defined?(JRUBY_VERSION)
+
+    TV::Config[:tracing_mode] = :always
+    header('X-TV-Meta', 'abcdefghijklmnopqrstuvwxyz')
+
+    get "/lobster"
+
+    traces = get_all_traces
+
+    traces.count.must_equal 3
+    traces[0]['TraceOrigin'].must_equal "always_sampled"
+    validate_outer_layers(traces, 'rack')
+  end
+
+  def test_avw_collection_with_never
+    TV::Config[:tracing_mode] = :never
+    header('X-TV-Meta', 'abcdefghijklmnopqrstuvwxyz')
+
+    get "/lobster"
+
+    traces = get_all_traces
+    traces.count.must_equal 0
+  end
+end

data/traceview.gemspec

@@ -23,7 +23,22 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('json', '>= 0')
   s.add_runtime_dependency('bson', '< 4.0')
-  s.add_development_dependency('rake', '>= 0')
+
+  # Development dependencies used in gem development & testing
+  s.add_development_dependency('rake', '>= 0.9.0')
+
+  case RUBY_VERSION
+  when /^1\.8/
+    s.add_development_dependency('ruby-debug', '>= 0.10.1')
+    s.add_development_dependency('pry', '>= 0.9.12.4')
+  when /^1\.9/
+    s.add_development_dependency('debugger', '>= 1.6.7')
+    s.add_development_dependency('pry', '>= 0.10.0')
+  when /^2\./
+    s.add_development_dependency('byebug', '>= 8.0.0')
+    s.add_development_dependency('pry', '>= 0.10.0')
+    s.add_development_dependency('pry-byebug', '>= 3.0.0')
+  end
 
   s.required_ruby_version = '>= 1.8.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -45,14 +45,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.0.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: The TraceView gem provides performance instrumentation for MRI Ruby,
   JRuby and related frameworks.
 email: traceviewsupport@appneta.com
@@ -229,7 +271,8 @@ files:
 - test/servers/sidekiq.rb
 - test/servers/sidekiq.yml
 - test/servers/sidekiq_initializer.rb
-- test/support/auto_tracing.rb
+- test/support/auto_tracing_test.rb
+- test/support/avw_handling_test.rb
 - test/support/backcompat_test.rb
 - test/support/config_test.rb
 - test/support/dnt_test.rb
@@ -259,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for Ruby
@@ -315,13 +358,14 @@ test_files:
 - test/queues/delayed_job-client_test.rb
 - test/support/config_test.rb
 - test/support/noop_test.rb
-- test/support/auto_tracing.rb
 - test/support/dnt_test.rb
 - test/support/sql_sanitize_test.rb
+- test/support/avw_handling_test.rb
 - test/support/tvalias_test.rb
 - test/support/liboboe_settings_test.rb
 - test/support/backcompat_test.rb
 - test/support/xtrace_test.rb
+- test/support/auto_tracing_test.rb
 - test/minitest_helper.rb
 - test/jobs/sidekiq/remote_call_worker_job.rb
 - test/jobs/sidekiq/error_worker_job.rb