traceview 3.3.1 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2412fa020c6024d7fc8b193b80f5d6f6f1fd19d8
-  data.tar.gz: 474664b165f3982c5e9dc37b5b42eb72ba290276
+  metadata.gz: 730a56babc918a4dcc1b47caff72d4f5be3f9b8f
+  data.tar.gz: 86356f63bb250a19dd1dcb1b61691770166c68af
 SHA512:
-  metadata.gz: 81ea925e87f846f88c942eed0b9003f29a4e24ffdf0b110e75e7d7217673a3aa7cad473685d019b47fa109d90cd1ad52e583ac44d21b4421086f86b807c8963e
-  data.tar.gz: 61970fc5980437ce975e99fb7ca8b66967d032692718b0bc3ac8cd6079e7dee144de78bd29377ec27a7a02bd91b0266b6302b5b7ef0ca444ecc6c02c8c560b0e
+  metadata.gz: 22f6ca27664ae20d8216bf8fe388c80c9da58fab2953313970b9a5beb08b4b7d8943db8a4fc2173d1c991b6764c691fd55e2fb7d5091cbbcb078dbdc58545c27
+  data.tar.gz: 0eb31e31b5f991e846f5795c0a65ccb46788099a9562a3b1fdf922005ba54d24054f5664e40a43b73f2903d34f4ca92aefae7fc5f55ba8dd137aa5a0e1474218

data/.travis.yml

@@ -7,12 +7,9 @@ cache:
 
 rvm:
   - 2.2.3
-  - 2.1.7
-  - 2.0.0
   - 1.9.3
   - 1.8.7
-  - ree
-  - jruby-19mode
+  - jruby-9.0.0.0
 
 gemfile:
   - gemfiles/libraries.gemfile

data/CHANGELOG.md

@@ -4,6 +4,21 @@ https://github.com/appneta/oboe-ruby/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
+# traceview 3.3.3
+
+This patch release includes the following fixes:
+
+* Sidekiq instrumentation: don't carry context between enqueue and job run: #150
+* Sidekiq instrumentation: Update KV reporting to follow TV specs: #150
+* Resque instrumentation: Update instrumentation to follow TV specs: #146
+* Resque instrumentation: `:link_workers` option deprecated: #146
+* [JRuby 9000](http://jruby.org/) validated: Add JRuby 9000 to test suite: #149
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/traceview/versions/3.3.2
+https://rubygems.org/gems/traceview/versions/3.3.2-java
+
 # traceview 3.3.1
 
 This patch release includes the following fixes:

data/Rakefile

@@ -124,4 +124,12 @@ task :console do
   Pry.start
 end
 
-
+# Used when testing Resque locally
+task "resque:setup" do
+  require 'resque/tasks'
+  require 'traceview/test'
+  ENV['TRACEVIEW_GEM_VERBOSE'] = 'true'
+  Bundler.require(:default, :development)
+  TraceView::Config[:tracing_mode] = :always
+  TV::Test.load_extras
+end

data/gemfiles/libraries.gemfile

@@ -52,11 +52,12 @@ gem 'httpclient'
 gem 'memcache-client'
 gem 'mongo'
 gem 'redis'
-gem 'resque'
+gem 'resque' unless defined?(JRUBY_VERSION) && RUBY_VERSION > '1.9.3'
 gem 'sequel'
 gem "sidekiq" if RUBY_VERSION >= '2.0'
 gem 'typhoeus'
 
+
 # Database adapter gems needed by sequel
 if defined?(JRUBY_VERSION)
   gem 'jdbc-postgresql'

data/lib/traceview/config.rb

@@ -14,8 +14,8 @@ module TraceView
     @@instrumentation = [:action_controller, :action_view, :active_record,
                          :cassandra, :curb, :dalli, :em_http_request, :excon, :faraday,
                          :grape, :httpclient, :nethttp, :memcached, :memcache, :mongo,
-                         :moped, :rack, :redis, :resque, :rest_client, :sequel, :sidekiqclient,
-                         :sidekiqworker, :typhoeus]
+                         :moped, :rack, :redis, :resqueclient, :resqueworker,
+                         :rest_client, :sequel, :sidekiqclient, :sidekiqworker, :typhoeus]
 
     # Subgrouping of instrumentation
     @@http_clients = [:curb, :excon, :em_http_request, :faraday, :httpclient, :nethttp, :rest_client, :typhoeus]
@@ -57,21 +57,16 @@ module TraceView
       TraceView::Config[:moped][:collect_backtraces] = true
       TraceView::Config[:nethttp][:collect_backtraces] = true
       TraceView::Config[:redis][:collect_backtraces] = false
-      TraceView::Config[:resque][:collect_backtraces] = true
+      TraceView::Config[:resqueclient][:collect_backtraces] = true
+      TraceView::Config[:resqueworker][:collect_backtraces] = false
       TraceView::Config[:rest_client][:collect_backtraces] = false
       TraceView::Config[:sequel][:collect_backtraces] = true
       TraceView::Config[:sidekiqclient][:collect_backtraces] = false
       TraceView::Config[:sidekiqworker][:collect_backtraces] = false
       TraceView::Config[:typhoeus][:collect_backtraces] = false
 
-      # Special instrument specific flags
-      #
-      # :link_workers - associates enqueue operations with the jobs they queue by piggybacking
-      #                 an additional argument that is stripped prior to job proecessing
-      #                 !!Note: Make sure both the queue side and the Resque workers are instrumented
-      #                 or jobs will fail
-      #                 (Default: false)
-      @@config[:resque][:link_workers] = false
+      # Legacy Resque config support.  To be removed in a future version
+      @@config[:resque] = {}
 
       # Setup an empty host blacklist (see: TraceView::API::Util.blacklisted?)
       @@config[:blacklist] = []
@@ -192,6 +187,11 @@ module TraceView
     end
 
     def self.[](key)
+      if key == :resque
+        TraceView.logger.warn "[traceview/warn] :resque config is deprecated.  It is now split into :resqueclient and :resqueworker."
+        TraceView.logger.warn "[traceview/warn] Called from #{Kernel.caller[0]}"
+      end
+
       @@config[key.to_sym]
     end
 
