traceview 3.8.2 → 3.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2ad7500e12f73a8f119c9b910c08b187266ab2e
-  data.tar.gz: 5424df41c5841e2734715ddb9af8af83105c0f92
+  metadata.gz: 32b865d51e3fb70e212c5fb02f043c1af940dff1
+  data.tar.gz: 37f29c3fc9cb2caf79a5e872e39e5f058e622f2d
 SHA512:
-  metadata.gz: 65aa01b7ae931f6893d0ba49c9d4e1475e05f6fce58a4a34c868fde0fb2d9177704b2c97f86f99750e8817b5d9c494692cdb3bc82c9d67d6eafacc85f70ff9d5
-  data.tar.gz: dec80efa11990bd966a57c9f9c6380203716763e078c4eee80ddffc780b7465ffc5d7e6a8a20eb07f5c60c223604b02de88b9bfb1eae8a7c3b8c93c4bdff3c09
+  metadata.gz: 2415dbcc5597523fae2e474c6f2c1c90900a9b6f800e35fc6b23fb8c63b8139fdcba2ab27c690b6dd674a1cb9d87fc9e5dababb6fe6f9aa6ecaea4e6562a09fd
+  data.tar.gz: b362aa442657b6b8161e7fc82fc01b5cf7a3834d3780a0a44f9f63927a10c0cfdf9e4d5e1ed35987d97c2030ba298dbe6259a142670ba9ba674b8a99d5b8acda

data/CHANGELOG.md

@@ -4,7 +4,20 @@ https://github.com/appneta/ruby-traceview/releases
 
 Dates in this file are in the format MM/DD/YYYY.
 
-# traceview 3.8.2
+# traceview 3.8.3 (08/29/2016)
+
+This patch release includes the following fixes:
+
+* Updates to test suite: Rails servers and Curb instrumentation
+* Updated Sequel instrumentation to follow latest gem changes: bc2b715b6fd6575de2969e25705ec1fd8e51c236
+* Updated Excon instrumentation to follow latest gem changes: c35ac53d6fd614e86d388e3f6c0f050341cc4f37
+
+Pushed to Rubygems:
+
+https://rubygems.org/gems/traceview/versions/3.8.3
+https://rubygems.org/gems/traceview/versions/3.8.3-java
+
+# traceview 3.8.2 (06/09/2016)
 
 This patch release includes the following fixes:
 

data/gemfiles/frameworks.gemfile

@@ -16,7 +16,8 @@ end
 
 # New mime-types/mime-types-data requires ruby 2.0
 if RUBY_VERSION < '2.0'
-  gem 'mime-types', '< 3.0'
+  # these gems dropped suport for < ruby version 2.0
+  gem 'json', '< 2.0.0'
 end
 
 if defined?(JRUBY_VERSION)
@@ -25,15 +26,18 @@ else
   gem 'sinatra'
 end
 
-gem "grape"
+if RUBY_VERSION > '1.9.3'
+  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'
+  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
 end
 
+
 gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
 # vim:syntax=ruby

data/gemfiles/libraries.gemfile

@@ -1,15 +1,21 @@
 source "https://rubygems.org"
 
+
 if RUBY_VERSION >= '1.9.3'
-  # rest-client depends on mime-types gem which only supports
-  # ruby 1.9.3 and up
-  gem 'rest-client'
   gem 'moped'
   gem 'eventmachine', '< 1.2.0'
   gem 'em-synchrony'
   gem 'em-http-request'
 end
 
+if RUBY_VERSION >= '2.0.0'
+  # rest-client depends on mime-types gem which only supports
+  # ruby 1.9.3 and up.  Latest rest-client only
+  # supports Ruby 2.0+
+  gem 'rest-client'
+end
+
+
 group :development, :test do
   gem 'minitest'
   gem 'minitest-reporters', '< 1.0.18'
@@ -32,8 +38,16 @@ else
   gem 'sinatra'
 end
 
+if RUBY_VERSION.between?('1.8.7', '1.9.3')
+  # Nothing
+elsif RUBY_VERSION == '1.9.3'
+  gem 'mime-types', '< 3.0'
+end
+
 if RUBY_VERSION < '2.0.0'
   gem 'bunny', '< 2.0.0'
+  # these gems dropped suport for < ruby version 2.0
+  gem 'json', '< 2.0.0'
 else
   gem 'bunny'
 end

data/lib/traceview/api/layerinit.rb

@@ -11,11 +11,9 @@ module TraceView
       # layer.
       #
       def report_init(layer = :rack)
