traceview 3.0.2-java → 3.0.3-java

data/lib/traceview/version.rb

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

data/test/frameworks/apps/grape_nested.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'grape'
 
 class Wrapper < Grape::API

data/test/frameworks/apps/grape_simple.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'grape'
 
 class GrapeSimple < Grape::API

data/test/frameworks/apps/sinatra_simple.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'sinatra'
 
 class SinatraSimple < Sinatra::Base

data/test/frameworks/grape_test.rb

@@ -1,5 +1,9 @@
-if RUBY_VERSION >= '1.9.3'
-  require 'minitest_helper'
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require 'minitest_helper'
+
+if RUBY_VERSION >= '1.9.3' and defined?(::Grape)
   require File.expand_path(File.dirname(__FILE__) + '/apps/grape_simple')
   require File.expand_path(File.dirname(__FILE__) + '/apps/grape_nested')
 
@@ -92,8 +96,8 @@ if RUBY_VERSION >= '1.9.3'
       @app = GrapeSimple
 
       begin
-        r = get "/break"
-      rescue Exception => e
+        get "/break"
+      rescue Exception
         # Do not handle/raise this error so
         # we can continue to test
       end

data/test/frameworks/padrino_test.rb

@@ -1,5 +1,9 @@
-if RUBY_VERSION >= '1.9.3'
-  require "minitest_helper"
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require "minitest_helper"
+
+if RUBY_VERSION >= '1.9.3' and defined?(::Padrino)
   require File.expand_path(File.dirname(__FILE__) + '/apps/padrino_simple')
 
   describe Padrino do

data/test/frameworks/rails2x_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require "minitest_helper"
 
 if defined?(::Rails)

data/test/frameworks/rails3x_test.rb

@@ -0,0 +1,91 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require "minitest_helper"
+
+if defined?(::Rails)
+
+  describe "Rails" do
+    before do
+      clear_all_traces
+    end
+
+    it "should trace a request to a rails stack" do
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/world')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 8
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[0]['Layer'].must_equal "rack"
+      traces[0]['Label'].must_equal "entry"
+      traces[0]['URL'].must_equal "/hello/world"
+
+      traces[1]['Layer'].must_equal "rack"
+      traces[1]['Label'].must_equal "info"
+
+      traces[2]['Layer'].must_equal "rails"
+      traces[2]['Label'].must_equal "entry"
+
+      traces[3]['Label'].must_equal "info"
+      traces[3]['Controller'].must_equal "HelloController"
+      traces[3]['Action'].must_equal "world"
+
+      traces[4]['Layer'].must_equal "actionview"
+      traces[4]['Label'].must_equal "entry"
+
+      traces[5]['Layer'].must_equal "actionview"
+      traces[5]['Label'].must_equal "exit"
+
+      traces[6]['Layer'].must_equal "rails"
+      traces[6]['Label'].must_equal "exit"
+
+      traces[7]['Layer'].must_equal "rack"
+      traces[7]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r.header.key?('X-Trace').must_equal true
+      r.header['X-Trace'].must_equal traces[7]['X-Trace']
+    end
+
+    it "should trace a request to a rails metal stack" do
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/metal')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 5
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[0]['Layer'].must_equal "rack"
+      traces[0]['Label'].must_equal "entry"
+      traces[0]['URL'].must_equal "/hello/metal"
+
+      traces[1]['Layer'].must_equal "rack"
+      traces[1]['Label'].must_equal "info"
+
+      traces[2]['Label'].must_equal "profile_entry"
+      traces[2]['Language'].must_equal "ruby"
+      traces[2]['ProfileName'].must_equal "world"
+      traces[2]['FunctionName'].must_equal "world"
+      traces[2]['Class'].must_equal "FerroController"
+
+      traces[3]['Label'].must_equal "profile_exit"
+      traces[3]['Language'].must_equal "ruby"
+      traces[3]['ProfileName'].must_equal "world"
+
+      traces[4]['Layer'].must_equal "rack"
+      traces[4]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r.header.key?('X-Trace').must_equal true
+      r.header['X-Trace'].must_equal traces[4]['X-Trace']
+    end
+  end
+end

data/test/frameworks/rails4x_test.rb

