traceview 3.2.1-java → 3.3.0-java

data/test/jobs/db_worker_job.rb

@@ -0,0 +1,29 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+class DBWorkerJob
+  include Sidekiq::Worker
+
+  def 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/error_worker_job.rb

@@ -0,0 +1,10 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+class ErrorWorkerJob
+  include Sidekiq::Worker
+
+  def perform(*args)
+    raise "This is a worker error yeah!"
+  end
+end

data/test/jobs/remote_call_worker_job.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+class RemoteCallWorkerJob
+  include Sidekiq::Worker
+
+  def 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

@@ -61,6 +61,10 @@ when /rails3/
   require "./test/servers/rails3x_8140"
 when /frameworks/
 when /libraries/
+  if RUBY_VERSION >= '2.0'
+    # Background Sidekiq thread
+    require './test/servers/sidekiq.rb'
+  end
 end
 
 ##
@@ -143,7 +147,6 @@ def valid_edges?(traces)
   traces.reverse.each do  |t|
     if t.key?("Edge")
       unless has_edge?(t["Edge"], traces)
-        require 'byebug'; debugger
         return false
       end
     end

data/test/reporter/reporter_test.rb

@@ -0,0 +1,14 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+
+class TVReporterTest < Minitest::Test
+  def reporter_has_start_method
+    assert_equal true, TV::Reporter.respond_to?(:start), "has restart method"
+  end
+
+  def reporter_has_restart_method
+    assert_equal true, TV::Reporter.respond_to?(:restart), "has start method"
+  end
+end

data/test/servers/sidekiq.rb

@@ -0,0 +1,35 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'sidekiq/cli'
+
+TraceView.logger.info "[traceview/servers] Starting up background Sidekiq."
+
+options = []
+arguments = ""
+options << ["-r", Dir.pwd + "/test/servers/sidekiq_initializer.rb"]
+options << ["-q", "critical,20", "-q", "default"]
+options << ["-c", "10"]
+options << ["-P", "/tmp/sidekiq_#{Process.pid}.pid"]
+
+options.flatten.each do |x|
+  arguments += " #{x}"
+end
+
+TraceView.logger.debug "[traceview/servers] sidekiq #{arguments}"
+
+# Boot Sidekiq in a new thread
+Thread.new do
+  system("OBOE_GEM_TEST=true sidekiq #{arguments}")
+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.yml

@@ -0,0 +1,7 @@
+---
+:concurrency: 2
+:pidfile: tmp/pids/sidekiq.pid
+:queues:
+  - default
+  - [critical, 2]
+  - [low, 1]

data/test/servers/sidekiq_initializer.rb

@@ -0,0 +1,22 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+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'
+
+ENV["RACK_ENV"] = "test"
+ENV["TRACEVIEW_GEM_TEST"] = "true"
+ENV["TRACEVIEW_GEM_VERBOSE"] = "true"
+
+Bundler.require(:default, :test)
+
+# Configure TraceView
+TraceView::Config[:tracing_mode] = "always"
+TraceView::Config[:sample_rate] = 1000000
+TraceView.logger.level = Logger::DEBUG
+

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 22
+    instrumentation.count.must_equal 24
 
     TraceView::Config[:action_controller][:enabled].must_equal true
     TraceView::Config[:action_view][:enabled].must_equal true
@@ -53,6 +53,8 @@ describe "TraceView::Config" do
     TraceView::Config[:resque][: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
+    TraceView::Config[:sidekiqworker][:enabled].must_equal true
     TraceView::Config[:typhoeus][:enabled].must_equal true
 
     TraceView::Config[:action_controller][:log_args].must_equal true
@@ -76,6 +78,8 @@ describe "TraceView::Config" do
     TraceView::Config[:resque][: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

data/test/support/liboboe_settings_test.rb

@@ -1,6 +1,7 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
+require 'set'
 require 'minitest_helper'
 require 'rack/test'
 require 'rack/lobster'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: java
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -135,6 +135,8 @@ files:
 - lib/traceview/inst/resque.rb
 - lib/traceview/inst/rest-client.rb
 - lib/traceview/inst/sequel.rb
+- lib/traceview/inst/sidekiq-client.rb
+- lib/traceview/inst/sidekiq-worker.rb
 - lib/traceview/inst/twitter-cassandra.rb
 - lib/traceview/inst/typhoeus.rb
 - lib/traceview/instrumentation.rb
@@ -144,6 +146,7 @@ files:
 - lib/traceview/method_profiling.rb
 - lib/traceview/ruby.rb
 - lib/traceview/support.rb
+- lib/traceview/test.rb
 - lib/traceview/thread_local.rb
 - lib/traceview/util.rb
 - lib/traceview/version.rb
@@ -182,13 +185,22 @@ files:
 - test/instrumentation/sequel_mysql2_test.rb
 - test/instrumentation/sequel_mysql_test.rb
 - test/instrumentation/sequel_pg_test.rb
+- 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/minitest_helper.rb
 - test/profiling/legacy_method_profiling_test.rb
 - test/profiling/method_profiling_test.rb
+- test/reporter/reporter_test.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/backcompat_test.rb
 - test/support/config_test.rb
 - test/support/dnt_test.rb
@@ -217,14 +229,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for Ruby
 test_files:
 - test/minitest_helper.rb
+- test/servers/sidekiq_initializer.rb
 - test/servers/rails4x_8140.rb
 - test/servers/rails3x_8140.rb
+- test/servers/sidekiq.rb
 - test/servers/rackapp_8101.rb
 - test/instrumentation/excon_test.rb
 - test/instrumentation/sequel_pg_test.rb
@@ -235,10 +249,12 @@ test_files:
 - test/instrumentation/dalli_test.rb
 - test/instrumentation/redis_sortedsets_test.rb
 - test/instrumentation/rack_test.rb
+- test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/redis_strings_test.rb
 - test/instrumentation/typhoeus_test.rb
 - test/instrumentation/sequel_mysql2_test.rb
+- test/instrumentation/sidekiq-worker_test.rb
 - test/instrumentation/redis_misc_test.rb
 - test/instrumentation/faraday_test.rb
 - test/instrumentation/redis_keys_test.rb
@@ -252,6 +268,7 @@ test_files:
 - test/instrumentation/memcached_test.rb
 - test/instrumentation/em_http_request_test.rb
 - test/instrumentation/rest-client_test.rb
+- test/reporter/reporter_test.rb
 - test/profiling/method_profiling_test.rb
 - test/profiling/legacy_method_profiling_test.rb
 - test/frameworks/sinatra_test.rb
@@ -270,3 +287,6 @@ test_files:
 - test/support/liboboe_settings_test.rb
 - test/support/backcompat_test.rb
 - test/support/xtrace_test.rb
+- test/jobs/remote_call_worker_job.rb
+- test/jobs/error_worker_job.rb
+- test/jobs/db_worker_job.rb