-        # Don't send __Init in development, test or if the gem
+        # Don't send __Init in test or if we're
         # isn't fully loaded (e.g. missing c-extension)
-        return if %w(development test).include?(ENV['RACK_ENV']) ||
-                  ENV.key?('TRACEVIEW_GEM_TEST') ||
-                  !TraceView.loaded
+        return if ENV.key?('TRACEVIEW_GEM_TEST') || !TraceView.loaded
 
         platform_info = TraceView::Util.build_init_report
 

data/lib/traceview/inst/curb.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2015 AppNeta, Inc.
+# Copyright (c) 2016 AppNeta, Inc.
 # All rights reserved.
 
 module TraceView
@@ -38,7 +38,10 @@ module TraceView
         kvs
       rescue => e
         TraceView.logger.debug "[traceview/debug] Error capturing curb KVs: #{e.message}"
-        TraceView.logger.debug e.backtrace.join('\n') if ::TraceView::Config[:verbose]
+        if TraceView::Config[:verbose]
+          TraceView.logger.debug "[traceview/debug] #{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+          TraceView.logger.debug e.backtrace.join('\n')
+        end
       ensure
         return kvs
       end
@@ -78,9 +81,6 @@ module TraceView
               kvs[:Location] = headers["Location"]
             end
 
-            # Curb only provides a single long string of all response headers (yuck!).  So we are forced
-            # to process that string to pull out the response X-Trace value.
-            # Taken from https://stackoverflow.com/questions/14345805/curb-get-response-headers
             _, *response_headers = header_str.split(/[\r\n]+/).map(&:strip)
             response_headers = Hash[response_headers.flat_map{ |s| s.scan(/^(\S+): (.+)/) }]
 
@@ -97,7 +97,6 @@ module TraceView
         ensure
           TraceView::API.log_exit(:curb, kvs)
         end
-
       end
     end # CurlUtility
 

data/lib/traceview/inst/sequel.rb

@@ -19,6 +19,15 @@ module TraceView
       def extract_trace_details(sql, opts)
         kvs = {}
 
+        if !sql.is_a?(String)
+          kvs[:IsPreparedStatement] = true
+        end
+
+        if ::Sequel::VERSION > '4.36.0' && !sql.is_a?(String)
+          # In 4.37.0, sql was converted to a prepared statement object
+          sql = sql.prepared_sql unless sql.is_a?(Symbol)
+        end
+
         if TraceView::Config[:sanitize_sql]
           # Sanitize SQL and don't report binds
           if sql.is_a?(Symbol)
@@ -31,7 +40,6 @@ module TraceView
           kvs[:Query] = sql.to_s
           kvs[:QueryArgs] = opts[:arguments] if opts.is_a?(Hash) && opts.key?(:arguments)
         end
-        kvs[:IsPreparedStatement] = true if sql.is_a?(Symbol)
 
         kvs[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:sequel][:collect_backtraces]
 

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

@@ -11,7 +11,7 @@ module TraceView
         report_kvs = {}
         worker_class, msg, queue, _ = args
 
-        report_kvs[:Spec]      = :msgclient
+        report_kvs[:Spec]      = :pushq
         report_kvs[:Flavor]    = :sidekiq
         report_kvs[:Queue]     = queue
         report_kvs[:Retry]     = msg['retry']

data/lib/traceview/version.rb

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

data/test/benchmarks/allocations_test.rb

@@ -0,0 +1,14 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+
+class BenchAllocations < Minitest::Test
+  def test_trace_api
+    assert_allocations 42 do
+      TraceView::API.start_trace('bench') do
+        nil
+      end
+    end
+  end
+end

data/test/benchmarks/tracing_api_test.rb

@@ -0,0 +1,15 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+
+class BenchTracingAPI < MiniTest::Benchmark
+  def bench_api
+    skip
+    assert_performance_linear 0.99 do |input|
+      TraceView::API.start_trace('bench') do
+        nil
+      end
+    end
+  end
+end

data/test/instrumentation/excon_test.rb

@@ -169,9 +169,9 @@ class ExconTest < Minitest::Test
     assert_equal 'GET',                      traces[1]['HTTPMethod']
     assert traces[1].key?('Backtrace')
 
