traceview 3.3.3 → 3.4.0

data/test/frameworks/rails3x_test.rb

@@ -18,7 +18,12 @@ if defined?(::Rails)
       traces = get_all_traces
 
       traces.count.must_equal 8
-      valid_edges?(traces).must_equal true
+      unless defined?(JRUBY_VERSION)
+        # We don't test this under JRuby because the Java instrumentation
+        # for the DB drivers doesn't use our test reporter hence we won't
+        # see all trace events. :-(  To be improved.
+        valid_edges?(traces).must_equal true
+      end
       validate_outer_layers(traces, 'rack')
 
       traces[0]['Layer'].must_equal "rack"
@@ -60,7 +65,12 @@ if defined?(::Rails)
       traces = get_all_traces
 
       traces.count.must_equal 5
-      valid_edges?(traces).must_equal true
+      unless defined?(JRUBY_VERSION)
+        # We don't test this under JRuby because the Java instrumentation
+        # for the DB drivers doesn't use our test reporter hence we won't
+        # see all trace events. :-(  To be improved.
+        valid_edges?(traces).must_equal true
+      end
       validate_outer_layers(traces, 'rack')
 
       traces[0]['Layer'].must_equal "rack"

data/test/frameworks/rails4x_test.rb

@@ -18,7 +18,12 @@ if defined?(::Rails)
       traces = get_all_traces
 
       traces.count.must_equal 7
-      valid_edges?(traces).must_equal true
+      unless defined?(JRUBY_VERSION)
+        # We don't test this under JRuby because the Java instrumentation
+        # for the DB drivers doesn't use our test reporter hence we won't
+        # see all trace events. :-(  To be improved.
+        valid_edges?(traces).must_equal true
+      end
       validate_outer_layers(traces, 'rack')
 
       traces[0]['Layer'].must_equal "rack"
@@ -58,7 +63,12 @@ if defined?(::Rails)
       traces = get_all_traces
 
       traces.count.must_equal 5
-      valid_edges?(traces).must_equal true
+      unless defined?(JRUBY_VERSION)
+        # We don't test this under JRuby because the Java instrumentation
+        # for the DB drivers doesn't use our test reporter hence we won't
+        # see all trace events. :-(  To be improved.
+        valid_edges?(traces).must_equal true
+      end
       validate_outer_layers(traces, 'rack')
 
       traces[0]['Layer'].must_equal "rack"

data/test/instrumentation/curb_test.rb

@@ -283,7 +283,7 @@ if RUBY_VERSION > '1.8.7' && !defined?(JRUBY_VERSION)
       assert_equal 'entry',                   traces[1]['Label']
       assert_equal 1,                         traces[1]['IsService']
       assert_equal 'GET',                     traces[1]['HTTPMethod'], "HTTP Method"
-      assert_equal "http://127.0.0.1:8101/?curb_cross_host=1&",  traces[1]['RemoteURL']
+      assert_equal "http://127.0.0.1:8101/?curb_cross_host=1",  traces[1]['RemoteURL']
       assert       traces[1].key?('Backtrace')
 
       assert_equal 'curb',                    traces[5]['Layer']
@@ -466,7 +466,7 @@ if RUBY_VERSION > '1.8.7' && !defined?(JRUBY_VERSION)
 
       traces = get_all_traces
       assert_equal 7, traces.count, "Trace count"
-      assert_equal "http://127.0.0.1:8101/?blah=1&", traces[1]['RemoteURL']
+      assert_equal "http://127.0.0.1:8101/?blah=1", traces[1]['RemoteURL']
     end
 
     def test_without_tracing_class_get

data/test/instrumentation/dalli_test.rb

@@ -1,174 +1,177 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
-require 'minitest_helper'
+if RUBY_VERSION > '1.8.7'
 
-describe "Dalli" do
-  before do
-    clear_all_traces
-    @dc = Dalli::Client.new
-    @collect_backtraces = TraceView::Config[:dalli][:collect_backtraces]
-  end
+  require 'minitest_helper'
 
-  after do
-    TraceView::Config[:dalli][:collect_backtraces] = @collect_backtraces
-  end
+  describe "Dalli" do
+    before do
+      clear_all_traces
+      @dc = Dalli::Client.new
+      @collect_backtraces = TraceView::Config[:dalli][:collect_backtraces]
+    end
 
-  it 'Stock Dalli should be loaded, defined and ready' do
-    defined?(::Dalli).wont_match nil
-    defined?(::Dalli::Client).wont_match nil
-  end
+    after do
+      TraceView::Config[:dalli][:collect_backtraces] = @collect_backtraces
+    end
 