@@ -219,6 +219,10 @@ module TraceView
       elsif key == :action_blacklist
         TraceView.logger.warn "[traceview/unsupported] :action_blacklist has been deprecated and no longer functions."
 
+      elsif key == :resque
+        TraceView.logger.warn "[traceview/warn] :resque config is deprecated.  It is now split into :resqueclient and :resqueworker."
+        TraceView.logger.warn "[traceview/warn] Called from #{Kernel.caller[0]}"
+
       elsif key == :include_url_query_params
         # Obey the global flag and update all of the per instrumentation
         # <tt>:log_args</tt> values.

data/lib/traceview/inst/resque.rb

@@ -6,19 +6,23 @@ require 'json'
 
 module TraceView
   module Inst
-    module Resque
-      def self.included(base)
-        base.send :extend, ::Resque
+    module ResqueClient
+      def self.included(klass)
+        klass.send :extend, ::Resque
+        ::TraceView::Util.method_alias(klass, :enqueue, ::Resque)
+        ::TraceView::Util.method_alias(klass, :enqueue_to, ::Resque)
+        ::TraceView::Util.method_alias(klass, :dequeue, ::Resque)
       end
 
       def extract_trace_details(op, klass, args)
         report_kvs = {}
 
         begin
-          report_kvs[:Op] = op.to_s
-          report_kvs[:Class] = klass.to_s if klass
+          report_kvs[:Spec] = :pushq
+          report_kvs[:Flavor] = :resque
+          report_kvs[:JobName] = klass.to_s
 
-          if TraceView::Config[:resque][:log_args]
+          if TraceView::Config[:resqueclient][:log_args]
             kv_args = args.to_json
 
             # Limit the argument json string to 1024 bytes
@@ -29,8 +33,10 @@ module TraceView
             end
           end
 
-          report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:resque][:collect_backtraces]
-        rescue
+          report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:resqueclient][:collect_backtraces]
+          report_kvs[:Queue] = klass.instance_variable_get(:@queue)
+        rescue => e
+          TraceView.logger.debug "[traceview/resque] Error collecting resqueclient KVs: #{e.message}"
         end
 
         report_kvs
@@ -41,7 +47,6 @@ module TraceView
           report_kvs = extract_trace_details(:enqueue, klass, args)
 
           TraceView::API.trace('resque-client', report_kvs, :enqueue) do
-            args.push(:parent_trace_id => TraceView::Context.toString) if TraceView::Config[:resque][:link_workers]
             enqueue_without_traceview(klass, *args)
           end
         else
@@ -55,7 +60,6 @@ module TraceView
           report_kvs[:Queue] = queue.to_s if queue
 
           TraceView::API.trace('resque-client', report_kvs) do
-            args.push(:parent_trace_id => TraceView::Context.toString) if TraceView::Config[:resque][:link_workers]
             enqueue_to_without_traceview(queue, klass, *args)
           end
         else
@@ -77,26 +81,28 @@ module TraceView
     end
 
     module ResqueWorker
+      def self.included(klass)
+        ::TraceView::Util.method_alias(klass, :perform, ::Resque::Worker)
+      end
+
       def perform_with_traceview(job)
         report_kvs = {}
-        last_arg = nil
 
         begin
-          report_kvs[:Op] = :perform
+          report_kvs[:Spec] = :job
+          report_kvs[:Flavor] = :resque
+          report_kvs[:JobName] = job.payload['class'].to_s
+          report_kvs[:Queue] = job.queue
 
           # Set these keys for the ability to separate out
           # background tasks into a separate app on the server-side UI
-          report_kvs[:Controller] = :Resque
-          report_kvs[:Action] = :perform
 
           report_kvs['HTTP-Host'] = Socket.gethostname
-          report_kvs[:URL] = '/resque/' + job.queue
-          report_kvs[:Method] = 'NONE'
-          report_kvs[:Queue] = job.queue
-
-          report_kvs[:Class] = job.payload['class']
+          report_kvs[:Controller] = "Resque_#{job.queue}"
+          report_kvs[:Action] = job.payload['class'].to_s
+          report_kvs[:URL] = "/resque/#{job.queue}/#{job.payload['class']}"
 
-          if TraceView::Config[:resque][:log_args]
+          if TraceView::Config[:resqueworker][:log_args]
             kv_args = job.payload['args'].to_json
 
             # Limit the argument json string to 1024 bytes
@@ -107,35 +113,21 @@ module TraceView
             end
           end
 
-          last_arg = job.payload['args'].last
+          report_kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:resqueworker][:collect_backtraces]
         rescue
         end
 
-        if last_arg.is_a?(Hash) && last_arg.key?('parent_trace_id')
-          begin
-            # Since the enqueue was traced, we force trace the actual job execution and reference
-            # the enqueue trace with ParentTraceID
-            report_kvs[:ParentTraceID] = last_arg['parent_trace_id']
-            job.payload['args'].pop
-
-          rescue
-          end
-
-          # Force this trace regardless of sampling rate so that child trace can be
-          # link to parent trace.
-          TraceView::API.start_trace('resque-worker', nil, report_kvs.merge('Force' => true)) do
-            perform_without_traceview(job)
-          end
-
-        else
-          TraceView::API.start_trace('resque-worker', nil, report_kvs) do
-            perform_without_traceview(job)
-          end
+        TraceView::API.start_trace('resque-worker', nil, report_kvs) do
+          perform_without_traceview(job)
         end
       end
     end
 
     module ResqueJob
+      def self.included(klass)
+        ::TraceView::Util.method_alias(klass, :fail, ::Resque::Job)
+      end
+
       def fail_with_traceview(exception)
         if TraceView.tracing?
           TraceView::API.log_exception('resque', exception)
@@ -146,47 +138,12 @@ module TraceView
   end
 end
 
-if defined?(::Resque)
+if defined?(::Resque) && RUBY_VERSION >= '1.9.3'
   TraceView.logger.info '[traceview/loading] Instrumenting resque' if TraceView::Config[:verbose]
 
