traceview 3.0.2 → 3.0.3

data/test/instrumentation/resque_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 describe "Resque" do

data/test/instrumentation/rest-client_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 if RUBY_VERSION >= '1.9.3'

data/test/instrumentation/sequel_mysql2_test.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
-unless defined?(JRUBY_VERSION)
+if defined?(::Sequel) && !defined?(JRUBY_VERSION)
 
   if ENV.key?('TRAVIS_MYSQL_PASS')
     MYSQL2_DB = Sequel.connect("mysql2://root:#{ENV['TRAVIS_MYSQL_PASS']}@127.0.0.1:3306/travis_ci_test")

data/test/instrumentation/sequel_mysql_test.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
-unless defined?(JRUBY_VERSION)
+if defined?(::Sequel) && !defined?(JRUBY_VERSION)
 
   if ENV.key?('TRAVIS_MYSQL_PASS')
     MYSQL_DB = Sequel.connect("mysql://root:#{ENV['TRAVIS_MYSQL_PASS']}@127.0.0.1:3306/travis_ci_test")

data/test/instrumentation/sequel_pg_test.rb

@@ -1,6 +1,9 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
-unless defined?(JRUBY_VERSION)
+if defined?(::Sequel) && !defined?(JRUBY_VERSION)
 
   if ENV.key?('TRAVIS_PSQL_PASS')
     PG_DB = Sequel.connect("postgres://postgres:#{ENV['TRAVIS_PSQL_PASS']}@127.0.0.1:5432/travis_ci_test")

data/test/minitest_helper.rb

@@ -1,7 +1,13 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'rubygems'
+require 'bundler/setup'
 require "minitest/spec"
 require "minitest/autorun"
 require "minitest/reporters"
 require "minitest/debugger" if ENV['DEBUG']
+require "sinatra"
 
 ENV["RACK_ENV"] = "test"
 ENV["TRACEVIEW_GEM_TEST"] = "true"
@@ -21,26 +27,37 @@ if defined?(JRUBY_VERSION)
   ENV['JAVA_OPTS'] = "-J-javaagent:/usr/local/tracelytics/tracelyticsagent.jar"
 end
 
-require 'rubygems'
-require 'bundler'
-
-# Preload memcache-client
-require 'memcache'
-
-Bundler.require(:default, :test)
-
 @trace_dir = "/tmp/"
 $trace_file = @trace_dir + "trace_output.bson"
 
+Bundler.require(:default, :test)
+
 # Configure TraceView
 TraceView::Config[:verbose] = true
 TraceView::Config[:tracing_mode] = "always"
 TraceView::Config[:sample_rate] = 1000000
 TraceView.logger.level = Logger::DEBUG
 
+# Pre-create test databases (see also .travis.yml)
+# puts "Pre-creating test databases"
+# puts %x{mysql -u root -e 'create database travis_ci_test;'}
+# puts %x{psql -c 'create database travis_ci_test;' -U postgres}
+
 # Our background Rack-app for http client testing
 require "./test/servers/rackapp_8101"
 
+# Conditionally load other background servers
+# depending on what we're testing
+#
+case File.basename(ENV['BUNDLE_GEMFILE'])
+when /rails4/
+  require "./test/servers/rails4x_8140"
+when /rails3/
+  require "./test/servers/rails3x_8140"
+when /frameworks/
+when /libraries/
+end
+
 ##
 # clear_all_traces
 #

data/test/profiling/method_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 describe "TraceViewMethodProfiling" do

data/test/servers/rackapp_8101.rb

@@ -4,7 +4,7 @@
 require 'rack/handler/puma'
 require 'traceview/inst/rack'
 