-  it 'should have traceview methods defined' do
-    [ :perform_with_traceview, :get_multi_with_traceview].each do |m|
-      ::Dalli::Client.method_defined?(m).must_equal true
+    it 'Stock Dalli should be loaded, defined and ready' do
+      defined?(::Dalli).wont_match nil
+      defined?(::Dalli::Client).wont_match nil
     end
-  end
 
-  it 'should trace set' do
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.set('some_key', 1234)
+    it 'should have traceview methods defined' do
+      [ :perform_with_traceview, :get_multi_with_traceview].each do |m|
+        ::Dalli::Client.method_defined?(m).must_equal true
+      end
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
+    it 'should trace set' do
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.set('some_key', 1234)
+      end
 
-    validate_outer_layers(traces, 'dalli_test')
+      traces = get_all_traces
+      traces.count.must_equal 4
 
-    traces[1].has_key?("KVOp").must_equal true
-    traces[1].has_key?("KVKey").must_equal true
-    traces[1]['Layer'].must_equal "memcache"
-    traces[1]['KVKey'].must_equal "some_key"
-    traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
-  end
+      validate_outer_layers(traces, 'dalli_test')
 
-  it 'should trace get' do
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.get('some_key')
+      traces[1].has_key?("KVOp").must_equal true
+      traces[1].has_key?("KVKey").must_equal true
+      traces[1]['Layer'].must_equal "memcache"
+      traces[1]['KVKey'].must_equal "some_key"
+      traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 5
+    it 'should trace get' do
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.get('some_key')
+      end
 
-    validate_outer_layers(traces, 'dalli_test')
+      traces = get_all_traces
+      traces.count.must_equal 5
 
-    traces[1]['KVOp'].must_equal "get"
-    traces[1]['KVKey'].must_equal "some_key"
-    traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
-    traces[2]['Label'].must_equal "info"
-    traces[2].has_key?('KVHit').must_equal true
-    traces[3]['Label'].must_equal "exit"
-  end
+      validate_outer_layers(traces, 'dalli_test')
 
-  it 'should trace get_multi' do
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.get_multi([:one, :two, :three, :four, :five, :six])
+      traces[1]['KVOp'].must_equal "get"
+      traces[1]['KVKey'].must_equal "some_key"
+      traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
+      traces[2]['Label'].must_equal "info"
+      traces[2].has_key?('KVHit').must_equal true
+      traces[3]['Label'].must_equal "exit"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 5
-
-    validate_outer_layers(traces, 'dalli_test')
+    it 'should trace get_multi' do
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.get_multi([:one, :two, :three, :four, :five, :six])
+      end
 
-    traces[1]['KVOp'].must_equal "get_multi"
-    traces[2]['Label'].must_equal "info"
-    traces[2]['RemoteHost'].must_equal "127.0.0.1:11211"
-    traces[2].has_key?('KVKeyCount').must_equal true
-    traces[2].has_key?('KVHitCount').must_equal true
-    traces[3]['Label'].must_equal "exit"
-  end
+      traces = get_all_traces
+      traces.count.must_equal 5
 
-  it "should trace increment" do
-    @dc.incr("dalli_key_counter", 1, nil, 0)
+      validate_outer_layers(traces, 'dalli_test')
 
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.incr("dalli_key_counter")
+      traces[1]['KVOp'].must_equal "get_multi"
+      traces[2]['Label'].must_equal "info"
+      traces[2]['RemoteHost'].must_equal "127.0.0.1:11211"
+      traces[2].has_key?('KVKeyCount').must_equal true
+      traces[2].has_key?('KVHitCount').must_equal true
+      traces[3]['Label'].must_equal "exit"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
+    it "should trace increment" do
+      @dc.incr("dalli_key_counter", 1, nil, 0)
 
-    validate_outer_layers(traces, 'dalli_test')
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.incr("dalli_key_counter")
+      end
 
-    traces[1]['KVOp'].must_equal "incr"
-    traces[1]['KVKey'].must_equal "dalli_key_counter"
-    traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
-    traces[2]['Label'].must_equal "exit"
-  end
+      traces = get_all_traces
+      traces.count.must_equal 4
 
-  it "should trace decrement" do
-    @dc.incr("dalli_key_counter", 1, nil, 0)
+      validate_outer_layers(traces, 'dalli_test')
 
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.decr("dalli_key_counter")
+      traces[1]['KVOp'].must_equal "incr"
+      traces[1]['KVKey'].must_equal "dalli_key_counter"
+      traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
+      traces[2]['Label'].must_equal "exit"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
+    it "should trace decrement" do
+      @dc.incr("dalli_key_counter", 1, nil, 0)
 
-    validate_outer_layers(traces, 'dalli_test')
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.decr("dalli_key_counter")
+      end
 
-    traces[1]['KVOp'].must_equal "decr"
-    traces[1]['KVKey'].must_equal "dalli_key_counter"
-    traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
-    traces[2]['Label'].must_equal "exit"
-  end
+      traces = get_all_traces
+      traces.count.must_equal 4
 