@@ -0,0 +1,89 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
+require "minitest_helper"
+
+if defined?(::Rails)
+
+  describe "Rails" do
+    before do
+      clear_all_traces
+    end
+
+    it "should trace a request to a rails stack" do
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/world')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 7
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[0]['Layer'].must_equal "rack"
+      traces[0]['Label'].must_equal "entry"
+      traces[0]['URL'].must_equal "/hello/world"
+
+      traces[1]['Layer'].must_equal "rack"
+      traces[1]['Label'].must_equal "info"
+
+      traces[2]['Layer'].must_equal "rails"
+      traces[2]['Label'].must_equal "entry"
+      traces[2]['Controller'].must_equal "HelloController"
+      traces[2]['Action'].must_equal "world"
+
+      traces[3]['Layer'].must_equal "actionview"
+      traces[3]['Label'].must_equal "entry"
+
+      traces[4]['Layer'].must_equal "actionview"
+      traces[4]['Label'].must_equal "exit"
+
+      traces[5]['Layer'].must_equal "rails"
+      traces[5]['Label'].must_equal "exit"
+
+      traces[6]['Layer'].must_equal "rack"
+      traces[6]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r.header.key?('X-Trace').must_equal true
+      r.header['X-Trace'].must_equal traces[6]['X-Trace']
+    end
+
+    it "should trace a request to a rails metal stack" do
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/metal')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 5
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[0]['Layer'].must_equal "rack"
+      traces[0]['Label'].must_equal "entry"
+      traces[0]['URL'].must_equal "/hello/metal"
+
+      traces[1]['Layer'].must_equal "rack"
+      traces[1]['Label'].must_equal "info"
+
+      traces[2]['Label'].must_equal "profile_entry"
+      traces[2]['Language'].must_equal "ruby"
+      traces[2]['ProfileName'].must_equal "world"
+      traces[2]['FunctionName'].must_equal "world"
+      traces[2]['Class'].must_equal "FerroController"
+
+      traces[3]['Label'].must_equal "profile_exit"
+      traces[3]['Language'].must_equal "ruby"
+      traces[3]['ProfileName'].must_equal "world"
+
+      traces[4]['Layer'].must_equal "rack"
+      traces[4]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r.header.key?('X-Trace').must_equal true
+      r.header['X-Trace'].must_equal traces[4]['X-Trace']
+    end
+  end
+end

data/test/frameworks/sinatra_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require "minitest_helper"
 require File.expand_path(File.dirname(__FILE__) + '/apps/sinatra_simple')
 

data/test/instrumentation/cassandra_test.rb

@@ -1,13 +1,20 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
+unless ENV['TV_CASSANDRA_SERVER']
+  ENV['TV_CASSANDRA_SERVER'] = "127.0.0.1:9160"
+end
+
 # The cassandra-rb client doesn't support JRuby
 # https://github.com/cassandra-rb/cassandra
-unless defined?(JRUBY_VERSION)
+if defined?(::Cassandra) and !defined?(JRUBY_VERSION)
   describe "Cassandra" do
     before do
       clear_all_traces
 
-      @client = Cassandra.new("system", "127.0.0.1:9160", { :timeout => 10 })
+      @client = Cassandra.new("system", ENV['TV_CASSANDRA_SERVER'], { :timeout => 10 })
       @client.disable_node_auto_discovery!
 
       @ks_name = "AppNetaCassandraTest"
@@ -34,8 +41,8 @@ unless defined?(JRUBY_VERSION)
       @entry_kvs = {
         'Layer' => 'cassandra',
         'Label' => 'entry',
-        'RemoteHost' => '127.0.0.1',
-        'RemotePort' => '9160' }
+        'RemoteHost' => ENV['TV_CASSANDRA_SERVER'].split(':')[0],
+        'RemotePort' => ENV['TV_CASSANDRA_SERVER'].split(':')[1] }
 
       @exit_kvs = { 'Layer' => 'cassandra', 'Label' => 'exit' }
       @collect_backtraces = TraceView::Config[:cassandra][:collect_backtraces]

data/test/instrumentation/dalli_test.rb

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

data/test/instrumentation/em_http_request_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 # Disable this test on JRuby until we can investigate

data/test/instrumentation/excon_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 require 'traceview/inst/rack'
 require File.expand_path(File.dirname(__FILE__) + '../../frameworks/apps/sinatra_simple')

data/test/instrumentation/faraday_test.rb

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

data/test/instrumentation/http_test.rb

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

data/test/instrumentation/httpclient_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 require 'traceview/inst/rack'
 require File.expand_path(File.dirname(__FILE__) + '../../frameworks/apps/sinatra_simple')

data/test/instrumentation/memcache_test.rb

@@ -1,5 +1,14 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
+
+# FIXME: Since memcache is loaded late, the instrumentation
+# loaded out of order.  Here we force inject instrumentation
 require 'memcache'
+::MemCache.class_eval do
+  include TraceView::Inst::MemCache
+end
 
 describe "Memcache" do
   before do

data/test/instrumentation/memcached_test.rb

@@ -1,3 +1,6 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
 if RUBY_VERSION < '2.0' and not defined?(JRUBY_VERSION)

data/test/instrumentation/mongo_test.rb