-  ::Resque.module_eval do
-    include TraceView::Inst::Resque
-
-    [:enqueue, :enqueue_to, :dequeue].each do |m|
-      if method_defined?(m)
-        module_eval "alias #{m}_without_traceview #{m}"
-        module_eval "alias #{m} #{m}_with_traceview"
-      elsif TraceView::Config[:verbose]
-        TraceView.logger.warn "[traceview/loading] Couldn't properly instrument Resque (#{m}).  Partial traces may occur."
-      end
-    end
-  end
-
-  if defined?(::Resque::Worker)
-    ::Resque::Worker.class_eval do
-      include TraceView::Inst::ResqueWorker
-
-      if method_defined?(:perform)
-        alias perform_without_traceview perform
-        alias perform perform_with_traceview
-      elsif TraceView::Config[:verbose]
-        TraceView.logger.warn '[traceview/loading] Couldn\'t properly instrument ResqueWorker (perform).  Partial traces may occur.'
-      end
-    end
-  end
-
-  if defined?(::Resque::Job)
-    ::Resque::Job.class_eval do
-      include TraceView::Inst::ResqueJob
-
-      if method_defined?(:fail)
-        alias fail_without_traceview fail
-        alias fail fail_with_traceview
-      elsif TraceView::Config[:verbose]
-        TraceView.logger.warn '[traceview/loading] Couldn\'t properly instrument ResqueWorker (fail).  Partial traces may occur.'
-      end
-    end
-  end
+  ::TraceView::Util.send_include(::Resque,         ::TraceView::Inst::ResqueClient)
+  ::TraceView::Util.send_include(::Resque::Worker, ::TraceView::Inst::ResqueWorker)
+  ::TraceView::Util.send_include(::Resque::Job,    ::TraceView::Inst::ResqueJob)
 end
 
 

data/lib/traceview/inst/sidekiq-client.rb

@@ -24,16 +24,14 @@ module TraceView
 
     def call(*args)
       # args: 0: worker_class, 1: msg, 2: queue, 3: redis_pool
-
-      result = nil
       report_kvs = collect_kvs(args)
 
       TraceView::API.log_entry('sidekiq-client', report_kvs)
-      args[1]['X-Trace'] = TraceView::Context.toString if TraceView.tracing?
+      args[1]['SourceTrace'] = TraceView::Context.toString if TraceView.tracing?
 
       result = yield
 
-      report_kvs = { :JobID => result["jid"] }
+      report_kvs = { :JobID => result['jid'] }
       result
     rescue => e
       TraceView::API.log_exception('sidekiq-client', e, report_kvs)

data/lib/traceview/inst/sidekiq-worker.rb

@@ -8,20 +8,20 @@ module TraceView
         worker, msg, queue = args
 
         # Background Job Spec KVs
-        report_kvs[:Spec] = :job
-        report_kvs[:Flavor]    = :sidekiq
-        report_kvs[:Queue]     = queue
-        report_kvs[:Retry]     = msg['retry']
-        report_kvs[:JobName]   = worker.class.to_s
-        report_kvs[:MsgID]     = msg['jid']
-        report_kvs[:Args]      = msg['args'].to_s[0..1024] if TV::Config[:sidekiqworker][:log_args]
-        report_kvs['Backtrace'] = TV::API.backtrace        if TV::Config[:sidekiqworker][:collect_backtraces]
+        report_kvs[:Spec]       = :job
+        report_kvs[:Flavor]     = :sidekiq
+        report_kvs[:Queue]      = queue
+        report_kvs[:Retry]      = msg['retry']
+        report_kvs[:JobName]    = worker.class.to_s
+        report_kvs[:MsgID]      = msg['jid']
+        report_kvs[:Args]       = msg['args'].to_s[0..1024] if TV::Config[:sidekiqworker][:log_args]
+        report_kvs['Backtrace'] = TV::API.backtrace         if TV::Config[:sidekiqworker][:collect_backtraces]
 
         # Webserver Spec KVs
         report_kvs['HTTP-Host'] = Socket.gethostname
         report_kvs[:Controller] = "Sidekiq_#{queue}"
         report_kvs[:Action] = msg['class']
-        report_kvs[:URL] = "/sidekiq/#{queue}/#{msg['class'].to_s}"
+        report_kvs[:URL] = "/sidekiq/#{queue}/#{msg['class']}"
       rescue => e
         TraceView.logger.warn "[traceview/sidekiq] Non-fatal error capturing KVs: #{e.message}"
       end
@@ -30,17 +30,23 @@ module TraceView
 
     def call(*args)
       # args: 0: worker, 1: msg, 2: queue
-      result = nil
       report_kvs = collect_kvs(args)
 
+      # Something is happening across Celluloid threads where liboboe settings
+      # are being lost.  So we re-set the tracing mode to assure
+      # we sample as desired.  Setting the tracing mode will re-update
+      # the liboboe settings.
+      TraceView::Config[:tracing_mode] = TraceView::Config[:tracing_mode]
+
       # Continue the trace from the enqueue side?
-      incoming_context = nil
-      if args[1].is_a?(Hash) && TraceView::XTrace.valid?(args[1]['X-Trace'])
-        incoming_context = args[1]['X-Trace']
-        report_kvs[:Async] = true
+      if args[1].is_a?(Hash) && TraceView::XTrace.valid?(args[1]['SourceTrace'])
+        report_kvs[:SourceTrace] = args[1]['SourceTrace']
+
+        # Pass the source trace in the TV-Meta flag field to indicate tracing
+        report_kvs['X-TV-Meta'] = args[1]['SourceTrace']
       end
 
-      result = TraceView::API.start_trace('sidekiq-worker', incoming_context, report_kvs) do
+      result = TraceView::API.start_trace('sidekiq-worker', nil, report_kvs) do
         yield
       end
 

data/lib/traceview/test.rb

@@ -8,9 +8,9 @@ module TraceView
         # If we're using the libraries gemfile (with sidekiq and resque)
         if File.basename(ENV['BUNDLE_GEMFILE']) =~ /libraries/
           # Load all of the test workers
-          pattern = File.join(File.dirname(__FILE__), '../../test/jobs/', '*.rb')
+          pattern = File.join(File.dirname(__FILE__), '../../test/jobs/**/', '*.rb')
           Dir.glob(pattern) do |f|
-            TV.logger.debug "Loading test job file: #{f}"
+            TV.logger.debug "Loading test job file: #{File.basename(f)}"
             require f
           end
         end