-    assert_equal 'excon',                      traces[2]['Layer']
-    assert_equal 'error',                      traces[2]['Label']
-    assert_equal "Excon::Errors::SocketError", traces[2]['ErrorClass']
+    assert_equal 'excon',                    traces[2]['Layer']
+    assert_equal 'error',                    traces[2]['Label']
+    assert_equal "Excon::Error::Socket",     traces[2]['ErrorClass']
     assert traces[2].key?('ErrorMsg')
     assert traces[2].key?('Backtrace')
 

data/test/instrumentation/rest-client_test.rb

@@ -3,7 +3,7 @@
 
 require 'minitest_helper'
 
-if RUBY_VERSION >= '1.9.3'
+if RUBY_VERSION >= '2.0.0'
   describe "RestClient" do
     before do
       clear_all_traces

data/test/instrumentation/sequel_mysql2_test.rb

@@ -269,10 +269,17 @@ if defined?(::Sequel) && !defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Query'].must_equal "SELECT * FROM `items` WHERE (`name` = 'abc')"
-      traces[1].has_key?('Backtrace').must_equal TraceView::Config[:sequel][:collect_backtraces]
-      traces[3]['Query'].must_equal "DELETE FROM `items` WHERE (`name` = 'cba')"
-      traces[3].has_key?('Backtrace').must_equal TraceView::Config[:sequel][:collect_backtraces]
+      if ::Sequel::VERSION > '4.36.0'
+        traces[1]['Query'].must_equal "SELECT * FROM `items` WHERE (`name` = ?)"
+        traces[1].has_key?('Backtrace').must_equal TraceView::Config[:sequel][:collect_backtraces]
+        traces[3]['Query'].must_equal "DELETE FROM `items` WHERE (`name` = ?)"
+        traces[3].has_key?('Backtrace').must_equal TraceView::Config[:sequel][:collect_backtraces]
+      else
+        traces[1]['Query'].must_equal "SELECT * FROM `items` WHERE (`name` = 'abc')"
+        traces[1].has_key?('Backtrace').must_equal TraceView::Config[:sequel][:collect_backtraces]
+        traces[3]['Query'].must_equal "DELETE FROM `items` WHERE (`name` = 'cba')"
+        traces[3].has_key?('Backtrace').must_equal TraceView::Config[:sequel][:collect_backtraces]
+      end
       validate_event_keys(traces[2], @exit_kvs)
     end
 
@@ -290,7 +297,13 @@ if defined?(::Sequel) && !defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Query'].must_equal "select_by_name"
+
+      if ::Sequel::VERSION > '4.36.0'
+        traces[1]['Query'].must_equal "SELECT * FROM `items` WHERE (`name` = ?)"
+      else
+        traces[1]['Query'].must_equal "select_by_name"
+      end
+
       if RUBY_VERSION < "1.9"
         traces[1]['QueryArgs'].must_equal "abc"
       else
@@ -316,7 +329,13 @@ if defined?(::Sequel) && !defined?(JRUBY_VERSION)
       validate_outer_layers(traces, 'sequel_test')
 
       validate_event_keys(traces[1], @entry_kvs)
-      traces[1]['Query'].must_equal "select_by_name"
+
+      if ::Sequel::VERSION > '4.36.0'
+        traces[1]['Query'].must_equal "SELECT * FROM `items` WHERE (`name` = ?)"
+      else
+        traces[1]['Query'].must_equal "select_by_name"
+      end
+
       traces[1]['QueryArgs'].must_equal nil
       traces[1]['IsPreparedStatement'].must_equal "true"
       traces[1].has_key?('Backtrace').must_equal TraceView::Config[:sequel][:collect_backtraces]

data/test/instrumentation/sidekiq-client_test.rb

@@ -36,7 +36,7 @@ if RUBY_VERSION >= '2.0' && !defined?(JRUBY_VERSION)
       assert_equal 'sidekiq-client',       traces[1]['Layer']
       assert_equal 'entry',                traces[1]['Label']
 
-      assert_equal 'msgclient',            traces[1]['Spec']
+      assert_equal 'pushq',                traces[1]['Spec']
       assert_equal 'sidekiq',              traces[1]['Flavor']
       assert_equal 'critical',             traces[1]['Queue']
       assert_equal jid,                    traces[1]['MsgID']

data/test/servers/delayed_job.rb

@@ -1,9 +1,12 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
+# This is a Rails app that launches a DelayedJob worker
+# in a background thread.
+#
 require "rails/all"
 require "delayed_job"
-require "action_controller/railtie" # require more if needed
+require "action_controller/railtie"
 require 'rack/handler/puma'
 require File.expand_path(File.dirname(__FILE__) + '/../models/widget')
 
