traceview 3.8.0-java → 3.8.1-java

data/test/frameworks/rails5x_api_test.rb

@@ -8,11 +8,15 @@ if defined?(::Rails)
   describe "Rails5xAPI" do
     before do
       clear_all_traces
+      @collect_backtraces = TraceView::Config[:action_controller][:collect_backtraces]
       ENV['DBTYPE'] = "postgresql" unless ENV['DBTYPE']
     end
 
-    it "should trace a request to a rails api stack" do
+    after do
+      TraceView::Config[:action_controller][:collect_backtraces] = @collect_backtraces
+    end
 
+    it "should trace a request to a rails api stack" do
       uri = URI.parse('http://127.0.0.1:8150/monkey/hello')
       r = Net::HTTP.get_response(uri)
 
@@ -99,5 +103,98 @@ if defined?(::Rails)
       r.header['X-Trace'].must_equal traces[5]['X-Trace']
     end
 
+    it "should collect backtraces when true" do
+      TraceView::Config[:action_controller_api][:collect_backtraces] = true
+
+      uri = URI.parse('http://127.0.0.1:8150/monkey/hello')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 7
+      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"
+      traces[0]['Label'].must_equal "entry"
+      traces[0]['URL'].must_equal "/monkey/hello"
+
+      traces[1]['Layer'].must_equal "rack"
+      traces[1]['Label'].must_equal "info"
+
+      traces[2]['Layer'].must_equal "rails-api"
+      traces[2]['Label'].must_equal "entry"
+      traces[2]['Controller'].must_equal "MonkeyController"
+      traces[2]['Action'].must_equal "hello"
+      traces[2].key?('Backtrace').must_equal true
+
+      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-api"
+      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 NOT collect backtraces when false" do
+      TraceView::Config[:action_controller_api][:collect_backtraces] = false
+
+      uri = URI.parse('http://127.0.0.1:8150/monkey/hello')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 7
+      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"
+      traces[0]['Label'].must_equal "entry"
+      traces[0]['URL'].must_equal "/monkey/hello"
+
+      traces[1]['Layer'].must_equal "rack"
+      traces[1]['Label'].must_equal "info"
+
+      traces[2]['Layer'].must_equal "rails-api"
+      traces[2]['Label'].must_equal "entry"
+      traces[2]['Controller'].must_equal "MonkeyController"
+      traces[2]['Action'].must_equal "hello"
+      traces[2].key?('Backtrace').must_equal false
+
+      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-api"
+      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
   end
 end

data/test/frameworks/rails5x_test.rb

@@ -8,17 +8,20 @@ if defined?(::Rails)
   describe "Rails5x" do
     before do
       clear_all_traces
+      @collect_backtraces = TraceView::Config[:action_controller][:collect_backtraces]
       ENV['DBTYPE'] = "postgresql" unless ENV['DBTYPE']
     end
 
-    it "should trace a request to a rails stack" do
+    after do
+      TraceView::Config[:action_controller][:collect_backtraces] = @collect_backtraces
+    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
       unless defined?(JRUBY_VERSION)
         # We don't test this under JRuby because the Java instrumentation
@@ -209,5 +212,99 @@ if defined?(::Rails)
       r.header.key?('X-Trace').must_equal true
       r.header['X-Trace'].must_equal traces[4]['X-Trace']
     end
+
+    it "should collect backtraces when true" do
+      TraceView::Config[:action_controller][:collect_backtraces] = true
+
+      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
+      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"
+      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[2].key?('Backtrace').must_equal true
+
+      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 NOT collect backtraces when false" do
+      TraceView::Config[:action_controller][:collect_backtraces] = false
+
+      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
+      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"
+      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[2].key?('Backtrace').must_equal false
+
+      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
   end
 end

data/test/profiling/legacy_method_profiling_test.rb

@@ -3,7 +3,7 @@
 
 require 'minitest_helper'
 
-describe "TraceViewMethodProfiling" do
+describe "LegacyTraceViewMethodProfiling" do
   before do
     clear_all_traces
     # Conditionally Undefine TestWorker

data/test/support/backcompat_test.rb

@@ -30,8 +30,8 @@ describe "BackwardCompatibility" do
     TraceView::Config.sample_rate.must_equal 8e5
 
     Oboe::Config[:tracing_mode] = 'always'
-    Oboe::Config.tracing_mode.must_equal 'always'
-    TraceView::Config.tracing_mode.must_equal 'always'
+    Oboe::Config.tracing_mode.must_equal :always
+    TraceView::Config.tracing_mode.must_equal :always
 
     Oboe::Config[:sample_rate] = @sr
     Oboe::Config[:tracing_mode] = @tm

data/test/support/config_test.rb

@@ -19,7 +19,7 @@ describe "TraceView::Config" do
     #
     # TraceView::Config[:verbose].must_equal false
 
-    TraceView::Config[:tracing_mode].must_equal "through"
+    TraceView::Config[:tracing_mode].must_equal :through
     TraceView::Config[:reporter_host].must_equal "127.0.0.1"
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traceview
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.8.1
 platform: java
 authors:
 - Peter Giacomo Lombardo
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json