data/lib/traceview/version.rb

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

data/test/instrumentation/delayed_job-client_test.rb

@@ -0,0 +1,128 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+require_relative "../jobs/delayed_job/remote_call_worker_job"
+require_relative "../jobs/delayed_job/db_worker_job"
+require_relative "../jobs/delayed_job/error_worker_job"
+
+class DelayedJobClientTest < Minitest::Test
+  def setup
+    clear_all_traces
+    @collect_backtraces = TraceView::Config[:delayedjobclient][:collect_backtraces]
+    @log_args = TraceView::Config[:delayedjobclient][:log_args]
+  end
+
+  def teardown
+    TraceView::Config[:delayedjobclient][:collect_backtraces] = @collect_backtraces
+    TraceView::Config[:delayedjobclient][:log_args] = @log_args
+  end
+
+  def test_enqueue
+    # Queue up a job to be run
+    jid, _ = ::TraceView::API.start_trace(:enqueue_test) do
+      Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+    end
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 23, traces.count, "Trace count"
+    valid_edges?(traces)
+
+    assert_equal 'sidekiq-client',       traces[1]['Layer']
+    assert_equal 'entry',                traces[1]['Label']
+
+    assert_equal 'msgclient',            traces[1]['Spec']
+    assert_equal 'sidekiq',              traces[1]['Flavor']
+    assert_equal 'critical',             traces[1]['Queue']
+    assert_equal jid,                    traces[1]['MsgID']
+    assert_equal '[1, 2, 3]',            traces[1]['Args']
+    assert_equal "RemoteCallWorkerJob",  traces[1]['JobName']
+    assert_equal 'false',                traces[1]['Retry']
+    assert_equal false,                  traces[1].key?('Backtrace')
+
+    assert_equal 'sidekiq-client',       traces[2]['Layer']
+    assert_equal 'exit',                 traces[2]['Label']
+  end
+
+  def test_collect_backtraces_default_value
+    assert_equal TV::Config[:delayedjobclient][:collect_backtraces], false, "default backtrace collection"
+  end
+
+  def test_log_args_default_value
+    assert_equal TV::Config[:delayedjobclient][:log_args], true, "log_args default "
+  end
+
+  def test_obey_collect_backtraces_when_false
+    TraceView::Config[:delayedjobclient][:collect_backtraces] = false
+
+    # Queue up a job to be run
+    ::TraceView::API.start_trace(:enqueue_test) do
+      Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+    end
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 23, traces.count, "Trace count"
+    valid_edges?(traces)
+    assert_equal 'sidekiq-client',   traces[1]['Layer']
+    assert_equal false,              traces[1].key?('Backtrace')
+  end
+
+  def test_obey_collect_backtraces_when_true
+    TraceView::Config[:delayedjobclient][:collect_backtraces] = true
+
+    # Queue up a job to be run
+    ::TraceView::API.start_trace(:enqueue_test) do
+      Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+    end
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 23, traces.count, "Trace count"
+    valid_edges?(traces)
+    assert_equal 'sidekiq-client',   traces[1]['Layer']
+    assert_equal true,               traces[1].key?('Backtrace')
+  end
+
+  def test_obey_log_args_when_false
+    TraceView::Config[:delayedjobclient][:log_args] = false
+
+    # Queue up a job to be run
+    ::TraceView::API.start_trace(:enqueue_test) do
+      Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+    end
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 23, traces.count, "Trace count"
+    valid_edges?(traces)
+    assert_equal false, traces[1].key?('Args')
+  end
+
+  def test_obey_log_args_when_true
+    TraceView::Config[:delayedjobclient][:log_args] = true
+
+    # Queue up a job to be run
+    ::TraceView::API.start_trace(:enqueue_test) do
+      Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+    end
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 23, traces.count, "Trace count"
+    valid_edges?(traces)
+    assert_equal true,         traces[1].key?('Args')
+    assert_equal '[1, 2, 3]',  traces[1]['Args']
+  end
+end

data/test/instrumentation/delayed_job-worker_test.rb