@@ -30,25 +33,12 @@ class Rails40MetalStack < Rails::Application
     get "/hello/metal" => "ferro#world"
   end
 
-  # Enable cache classes. Production style.
   config.cache_classes = true
   config.eager_load = false
-
-  # uncomment below to display errors
-  # config.consider_all_requests_local = true
-
   config.active_support.deprecation = :stderr
-
-  # Here you could remove some middlewares, for example
-  # Rack::Lock, ActionDispatch::Flash and  ActionDispatch::BestStandardsSupport below.
-  # The remaining stack is printed on rackup (for fun!).
-  # Rails API has config.middleware.api_only! to get
-  # rid of browser related middleware.
   config.middleware.delete "Rack::Lock"
   config.middleware.delete "ActionDispatch::Flash"
   config.middleware.delete "ActionDispatch::BestStandardsSupport"
-
-  # We need a secret token for session, cookies, etc.
   config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
   config.secret_key_base = "2048671-96803948"
 end

data/test/servers/rackapp_8101.rb

@@ -1,6 +1,9 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
+# This is a Rack application that is booted in a background
+# thread and listens on port 8101.
+#
 require 'rack/handler/puma'
 require 'traceview/inst/rack'
 

data/test/servers/rails3x_8140.rb

@@ -1,29 +1,17 @@
-# Taken from: https://www.amberbit.com/blog/2014/2/14/putting-ruby-on-rails-on-a-diet/
-# Port of https://gist.github.com/josevalim/1942658 to Rails 4
-# Original author: Jose Valim
-# Updated by: Peter Giacomo Lombardo
-#
-# Run this file with:
-#
-#   bundle exec RAILS_ENV=production rackup -p 3000 -s thin
-#
-# And access:
-#
-#   http://localhost:3000/hello/world
+##
+# Copyright (c) 2016 AppNeta, Inc.
+# All rights reserved.
+
+#  This is a Rails stack that launches on a background
+#  thread and listens on port 8140.
 #
-# The following lines should come as no surprise. Except by
-# ActionController::Metal, it follows the same structure of
-# config/application.rb, config/environment.rb and config.ru
-# existing in any Rails 4 app. Here they are simply in one
-# file and without the comments.
 require "rails/all"
-require "action_controller/railtie" # require more if needed
+require "action_controller/railtie"
 require 'rack/handler/puma'
 require File.expand_path(File.dirname(__FILE__) + '/../models/widget')
 
 TraceView.logger.info "[traceview/info] Starting background utility rails app on localhost:8140."
 
-# Set the database.  Default is postgresql.
 if ENV['DBTYPE'] == 'mysql2'
   TraceView::Test.set_mysql2_env
 elsif ENV['DBTYPE'] == 'mysql'
@@ -47,26 +35,13 @@ class Rails32MetalStack < Rails::Application
     get "/hello/db"    => "hello#db"
   end
 
-  # Enable cache classes. Production style.
   config.cache_classes = true
   config.eager_load = false
-
-  # uncomment below to display errors
-  # config.consider_all_requests_local = true
-
   config.active_support.deprecation = :stderr
-
-  # Here you could remove some middlewares, for example
-  # Rack::Lock, ActionDispatch::Flash and  ActionDispatch::BestStandardsSupport below.
-  # The remaining stack is printed on rackup (for fun!).
-  # Rails API has config.middleware.api_only! to get
-  # rid of browser related middleware.
   config.middleware.delete "Rack::Lock"
   config.middleware.delete "ActionDispatch::Flash"
   config.middleware.delete "ActionDispatch::BestStandardsSupport"
-
-  # We need a secret token for session, cookies, etc.
-  config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+  config.secret_token = "498374i49qkuweoiuoqwehisuakshdhksadhaisdy78o34y138974xyqu9rmye8yrpiokeuioqwzyo8uxftoyqiuxrhm3iou1hrzmjk"
   config.secret_key_base = "2048671-96803948"
 end
 

data/test/servers/rails4x_8140.rb

@@ -1,31 +1,17 @@
-# Taken from: https://www.amberbit.com/blog/2014/2/14/putting-ruby-on-rails-on-a-diet/
-# Port of https://gist.github.com/josevalim/1942658 to Rails 4
-# Original author: Jose Valim
-# Updated by: Peter Giacomo Lombardo
-#
-# Run this file with:
-#
-#   bundle exec RAILS_ENV=production rackup -p 3000 -s thin
-#
-# And access:
-#
-#   http://localhost:3000/hello/world
-#
-# The following lines should come as no surprise. Except by
-# ActionController::Metal, it follows the same structure of
-# config/application.rb, config/environment.rb and config.ru
-# existing in any Rails 4 app. Here they are simply in one
-# file and without the comments.
-#
+##
+# Copyright (c) 2016 AppNeta, Inc.
+# All rights reserved.
 