-TraceView.logger.info "[oboe/info] Starting background utility rack app on localhost:8101."
+TraceView.logger.info "[traceview/info] Starting background utility rack app on localhost:8101."
 
 Thread.new do
   app = Rack::Builder.new {

data/test/servers/rails2x_8140.rb

@@ -1,5 +1,5 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
 
 RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
 

data/test/servers/rails3x_8140.rb

@@ -0,0 +1,78 @@
+# 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
+#
+# 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.
+require "rails"
+require "action_controller/railtie" # require more if needed
+require 'rack/handler/puma'
+
+TraceView.logger.info "[traceview/info] Starting background utility rails app on localhost:8140."
+
+class Rails32MetalStack < Rails::Application
+  routes.append do
+    get "/hello/world" => "hello#world"
+    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
+
+  # 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
+
+#################################################
+#  Controllers
+#################################################
+
+class HelloController < ActionController::Base
+  def world
+    render :text => "Hello world!"
+  end
+end
+
+class FerroController < ActionController::Metal
+  include AbstractController::Rendering
+
+  def world
+    render :text => "Hello world!"
+  end
+
+  include TraceViewMethodProfiling
+  profile_method :world, 'world'
+end
+
+Rails32MetalStack.initialize!
+
+Thread.new do
+  Rack::Handler::Puma.run(Rails32MetalStack.to_app, {:Host => '127.0.0.1', :Port => 8140})
+end
+
+sleep(2)

data/test/servers/rails4x_8140.rb

@@ -0,0 +1,78 @@
+# 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
+#
+# 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.
+require "rails"
+require "action_controller/railtie" # require more if needed
+require 'rack/handler/puma'
+
+TraceView.logger.info "[traceview/info] Starting background utility rails app on localhost:8140."
+
+class Rails40MetalStack < Rails::Application
+  routes.append do
+    get "/hello/world" => "hello#world"
+    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
+
+  # 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
+
+#################################################
+#  Controllers
+#################################################
+
+class HelloController < ActionController::Base
+  def world
+    render :text => "Hello world!"
+  end
+end
+
+class FerroController < ActionController::Metal
+  include AbstractController::Rendering
+
+  def world
+    render :text => "Hello world!"
+  end
+
+  include TraceViewMethodProfiling
+  profile_method :world, 'world'
+end
+
+Rails40MetalStack.initialize!
+
+Thread.new do
+  Rack::Handler::Puma.run(Rails40MetalStack.to_app, {:Host => '127.0.0.1', :Port => 8140})
+end
+
+sleep(2)

data/test/support/backcompat_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 describe "BackwardCompatibility" do

data/test/support/config_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 describe "TraceView::Config" do

data/test/support/dnt_test.rb

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

data/test/support/liboboe_settings_test.rb

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

data/test/support/tvalias_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 class TVAliasTest < Minitest::Test

data/test/support/xtrace_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 describe "XTrace" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -51,7 +51,6 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - CONFIG.md
 - Gemfile
@@ -74,8 +73,15 @@ files:
 - ext/oboe_metal/src/oboe.hpp
 - ext/oboe_metal/src/oboe_wrap.cxx
 - ext/oboe_metal/tests/test.rb
-- gemfiles/mongo.gemfile
-- gemfiles/moped.gemfile
+- gemfiles/frameworks.gemfile
+- gemfiles/libraries.gemfile
+- gemfiles/rails23.gemfile
+- gemfiles/rails30.gemfile
+- gemfiles/rails31.gemfile
+- gemfiles/rails32.gemfile
+- gemfiles/rails40.gemfile
+- gemfiles/rails41.gemfile
+- gemfiles/rails42.gemfile
 - get_version.rb
 - init.rb
 - lib/joboe_metal.rb
@@ -149,6 +155,8 @@ files:
 - test/frameworks/grape_test.rb
 - test/frameworks/padrino_test.rb
 - test/frameworks/rails2x_test.rb
+- test/frameworks/rails3x_test.rb
+- test/frameworks/rails4x_test.rb
 - test/frameworks/sinatra_test.rb
 - test/instrumentation/cassandra_test.rb
 - test/instrumentation/dalli_test.rb
@@ -179,6 +187,8 @@ files:
 - test/profiling/method_test.rb
 - test/servers/rackapp_8101.rb
 - test/servers/rails2x_8140.rb
+- test/servers/rails3x_8140.rb
+- test/servers/rails4x_8140.rb
 - test/support/backcompat_test.rb
 - test/support/config_test.rb
 - test/support/dnt_test.rb
@@ -211,6 +221,8 @@ signing_key:
 specification_version: 4
 summary: AppNeta TraceView performance instrumentation gem for Ruby
 test_files:
+- test/servers/rails4x_8140.rb
+- test/servers/rails3x_8140.rb
 - test/servers/rails2x_8140.rb
 - test/servers/rackapp_8101.rb
 - test/instrumentation/excon_test.rb
@@ -245,8 +257,10 @@ test_files:
 - test/frameworks/apps/grape_nested.rb
 - test/frameworks/sinatra_test.rb
 - test/frameworks/grape_test.rb
+- test/frameworks/rails3x_test.rb
 - test/frameworks/padrino_test.rb
 - test/frameworks/rails2x_test.rb
+- test/frameworks/rails4x_test.rb
 - test/support/config_test.rb
 - test/support/dnt_test.rb
 - test/support/tvalias_test.rb

data/Appraisals

@@ -1,10 +0,0 @@
-
-appraise "mongo" do
-  gem 'mongo'
-end
-
-if RUBY_VERSION >= '1.9'
-  appraise "moped" do
-    gem 'moped', "~> 1.5"
-  end
-end

data/gemfiles/mongo.gemfile

@@ -1,33 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "dalli"
-gem "memcache-client"
-gem "memcached", "1.7.2"
-gem "cassandra"
-gem "mongo"
-gem "bson"
-gem "moped", "~> 1.5"
-gem "resque"
-gem "redis"
-gem "sinatra"
-gem "padrino", "0.12.0"
-gem "grape"
-
-group :development, :test do
-  gem "minitest"
-  gem "minitest-reporters"
-  gem "rack-test"
-  gem "appraisal"
-end
-
-group :development do
-  gem "ruby-debug", :platform => :mri_18
-  gem "debugger", :platform => :mri_19
-  gem "byebug", :platforms => [:mri_20, :mri_21]
-  gem "perftools.rb", :platforms => [:mri_20, :mri_21], :require => "perftools"
-  gem "pry"
-end
-
-gemspec :name => "oboe", :path => "../"