@@ -0,0 +1,177 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+require_relative "../jobs/delayed_job/remote_call_worker_job"
+require_relative "../jobs/delayed_job/db_worker_job"
+require_relative "../jobs/delayed_job/error_worker_job"
+
+class DelayedJobWorkerTest < Minitest::Test
+  def setup
+    clear_all_traces
+    @collect_backtraces = TraceView::Config[:delayedjobworker][:collect_backtraces]
+    @log_args = TraceView::Config[:delayedjobworker][:log_args]
+  end
+
+  def teardown
+    TraceView::Config[:delayedjobworker][:collect_backtraces] = @collect_backtraces
+    TraceView::Config[:delayedjobworker][:log_args] = @log_args
+  end
+
+  def test_reports_version_init
+    init_kvs = ::TraceView::Util.build_init_report
+    assert init_kvs.key?('Ruby.Sidekiq.Version')
+    assert_equal "Sidekiq-#{::Sidekiq::VERSION}", init_kvs['Ruby.Sidekiq.Version']
+  end
+
+  def test_job_run
+    # Queue up a job to be run
+    jid = Sidekiq::Client.push('queue' => 'critical', 'class' => RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 17, traces.count, "Trace count"
+    validate_outer_layers(traces, "sidekiq-worker")
+    valid_edges?(traces)
+
+    # Validate entry layer KVs
+    assert_equal 'always_sampled', traces[0]['TraceOrigin'],       "is always_sampled"
+    assert_equal true,             traces[0].key?('SampleRate'),   "has SampleRate KV"
+    assert_equal true,             traces[0].key?('SampleSource'), "has SampleSource KV"
+
+    # Validate Webserver Spec KVs
+    assert_equal Socket.gethostname,    traces[0]['HTTP-Host']
+    assert_equal "Sidekiq_critical",    traces[0]['Controller']
+    assert_equal "RemoteCallWorkerJob", traces[0]['Action']
+    assert_equal "/sidekiq/critical/RemoteCallWorkerJob", traces[0]['URL']
+
+    # Validate Job Spec KVs
+    assert_equal "job",                 traces[0]['Spec']
+    assert_equal 'sidekiq',             traces[0]['Flavor']
+    assert_equal "RemoteCallWorkerJob", traces[0]['JobName']
+    assert_equal jid,                   traces[0]['MsgID']
+    assert_equal "critical",            traces[0]['Queue']
+    assert_equal "[1, 2, 3]",           traces[0]['Args']
+    assert_equal "false",               traces[0]['Retry']
+
+    assert_equal false,                 traces[0].key?('Backtrace')
+    assert_equal "net-http",            traces[4]['Layer']
+    assert_equal "entry",               traces[4]['Label']
+    assert_equal "memcache",            traces[15]['Layer']
+  end
+
+  def test_jobs_with_errors
+    # Queue up a job to be run
+    jid = Sidekiq::Client.push('queue' => 'critical', 'class' => ErrorWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 3, traces.count, "Trace count"
+    validate_outer_layers(traces, "sidekiq-worker")
+    valid_edges?(traces)
+
+    # Validate Webserver Spec KVs
+    assert_equal Socket.gethostname,                  traces[0]['HTTP-Host']
+    assert_equal "Sidekiq_critical",                  traces[0]['Controller']
+    assert_equal "ErrorWorkerJob",                    traces[0]['Action']
+    assert_equal "/sidekiq/critical/ErrorWorkerJob",  traces[0]['URL']
+
+    # Validate Job Spec KVs
+    assert_equal "job",             traces[0]['Spec']
+    assert_equal 'sidekiq',         traces[0]['Flavor']
+    assert_equal "ErrorWorkerJob",  traces[0]['JobName']
+    assert_equal jid,               traces[0]['MsgID']
+    assert_equal "critical",        traces[0]['Queue']
+    assert_equal "[1, 2, 3]",       traces[0]['Args']
+    assert_equal "false",           traces[0]['Retry']
+
+    assert_equal traces[1]['Layer'], 'sidekiq-worker'
+    assert_equal traces[1]['Label'], 'error'
+    assert_equal traces[1]['ErrorClass'], "RuntimeError"
+    assert traces[1].key?('ErrorMsg')
+    assert traces[1].key?('Backtrace')
+  end
+
+  def test_collect_backtraces_default_value
+    assert_equal TV::Config[:delayedjobworker][:collect_backtraces], false, "default backtrace collection"
+  end
+
+  def test_log_args_default_value
+    assert_equal TV::Config[:delayedjobworker][:log_args], true, "log_args default "
+  end
+
+  def test_obey_collect_backtraces_when_false
+    TraceView::Config[:delayedjobworker][:collect_backtraces] = false
+
+    # Queue up a job to be run
+    Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 17, traces.count, "Trace count"
+    valid_edges?(traces)
+    assert_equal 'sidekiq-worker',   traces[0]['Layer']
+    assert_equal false,              traces[0].key?('Backtrace')
+  end
+
+  def test_obey_collect_backtraces_when_true
+    # FIXME: This can't be tested with the current Sidekiq minitest integration (e.g. already booted
+    # sidekiq in a different process)
+    skip
+
+    TraceView::Config[:delayedjobworker][:collect_backtraces] = true
+
+    # Queue up a job to be run
+    Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 17, traces.count, "Trace count"
+    valid_edges?(traces)
+    assert_equal 'sidekiq-worker',   traces[0]['Layer']
+    assert_equal true,               traces[0].key?('Backtrace')
+  end
+
+  def test_obey_log_args_when_false
+    # FIXME: This can't be tested with the current Sidekiq minitest integration (e.g. already booted
+    # sidekiq in a different process)
+    skip
+
+    TraceView::Config[:delayedjobworker][:log_args] = false
+
+    # Queue up a job to be run
+    Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 17, traces.count, "Trace count"
+    valid_edges?(traces)
+    assert_equal false, traces[0].key?('Args')
+  end
+
+  def test_obey_log_args_when_true
+    TraceView::Config[:delayedjobworker][:log_args] = true
+
+    # Queue up a job to be run
+    Sidekiq::Client.push('queue' => 'critical', 'class' => ::RemoteCallWorkerJob, 'args' => [1, 2, 3], 'retry' => false)
+
+    # Allow the job to be run
+    sleep 5
+
+    traces = get_all_traces
+    assert_equal 17, traces.count, "Trace count"
+    valid_edges?(traces)
+    assert_equal true,         traces[0].key?('Args')
+    assert_equal '[1, 2, 3]',  traces[0]['Args']
+  end
+end

data/test/instrumentation/resque_test.rb

@@ -1,65 +1,185 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
-require 'minitest_helper'
+if RUBY_VERSION >= '1.9.3' && !defined?(JRUBY_VERSION)
+  require 'minitest_helper'
+  require_relative "../jobs/resque/remote_call_worker_job"
+  require_relative "../jobs/resque/error_worker_job"
+
+  class ResqueClientTest < Minitest::Test
+    def setup
+      clear_all_traces
+      @collect_backtraces = TraceView::Config[:resqueclient][:collect_backtraces]
+      @log_args = TraceView::Config[:resqueclient][:log_args]
+    end
 
-describe "Resque" do
-  before do
-    clear_all_traces
+    def teardown
+      TraceView::Config[:resqueclient][:collect_backtraces] = @collect_backtraces
+      TraceView::Config[:resqueclient][:log_args] = @log_args
+    end
 
-    # These are standard entry/exit KVs that are passed up with all moped operations
-    @entry_kvs = {
-      'Layer' => 'resque',
-      'Label' => 'entry' }
+    def test_tv_methods_defined
+      [ :enqueue, :enqueue_to, :dequeue ].each do |m|
+        assert_equal true, ::Resque.method_defined?("#{m}_with_traceview")
+      end
 
-    @exit_kvs = { 'Layer' => 'resque', 'Label' => 'exit' }
-  end
+      assert_equal true, ::Resque::Worker.method_defined?("perform_with_traceview")
+      assert_equal true, ::Resque::Job.method_defined?("fail_with_traceview")
+    end
 
-  it 'Stock Resque should be loaded, defined and ready' do
-    defined?(::Resque).wont_match nil
-    defined?(::Resque::Worker).wont_match nil
-    defined?(::Resque::Job).wont_match nil
-  end
+    def not_tracing_validation
+      assert_equal true, Resque.enqueue(ResqueRemoteCallWorkerJob), "not tracing; enqueue return value"
+      assert_equal true, Resque.enqueue(ResqueRemoteCallWorkerJob, 1, 2, "3"), "not tracing; enqueue extra params"
+    end
+
+    def test_enqueue
+      TraceView::API.start_trace('resque-client_test', '', {}) do
+        Resque.enqueue(ResqueRemoteCallWorkerJob)
+      end
+
+      traces = get_all_traces
 
-  it 'Resque should have traceview methods defined' do
-    [ :enqueue, :enqueue_to, :dequeue ].each do |m|
-      ::Resque.method_defined?("#{m}_with_traceview").must_equal true
+      assert_equal 6, traces.count, "trace count"
+      validate_outer_layers(traces, 'resque-client_test')
+
+      assert_equal "resque-client",              traces[1]['Layer'], "entry event layer name"
+      assert_equal "entry",                      traces[1]['Label'], "entry event label"
+      assert_equal "pushq",                      traces[1]['Spec']
+      assert_equal "resque",                     traces[1]['Flavor']
+      assert_equal "ResqueRemoteCallWorkerJob",  traces[1]['JobName']
+      assert_equal "critical",                   traces[1]['Queue']
+      assert_equal "resque-client",              traces[4]['Layer'], "exit event layer name"
+      assert_equal "exit",                       traces[4]['Label'], "exit event label"
     end
 
-    ::Resque::Worker.method_defined?("perform_with_traceview").must_equal true
-    ::Resque::Job.method_defined?("fail_with_traceview").must_equal true
-  end
+    def test_dequeue
+      TraceView::API.start_trace('resque-client_test', '', {}) do
+        Resque.dequeue(ResqueRemoteCallWorkerJob, { :generate => :moped })
+      end
+
+      traces = get_all_traces
+
+      assert_equal 6, traces.count, "trace count"
+      validate_outer_layers(traces, 'resque-client_test')
 
-  it "should trace enqueue" do
-    skip
-    TraceView::API.start_trace('resque-client_test', '', {}) do
-      Resque.enqueue(TraceViewResqueJob, { :generate => :activerecord, :delay => rand(5..30).to_f })
-      Resque.enqueue(TraceViewResqueJobThatFails)
-      Resque.dequeue(TraceViewResqueJob, { :generate => :moped })
+      assert_equal "resque-client",              traces[1]['Layer'], "entry event layer name"
+      assert_equal "entry",                      traces[1]['Label'], "entry event label"
+      assert_equal "pushq",                      traces[1]['Spec']
+      assert_equal "resque",                     traces[1]['Flavor']
+      assert_equal "ResqueRemoteCallWorkerJob",  traces[1]['JobName']
+      assert_equal "critical",                   traces[1]['Queue']
+      assert_equal "resque-client",              traces[4]['Layer'], "exit event layer name"
+      assert_equal "exit",                        traces[4]['Label'], "exit event label"
     end
 
-    traces = get_all_traces
+    def test_legacy_resque_config
+      assert_equal true, (TraceView::Config[:resque][:enabled] = true), "set legacy resque config options don't die"
+      assert_equal true, (TraceView::Config[:resque][:link_workers] = true), "set legacy resque config options don't die"
+    end
 
-    traces.count.must_equal 4
-    validate_outer_layers(traces, 'resque-client_test')
+    def test_collect_backtraces_default_value
+      assert_equal TV::Config[:resqueclient][:collect_backtraces], true, "default backtrace collection"
+    end
 
-    validate_event_keys(traces[1], @entry_kvs)
-    validate_event_keys(traces[2], @exit_kvs)
-  end
+    def test_log_args_default_value
+      assert_equal TV::Config[:resqueclient][:log_args], true, "log_args default "
+    end
 
-  it "should trace dequeue" do
-    skip
-    TraceView::API.start_trace('resque-client_test', '', {}) do
-      Resque.dequeue(TraceViewResqueJob, { :generate => :moped })
+    def test_obey_collect_backtraces_when_false
+      TraceView::Config[:resqueclient][:collect_backtraces] = false
+
+      # Queue up a job to be run
+      ::TraceView::API.start_trace('resque-client_test') do
+        Resque.enqueue(ResqueRemoteCallWorkerJob, [1, 2, 3])
+      end
+
+      traces = get_all_traces
+      assert_equal 6, traces.count, "trace count"
+      validate_outer_layers(traces, 'resque-client_test')
+
+      assert_equal false,           traces[1].key?('Backtrace')
+
+      assert_equal "resque-client",              traces[1]['Layer'], "entry event layer name"
+      assert_equal "entry",                      traces[1]['Label'], "entry event label"
+      assert_equal "pushq",                      traces[1]['Spec']
+      assert_equal "resque",                     traces[1]['Flavor']
+      assert_equal "ResqueRemoteCallWorkerJob",  traces[1]['JobName']
+      assert_equal "critical",                   traces[1]['Queue']
+      assert_equal "resque-client",              traces[4]['Layer'], "exit event layer name"
+      assert_equal "exit",                       traces[4]['Label'], "exit event label"
+    end
+
+    def test_obey_collect_backtraces_when_true
+      TraceView::Config[:resqueclient][:collect_backtraces] = true
+
+      # Queue up a job to be run
+      ::TraceView::API.start_trace('resque-client_test') do
+        Resque.enqueue(ResqueRemoteCallWorkerJob, [1, 2, 3])
+      end
+
+      traces = get_all_traces
+      assert_equal 6, traces.count, "trace count"
+      validate_outer_layers(traces, 'resque-client_test')
+
+      assert_equal true,           traces[1].key?('Backtrace')
+
+      assert_equal "resque-client",              traces[1]['Layer'], "entry event layer name"
+      assert_equal "entry",                      traces[1]['Label'], "entry event label"
+      assert_equal "pushq",                      traces[1]['Spec']
+      assert_equal "resque",                     traces[1]['Flavor']
+      assert_equal "ResqueRemoteCallWorkerJob",  traces[1]['JobName']
+      assert_equal "critical",                   traces[1]['Queue']
+      assert_equal "resque-client",              traces[4]['Layer'], "exit event layer name"
+      assert_equal "exit",                       traces[4]['Label'], "exit event label"
     end
 
-    traces = get_all_traces
+    def test_obey_log_args_when_false
+      TraceView::Config[:resqueclient][:log_args] = false
+
+      # Queue up a job to be run
+      ::TraceView::API.start_trace('resque-client_test') do
+        Resque.enqueue(ResqueRemoteCallWorkerJob, [1, 2, 3])
+      end
+
+      traces = get_all_traces
+      assert_equal 6, traces.count, "trace count"
+      validate_outer_layers(traces, 'resque-client_test')
 
-    traces.count.must_equal 4
-    validate_outer_layers(traces, 'resque-client_test')
+      assert_equal false,           traces[1].key?('Args')
 
-    validate_event_keys(traces[1], @entry_kvs)
-    validate_event_keys(traces[2], @exit_kvs)
+      assert_equal "resque-client",              traces[1]['Layer'], "entry event layer name"
+      assert_equal "entry",                      traces[1]['Label'], "entry event label"
+      assert_equal "pushq",                      traces[1]['Spec']
+      assert_equal "resque",                     traces[1]['Flavor']
+      assert_equal "ResqueRemoteCallWorkerJob",  traces[1]['JobName']
+      assert_equal "critical",                   traces[1]['Queue']
+      assert_equal "resque-client",              traces[4]['Layer'], "exit event layer name"
+      assert_equal "exit",                       traces[4]['Label'], "exit event label"
+    end
+
+    def test_obey_log_args_when_true
+      TraceView::Config[:resqueclient][:log_args] = true
+
+      # Queue up a job to be run
+      ::TraceView::API.start_trace('resque-client_test') do
+        Resque.enqueue(ResqueRemoteCallWorkerJob, 1, 2, 3)
+      end
+
+      traces = get_all_traces
+      assert_equal 6, traces.count, "trace count"
+      validate_outer_layers(traces, 'resque-client_test')
+
+      assert_equal true,            traces[1].key?('Args')
+      assert_equal "[1,2,3]",     traces[1]['Args']
+
+      assert_equal "resque-client",              traces[1]['Layer'], "entry event layer name"
+      assert_equal "entry",                      traces[1]['Label'], "entry event label"
+      assert_equal "pushq",                      traces[1]['Spec']
+      assert_equal "resque",                     traces[1]['Flavor']
+      assert_equal "ResqueRemoteCallWorkerJob",  traces[1]['JobName']
+      assert_equal "critical",                   traces[1]['Queue']
+      assert_equal "resque-client",              traces[4]['Layer'], "exit event layer name"
+      assert_equal "exit",                       traces[4]['Label'], "exit event label"
+    end
   end
 end
-

data/test/instrumentation/sidekiq-client_test.rb

@@ -1,12 +1,12 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
-if RUBY_VERSION >= '2.0'
+if RUBY_VERSION >= '2.0' && !defined?(JRUBY_VERSION)
   require 'minitest_helper'
   require 'sidekiq'
-  require_relative "../jobs/remote_call_worker_job"
-  require_relative "../jobs/db_worker_job"
-  require_relative "../jobs/error_worker_job"
+  require_relative "../jobs/sidekiq/remote_call_worker_job"
+  require_relative "../jobs/sidekiq/db_worker_job"
+  require_relative "../jobs/sidekiq/error_worker_job"
 
   class SidekiqClientTest < Minitest::Test
     def setup

data/test/instrumentation/sidekiq-worker_test.rb

@@ -1,12 +1,12 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
-if RUBY_VERSION >= '2.0'
+if RUBY_VERSION >= '2.0' && !defined?(JRUBY_VERSION)
   require 'minitest_helper'
   require 'sidekiq'
-  require_relative "../jobs/remote_call_worker_job"
-  require_relative "../jobs/db_worker_job"
-  require_relative "../jobs/error_worker_job"
+  require_relative "../jobs/sidekiq/remote_call_worker_job"
+  require_relative "../jobs/sidekiq/db_worker_job"
+  require_relative "../jobs/sidekiq/error_worker_job"
 
   class SidekiqWorkerTest < Minitest::Test
     def setup

data/test/jobs/resque/db_worker_job.rb

@@ -0,0 +1,29 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+class ResqueDBWorkerJob
+  @queue = :normal
+
+  def self.perform(*args)
+    return unless defined?(::Sequel) && !defined?(JRUBY_VERSION)
+
+    if ENV.key?('TRAVIS_MYSQL_PASS')
+      @db = Sequel.connect("mysql2://root:#{ENV['TRAVIS_MYSQL_PASS']}@127.0.0.1:3306/travis_ci_test")
+    else
+      @db = Sequel.connect('mysql2://root@127.0.0.1:3306/travis_ci_test')
+    end
+
+    unless @db.table_exists?(:items)
+      @db.create_table :items do
+        primary_key :id
+        String :name
+        Float :price
+      end
+    end
+
+    @db.run('select 1')
+
+    items = @db[:items]
+    items.count
+  end
+end

data/test/jobs/resque/error_worker_job.rb

@@ -0,0 +1,10 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+class ResqueErrorWorkerJob
+  @queue = :critical
+
+  def self.perform(*args)
+    raise "This is a worker error yeah!"
+  end
+end

data/test/jobs/resque/remote_call_worker_job.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+class ResqueRemoteCallWorkerJob
+  @queue = :critical
+
+  def self.perform(*args)
+    # Make some random Dalli (memcache) calls and top it
+    # off with an excon call to the background rack webserver.
+    @dc = Dalli::Client.new
+    @dc.get(rand(10).to_s)
+    uri = URI('http://gameface.in/gamers')
+    http = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Get.new(uri.request_uri)
+    http.request(request)
+    @dc.get(rand(10).to_s)
+    @dc.get(rand(10).to_s)
+    @dc.get_multi([:one, :two, :three, :four, :five, :six])
+  end
+end

data/test/minitest_helper.rb

@@ -62,8 +62,12 @@ when /rails3/
 when /frameworks/
 when /libraries/
   if RUBY_VERSION >= '2.0'
-    # Background Sidekiq thread
-    require './test/servers/sidekiq.rb'
+    # Load Sidekiq if TEST isn't defined or if it is, it calls
+    # out the sidekiq tests
+    if !ENV.key?('TEST') || ENV['TEST'] =~ /sidekiq/
+      # Background Sidekiq thread
+      require './test/servers/sidekiq.rb'
+    end
   end
 end
 
@@ -218,4 +222,3 @@ class MiniTest::Spec
     Rack::Lint.new(@app)
   end
 end
-

data/test/servers/sidekiq.rb

@@ -25,11 +25,3 @@ end
 
 # Allow Sidekiq to boot up
 sleep 10
-
-# Add a hook to shutdown sidekiq after Minitest finished running
-Minitest.after_run {
-  TraceView.logger.warn "[traceview/servers] Shutting down Sidekiq."
-  pid = File.read("/tmp/sidekiq_#{Process.pid}.pid").chomp
-  Process.kill(:TERM, pid.to_i)
-  File.unlink "/tmp/sidekiq_#{Process.pid}.pid"
-}

data/test/servers/sidekiq_initializer.rb

@@ -5,9 +5,9 @@ ENV['BUNDLE_GEMFILE'] = Dir.pwd + "/gemfiles/libraries.gemfile"
 
 require 'rubygems'
 require 'bundler/setup'
-require_relative '../jobs/db_worker_job'
-require_relative '../jobs/remote_call_worker_job'
-require_relative '../jobs/error_worker_job'
+require_relative '../jobs/sidekiq/db_worker_job'
+require_relative '../jobs/sidekiq/remote_call_worker_job'
+require_relative '../jobs/sidekiq/error_worker_job'
 
 ENV["RACK_ENV"] = "test"
 ENV["TRACEVIEW_GEM_TEST"] = "true"

data/test/support/config_test.rb

@@ -30,7 +30,7 @@ describe "TraceView::Config" do
     instrumentation = TraceView::Config.instrumentation
 
     # Verify the number of individual instrumentations
-    instrumentation.count.must_equal 24
+    instrumentation.count.must_equal 25
 
     TraceView::Config[:action_controller][:enabled].must_equal true
     TraceView::Config[:action_view][:enabled].must_equal true
@@ -50,7 +50,8 @@ describe "TraceView::Config" do
     TraceView::Config[:moped][:enabled].must_equal true
     TraceView::Config[:rack][:enabled].must_equal true
     TraceView::Config[:redis][:enabled].must_equal true
-    TraceView::Config[:resque][:enabled].must_equal true
+    TraceView::Config[:resqueclient][:enabled].must_equal true
+    TraceView::Config[:resqueworker][:enabled].must_equal true
     TraceView::Config[:rest_client][:enabled].must_equal true
     TraceView::Config[:sequel][:enabled].must_equal true
     TraceView::Config[:sidekiqclient][:enabled].must_equal true
@@ -75,14 +76,14 @@ describe "TraceView::Config" do
     TraceView::Config[:moped][:log_args].must_equal true
     TraceView::Config[:rack][:log_args].must_equal true
     TraceView::Config[:redis][:log_args].must_equal true
-    TraceView::Config[:resque][:log_args].must_equal true
+    TraceView::Config[:resqueclient][:log_args].must_equal true
+    TraceView::Config[:resqueworker][:log_args].must_equal true
     TraceView::Config[:rest_client][:log_args].must_equal true
     TraceView::Config[:sequel][:log_args].must_equal true
     TraceView::Config[:sidekiqclient][:log_args].must_equal true
     TraceView::Config[:sidekiqworker][:log_args].must_equal true
     TraceView::Config[:typhoeus][:log_args].must_equal true
 
-    TraceView::Config[:resque][:link_workers].must_equal false
     TraceView::Config[:blacklist].is_a?(Array).must_equal true
 
     TraceView::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)$"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -165,6 +165,8 @@ files:
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/curb_test.rb
 - test/instrumentation/dalli_test.rb
+- test/instrumentation/delayed_job-client_test.rb
+- test/instrumentation/delayed_job-worker_test.rb
 - test/instrumentation/em_http_request_test.rb
 - test/instrumentation/excon_test.rb
 - test/instrumentation/faraday_test.rb
@@ -190,9 +192,12 @@ files:
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/instrumentation/typhoeus_test.rb
-- test/jobs/db_worker_job.rb
-- test/jobs/error_worker_job.rb
-- test/jobs/remote_call_worker_job.rb
+- test/jobs/resque/db_worker_job.rb
+- test/jobs/resque/error_worker_job.rb
+- test/jobs/resque/remote_call_worker_job.rb
+- test/jobs/sidekiq/db_worker_job.rb
+- test/jobs/sidekiq/error_worker_job.rb
+- test/jobs/sidekiq/remote_call_worker_job.rb
 - test/minitest_helper.rb
 - test/profiling/legacy_method_profiling_test.rb
 - test/profiling/method_profiling_test.rb
@@ -244,6 +249,7 @@ test_files:
 - test/servers/rackapp_8101.rb
 - test/instrumentation/excon_test.rb
 - test/instrumentation/sequel_pg_test.rb
+- test/instrumentation/delayed_job-worker_test.rb
 - test/instrumentation/moped_test.rb
 - test/instrumentation/httpclient_test.rb
 - test/instrumentation/sequel_mysql_test.rb
@@ -255,6 +261,7 @@ test_files:
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/redis_strings_test.rb
 - test/instrumentation/typhoeus_test.rb
+- test/instrumentation/delayed_job-client_test.rb
 - test/instrumentation/sequel_mysql2_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/instrumentation/redis_misc_test.rb
@@ -291,6 +298,9 @@ test_files:
 - test/support/backcompat_test.rb
 - test/support/xtrace_test.rb
 - test/minitest_helper.rb
-- test/jobs/remote_call_worker_job.rb
-- test/jobs/error_worker_job.rb
-- test/jobs/db_worker_job.rb
+- test/jobs/sidekiq/remote_call_worker_job.rb
+- test/jobs/sidekiq/error_worker_job.rb
+- test/jobs/sidekiq/db_worker_job.rb
+- test/jobs/resque/remote_call_worker_job.rb
+- test/jobs/resque/error_worker_job.rb
+- test/jobs/resque/db_worker_job.rb