@@ -1,10 +1,21 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
+unless ENV['TV_MONGO_SERVER']
+  ENV['TV_MONGO_SERVER'] = "127.0.0.1:27017"
+end
+
 if defined?(::BSON::VERSION) and (BSON::VERSION < "2.0")
   describe "Mongo" do
     before do
       clear_all_traces
-      @connection = Mongo::Connection.new("localhost", 27017, :slave_ok => true)
+
+      @mongo_server = ENV['TV_MONGO_SERVER'].split(':')[0]
+      @mongo_port   = ENV['TV_MONGO_SERVER'].split(':')[1]
+
+      @connection = Mongo::Connection.new(@mongo_server, @mongo_port, :slave_ok => true)
       @db = @connection.db("test-#{ENV['RACK_ENV']}")
 
       @collections = @db.collection_names
@@ -16,8 +27,8 @@ if defined?(::BSON::VERSION) and (BSON::VERSION < "2.0")
         'Label' => 'entry',
         'Flavor' => 'mongodb',
         'Database' => 'test-test',
-        'RemoteHost' => 'localhost',
-        'RemotePort' => '27017' }
+        'RemoteHost' => @mongo_server,
+        'RemotePort' => @mongo_port }
 
       @exit_kvs = { 'Layer' => 'mongo', 'Label' => 'exit' }
       @collect_backtraces = TraceView::Config[:mongo][:collect_backtraces]

data/test/instrumentation/moped_test.rb

@@ -1,14 +1,22 @@
+# Copyright (c) 2015 AppNeta, Inc.
+# All rights reserved.
+
 require 'minitest_helper'
 
+unless ENV['TV_MONGO_SERVER']
+  ENV['TV_MONGO_SERVER'] = "127.0.0.1:27017"
+end
+
 if RUBY_VERSION >= '1.9.3'
   # Moped is tested against MRI 1.9.3, 2.0.0, and JRuby (1.9).
 
   describe "Moped" do
     before do
       clear_all_traces
-      @session = Moped::Session.new([ "127.0.0.1:27017" ])
+      @session = Moped::Session.new([ ENV['TV_MONGO_SERVER'] ])
       @session.use :moped_test
       @users = @session[:users]
+      @users.drop
       @users.insert({ :name => "Syd", :city => "Boston" })
 
       # These are standard entry/exit KVs that are passed up with all moped operations
@@ -17,8 +25,8 @@ if RUBY_VERSION >= '1.9.3'
         'Label' => 'entry',
         'Flavor' => 'mongodb',
         'Database' => 'moped_test',
-        'RemoteHost' => '127.0.0.1',
-        'RemotePort' => 27017 }
+        'RemoteHost' => ENV['TV_MONGO_SERVER'].split(':')[0],
+        'RemotePort' => ENV['TV_MONGO_SERVER'].split(':')[1].to_i }
 
       @exit_kvs = { 'Layer' => 'mongo', 'Label' => 'exit' }
       @collect_backtraces = TraceView::Config[:moped][:collect_backtraces]
@@ -252,10 +260,25 @@ if RUBY_VERSION >= '1.9.3'
     end
 
     it 'should trace find and update' do
+      2.times { @users.insert(:name => "Mary") }
+      mary_count = @users.find(:name => "Mary").count
+      mary_count.wont_equal 0
+
+      tool_count = @users.find(:name => "Tool").count
+      tool_count.must_equal 0
+
       TraceView::API.start_trace('moped_test', '', {}) do
-        @users.find(:name => "Mary").update({:name => "Tool"}, [:multi])
+        old_attrs = { :name => "Mary" }
+        new_attrs = { :name => "Tool" }
+        @users.find(old_attrs).update({ '$set' => new_attrs }, { :multi => true })
       end
 
+      new_tool_count = @users.find(:name => "Tool").count
+      new_tool_count.must_equal mary_count
+
+      new_mary_count = @users.find(:name => "Mary").count
+      new_mary_count.must_equal 0
+
       traces = get_all_traces
 
       traces.count.must_equal 6
@@ -270,8 +293,8 @@ if RUBY_VERSION >= '1.9.3'
 
       validate_event_keys(traces[3], @entry_kvs)
       traces[3]['QueryOp'].must_equal "update"
-      traces[3]['Update_Document'].must_equal "{\"name\":\"Tool\"}"
-      traces[3]['Flags'].must_equal "[:multi]"
+      traces[3]['Update_Document'].must_equal "{\"$set\":{\"name\":\"Tool\"}}"
+      traces[3]['Flags'].must_equal "{:multi=>true}"
       traces[3]['Collection'].must_equal "users"
       traces[3].has_key?('Backtrace').must_equal TraceView::Config[:moped][:collect_backtraces]
       validate_event_keys(traces[4], @exit_kvs)