-  it "should trace replace" do
-    @dc.set('some_key', 1)
+      validate_outer_layers(traces, 'dalli_test')
 
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.replace("some_key", "woop")
+      traces[1]['KVOp'].must_equal "decr"
+      traces[1]['KVKey'].must_equal "dalli_key_counter"
+      traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
+      traces[2]['Label'].must_equal "exit"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
+    it "should trace replace" do
+      @dc.set('some_key', 1)
 
-    validate_outer_layers(traces, 'dalli_test')
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.replace("some_key", "woop")
+      end
 
-    traces[1]['KVOp'].must_equal "replace"
-    traces[1]['KVKey'].must_equal "some_key"
-    traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
-    traces[2]['Label'].must_equal "exit"
-  end
+      traces = get_all_traces
+      traces.count.must_equal 4
 
-  it "should trace delete" do
-    @dc.set('some_key', 1)
+      validate_outer_layers(traces, 'dalli_test')
 
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.delete("some_key")
+      traces[1]['KVOp'].must_equal "replace"
+      traces[1]['KVKey'].must_equal "some_key"
+      traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
+      traces[2]['Label'].must_equal "exit"
     end
 
-    traces = get_all_traces
-    traces.count.must_equal 4
+    it "should trace delete" do
+      @dc.set('some_key', 1)
 
-    validate_outer_layers(traces, 'dalli_test')
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.delete("some_key")
+      end
 
-    traces[1]['KVOp'].must_equal "delete"
-    traces[1]['KVKey'].must_equal "some_key"
-    traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
-  end
+      traces = get_all_traces
+      traces.count.must_equal 4
 
-  it "should obey :collect_backtraces setting when true" do
-    @dc.set('some_key', 1)
-    TraceView::Config[:dalli][:collect_backtraces] = true
+      validate_outer_layers(traces, 'dalli_test')
 
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.get('some_key')
+      traces[1]['KVOp'].must_equal "delete"
+      traces[1]['KVKey'].must_equal "some_key"
+      traces[1]['RemoteHost'].must_equal "127.0.0.1:11211"
     end
 
-    traces = get_all_traces
-    layer_has_key(traces, 'memcache', 'Backtrace')
-  end
+    it "should obey :collect_backtraces setting when true" do
+      @dc.set('some_key', 1)
+      TraceView::Config[:dalli][:collect_backtraces] = true
 
-  it "should obey :collect_backtraces setting when false" do
-    TraceView::Config[:dalli][:collect_backtraces] = false
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.get('some_key')
+      end
 
-    TraceView::API.start_trace('dalli_test', '', {}) do
-      @dc.get('some_key')
+      traces = get_all_traces
+      layer_has_key(traces, 'memcache', 'Backtrace')
     end
 
-    traces = get_all_traces
-    layer_doesnt_have_key(traces, 'memcache', 'Backtrace')
+    it "should obey :collect_backtraces setting when false" do
+      TraceView::Config[:dalli][:collect_backtraces] = false
+
+      TraceView::API.start_trace('dalli_test', '', {}) do
+        @dc.get('some_key')
+      end
+
+      traces = get_all_traces
+      layer_doesnt_have_key(traces, 'memcache', 'Backtrace')
+    end
   end
 end

data/test/instrumentation/httpclient_test.rb

@@ -155,7 +155,6 @@ unless defined?(JRUBY_VERSION)
       Thread.pass until conn.finished?
 
       traces = get_all_traces
-      #require 'byebug'; debugger
       assert_equal traces.count, 7
       valid_edges?(traces)
 

data/test/jobs/delayed_job/db_worker_job.rb

@@ -0,0 +1,29 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+class DJDBWorkerJob
+  @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/delayed_job/error_worker_job.rb

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

data/test/jobs/delayed_job/remote_call_worker_job.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+class DJRemoteCallWorkerJob
+  @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

@@ -49,16 +49,21 @@ TraceView.logger.level = Logger::DEBUG
 # puts %x{psql -c 'create database travis_ci_test;' -U postgres}
 
 # Our background Rack-app for http client testing
-require "./test/servers/rackapp_8101"
+require './test/servers/rackapp_8101'
 
 # Conditionally load other background servers
 # depending on what we're testing
 #
 case File.basename(ENV['BUNDLE_GEMFILE'])
+when /delayed_job/
+  require './test/servers/delayed_job'
+
 when /rails4/
-  require "./test/servers/rails4x_8140"
+  require './test/servers/rails4x_8140'
+
 when /rails3/
-  require "./test/servers/rails3x_8140"
+  require './test/servers/rails3x_8140'
+
 when /frameworks/
 when /libraries/
   if RUBY_VERSION >= '2.0'