+#  This is a Rails stack that launches on a background
+#  thread and listens on port 8140.
+#
 require "rails/all"
-require "action_controller/railtie" # require more if needed
+require "action_controller/railtie"
 require 'rack/handler/puma'
 require File.expand_path(File.dirname(__FILE__) + '/../models/widget')
 
 TraceView.logger.info "[traceview/info] Starting background utility rails app on localhost:8140."
 
-# Set the database.  Default is postgresql.
 if ENV['DBTYPE'] == 'mysql2'
   TraceView::Test.set_mysql2_env
 elsif ENV['DBTYPE'] == 'mysql'
@@ -49,26 +35,13 @@ class Rails40MetalStack < Rails::Application
     get "/hello/db"    => "hello#db"
   end
 
-  # Enable cache classes. Production style.
   config.cache_classes = true
   config.eager_load = false
-
-  # uncomment below to display errors
-  # config.consider_all_requests_local = true
-
   config.active_support.deprecation = :stderr
-
-  # Here you could remove some middlewares, for example
-  # Rack::Lock, ActionDispatch::Flash and  ActionDispatch::BestStandardsSupport below.
-  # The remaining stack is printed on rackup (for fun!).
-  # Rails API has config.middleware.api_only! to get
-  # rid of browser related middleware.
   config.middleware.delete "Rack::Lock"
   config.middleware.delete "ActionDispatch::Flash"
   config.middleware.delete "ActionDispatch::BestStandardsSupport"
-
-  # We need a secret token for session, cookies, etc.
-  config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+  config.secret_token = "49830489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yypiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
   config.secret_key_base = "2048671-96803948"
 end
 

data/test/servers/rails5x_8140.rb

@@ -1,24 +1,10 @@
-# Taken from: https://www.amberbit.com/blog/2014/2/14/putting-ruby-on-rails-on-a-diet/
-# Port of https://gist.github.com/josevalim/1942658 to Rails 4
-# Original author: Jose Valim
-# Updated by: Peter Giacomo Lombardo
-#
-# Run this file with:
-#
-#   bundle exec RAILS_ENV=production rackup -p 3000 -s thin
-#
-# And access:
-#
-#   http://localhost:3000/hello/world
-#
-# The following lines should come as no surprise. Except by
-# ActionController::Metal, it follows the same structure of
-# config/application.rb, config/environment.rb and config.ru
-# existing in any Rails 4 app. Here they are simply in one
-# file and without the comments.
-#
+##
+# Copyright (c) 2016 AppNeta, Inc.
+# All rights reserved.
 
-# Set the database.  Default is postgresql.
+#  This is a Rails stack that launches on a background
+#  thread and listens on port 8140.
+#
 if ENV['DBTYPE'] == 'mysql2'
   TraceView::Test.set_mysql2_env
 elsif ENV['DBTYPE'] == 'postgresql'
@@ -49,24 +35,11 @@ class Rails50MetalStack < Rails::Application
     get "/hello/db"    => "hello#db"
   end
 
-  # Enable cache classes. Production style.
   config.cache_classes = true
   config.eager_load = false
-
-  # uncomment below to display errors
-  # config.consider_all_requests_local = true
-
   config.active_support.deprecation = :stderr
-
-  # Here you could remove some middlewares, for example
-  # Rack::Lock, ActionDispatch::Flash and  ActionDispatch::BestStandardsSupport below.
-  # The remaining stack is printed on rackup (for fun!).
-  # Rails API has config.middleware.api_only! to get
-  # rid of browser related middleware.
   config.middleware.delete Rack::Lock
   config.middleware.delete ActionDispatch::Flash
-
-  # We need a secret token for session, cookies, etc.
   config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
   config.secret_key_base = "2048671-96803948"
 end

data/test/servers/rails5x_api_8150.rb

