traceview 3.3.3 → 3.4.0

data/traceview.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.extensions = ['ext/oboe_metal/extconf.rb'] unless defined?(JRUBY_VERSION)
 
   s.add_runtime_dependency('json', '>= 0')
+  s.add_runtime_dependency('bson', '< 4.0')
   s.add_development_dependency('rake', '>= 0')
 
   s.required_ruby_version = '>= 1.8.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +87,7 @@ files:
 - ext/oboe_metal/src/oboe.hpp
 - ext/oboe_metal/src/oboe_wrap.cxx
 - ext/oboe_metal/tests/test.rb
+- gemfiles/delayed_job.gemfile
 - gemfiles/frameworks.gemfile
 - gemfiles/libraries.gemfile
 - gemfiles/rails23.gemfile
@@ -123,6 +138,7 @@ files:
 - lib/traceview/frameworks/sinatra/templates.rb
 - lib/traceview/inst/curb.rb
 - lib/traceview/inst/dalli.rb
+- lib/traceview/inst/delayed_job.rb
 - lib/traceview/inst/em-http-request.rb
 - lib/traceview/inst/excon.rb
 - lib/traceview/inst/faraday.rb
@@ -165,8 +181,6 @@ 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
@@ -192,6 +206,9 @@ files:
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/instrumentation/typhoeus_test.rb
+- test/jobs/delayed_job/db_worker_job.rb
+- test/jobs/delayed_job/error_worker_job.rb
+- test/jobs/delayed_job/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
@@ -199,15 +216,20 @@ files:
 - test/jobs/sidekiq/error_worker_job.rb
 - test/jobs/sidekiq/remote_call_worker_job.rb
 - test/minitest_helper.rb
+- test/models/widget.rb
 - test/profiling/legacy_method_profiling_test.rb
 - test/profiling/method_profiling_test.rb
+- test/queues/delayed_job-client_test.rb
+- test/queues/delayed_job-worker_test.rb
 - test/reporter/reporter_test.rb
+- test/servers/delayed_job.rb
 - test/servers/rackapp_8101.rb
 - test/servers/rails3x_8140.rb
 - test/servers/rails4x_8140.rb
 - test/servers/sidekiq.rb
 - test/servers/sidekiq.yml
 - test/servers/sidekiq_initializer.rb
+- test/support/auto_tracing.rb
 - test/support/backcompat_test.rb
 - test/support/config_test.rb
 - test/support/dnt_test.rb
@@ -245,11 +267,11 @@ test_files:
 - test/servers/sidekiq_initializer.rb
 - test/servers/rails4x_8140.rb
 - test/servers/rails3x_8140.rb
+- test/servers/delayed_job.rb
 - test/servers/sidekiq.rb
 - 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
@@ -261,7 +283,6 @@ 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
@@ -278,6 +299,7 @@ test_files:
 - test/instrumentation/em_http_request_test.rb
 - test/instrumentation/rest-client_test.rb
 - test/reporter/reporter_test.rb
+- test/models/widget.rb
 - test/profiling/method_profiling_test.rb
 - test/profiling/legacy_method_profiling_test.rb
 - test/frameworks/apps/grape_simple.rb
@@ -289,8 +311,11 @@ test_files:
 - test/frameworks/rails3x_test.rb
 - test/frameworks/padrino_test.rb
 - test/frameworks/rails4x_test.rb
+- test/queues/delayed_job-worker_test.rb
+- 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/tvalias_test.rb
@@ -304,3 +329,6 @@ test_files:
 - test/jobs/resque/remote_call_worker_job.rb
 - test/jobs/resque/error_worker_job.rb
 - test/jobs/resque/db_worker_job.rb
+- test/jobs/delayed_job/remote_call_worker_job.rb
+- test/jobs/delayed_job/error_worker_job.rb
+- test/jobs/delayed_job/db_worker_job.rb

data/test/instrumentation/delayed_job-client_test.rb

@@ -1,128 +0,0 @@
-# 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

@@ -1,177 +0,0 @@
-# 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