@@ -1,24 +1,10 @@
-# Taken from: https://www.amberbit.com/blog/2014/2/14/putting-ruby-on-rails-on-a-diet/
-# Port of https://gist.github.com/josevalim/1942658 to Rails 4
-# Original author: Jose Valim
-# Updated by: Peter Giacomo Lombardo
-#
-# Run this file with:
-#
-#   bundle exec RAILS_ENV=production rackup -p 3000 -s thin
-#
-# And access:
-#
-#   http://localhost:3000/hello/world
-#
-# The following lines should come as no surprise. Except by
-# ActionController::Metal, it follows the same structure of
-# config/application.rb, config/environment.rb and config.ru
-# existing in any Rails 4 app. Here they are simply in one
-# file and without the comments.
-#
+##
+# Copyright (c) 2016 AppNeta, Inc.
+# All rights reserved.
 
-# Set the database.  Default is postgresql.
+#  This is a Rails API stack that launches on a background
+#  thread and listens on port 8150.
+#
 if ENV['DBTYPE'] == 'mysql2'
   TraceView::Test.set_mysql2_env
 elsif ENV['DBTYPE'] == 'postgresql'
@@ -30,7 +16,6 @@ else
 end
 
 require "rails"
-# Pick the frameworks you want:
 require "active_model/railtie"
 require "active_job/railtie"
 require "active_record/railtie"
@@ -38,7 +23,6 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 require "action_cable/engine"
-# require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
 require 'rack/handler/puma'
@@ -61,24 +45,11 @@ module Rails50APIStack
       get "/monkey/error" => "monkey#error"
     end
 
-    # Enable cache classes. Production style.
     config.cache_classes = true
     config.eager_load = false
-
-    # uncomment below to display errors
-    # config.consider_all_requests_local = true
-
     config.active_support.deprecation = :stderr
-
-    # Here you could remove some middlewares, for example
-    # Rack::Lock, ActionDispatch::Flash and  ActionDispatch::BestStandardsSupport below.
-    # The remaining stack is printed on rackup (for fun!).
-    # Rails API has config.middleware.api_only! to get
-    # rid of browser related middleware.
     config.middleware.delete Rack::Lock
     config.middleware.delete ActionDispatch::Flash
-
-    # We need a secret token for session, cookies, etc.
     config.secret_token = "48837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
     config.secret_key_base = "2049671-96803948"
   end
@@ -90,9 +61,7 @@ end
 
 class MonkeyController < ActionController::API
   def hello
-    #render :json => { :Response => "Hello API!"}.to_json
-    # Work around for Rails beta issue with rendering json
-    render :plain => { :Response => "Hello API!"}.to_json, content_type: 'application/json'
+    render :plain => {:Response => "Hello API!"}.to_json, content_type: 'application/json'
   end
 
   def error

data/test/servers/sidekiq.rb

@@ -1,6 +1,9 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
+# We configure and launch Sidekiq in a background
+# thread here.
+#
 require 'sidekiq/cli'
 
 TraceView.logger.info "[traceview/servers] Starting up background Sidekiq."
@@ -18,7 +21,6 @@ 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

data/test/servers/sidekiq_initializer.rb

@@ -1,6 +1,9 @@
 # Copyright (c) 2015 AppNeta, Inc.
 # All rights reserved.
 
+# This file is used to initialize the background Sidekiq
+# process launched in our test suite.
+#
 ENV['BUNDLE_GEMFILE'] = Dir.pwd + "/gemfiles/libraries.gemfile"
 
 require 'rubygems'

data/test/support/noop_test.rb

@@ -56,6 +56,9 @@ class NoopTest < Minitest::Test
   end
 
   def test_method_profiling_doesnt_barf
+    # FIXME: Skip this because it screws up tests that follow this one
+    # We should put in a way to remove custom instrumentation from a running process.
+    skip
     TraceView::API.profile_method(Array, :sort)
 
     x = [1, 3, 2]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.8.2
+  version: 3.8.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -207,6 +207,8 @@ files:
 - lib/traceview/util.rb
 - lib/traceview/version.rb
 - lib/traceview/xtrace.rb
+- test/benchmarks/allocations_test.rb
+- test/benchmarks/tracing_api_test.rb
 - test/frameworks/apps/grape_nested.rb
 - test/frameworks/apps/grape_simple.rb
 - test/frameworks/apps/padrino_simple.rb
@@ -358,6 +360,8 @@ test_files:
 - test/instrumentation/mongo_v1_test.rb
 - test/reporter/reporter_test.rb
 - test/models/widget.rb
+- test/benchmarks/tracing_api_test.rb
+- test/benchmarks/allocations_test.rb
 - test/profiling/method_profiling_test.rb
 - test/profiling/legacy_method_profiling_test.rb
 - test/frameworks/apps/grape_simple.rb