newrelic_rpm 3.2.0.1 → 3.3.0.beta1

data/lib/new_relic/rack/browser_monitoring.rb

@@ -10,18 +10,47 @@ module NewRelic::Rack
     # method required by Rack interface
     def call(env)
       
-      # clear out the thread locals we use in case this is a static request
-      Thread.current[:newrelic_most_recent_transaction] = nil
-      Thread.current[:newrelic_start_time] = Time.now
-      Thread.current[:newrelic_queue_time] = 0
+      req = Rack::Request.new(env)
+      
+      # clear any previous transaction info
+      NewRelic::Agent::TransactionInfo.clear
+      
+      agent_flag = req.cookies['NRAGENT']
+      
+      if agent_flag
+        s = agent_flag.split("=")
+        if s.length == 2
+          if s[0] == "tk" && s[1]
+            NewRelic::Agent::TransactionInfo.get.token = s[1]
+          end
+        end
+      end
+      
+      # Two experimental options for allowing TT capture based on http params
+      #
+      if req.params['nr_capture_deep_tt']
+        # NewRelic::Agent::TransactionInfo.get.force_persist = true
+        # NewRelic::Agent::TransactionInfo.get.capture_deep_tt = true
+      end
+      
+      if req.params['nr_capture_tt']
+        # NewRelic::Agent::TransactionInfo.get.force_persist = true
+      end
       
       result = @app.call(env)   # [status, headers, response]
-
+      
       if (NewRelic::Agent.browser_timing_header != "") && should_instrument?(result[0], result[1])
         response_string = autoinstrument_source(result[2], result[1])
 
-        if (response_string)
-          Rack::Response.new(response_string, result[0], result[1]).finish
+        if response_string
+          response = Rack::Response.new(response_string, result[0], result[1])
+
+          if NewRelic::Agent::TransactionInfo.get.token
+            # clear the cookie via expiration in the past
+            response.set_cookie("NRAGENT", {:value => "tk=", :path => "/", :expires => Time.now-(24* 60*60)})
+          end
+
+          response.finish
         else
           result
         end
@@ -36,7 +65,7 @@ module NewRelic::Rack
 
     def autoinstrument_source(response, headers)
       source = nil
-      response.each {|fragment| (source) ? (source << fragment) : (source = fragment)}
+      response.each {|fragment| source ? (source << fragment.to_s) : (source = fragment.to_s)}
       return nil unless source
       
       body_start = source.index("<body")
@@ -65,4 +94,5 @@ module NewRelic::Rack
       source
     end
   end
+  
 end

data/lib/new_relic/transaction_sample.rb

@@ -9,11 +9,8 @@ module NewRelic
 
   class TransactionSample
 
-    attr_accessor :params, :root_segment
-    attr_accessor :profile
-    attr_reader :root_segment
-    attr_reader :params
-    attr_reader :sample_id
+    attr_accessor :params, :root_segment, :profile, :force_persist, :guid
+    attr_reader :root_segment, :params, :sample_id
 
     @@start_time = Time.now
 
@@ -25,12 +22,15 @@ module NewRelic
       @root_segment = create_segment 0.0, "ROOT"
       @params = {}
       @params[:request_params] = {}
+      
+      @guid = (0..15).to_a.map{|a| rand(16).to_s(16)}.join  # a 64 bit random GUID
+      NewRelic::Agent::TransactionInfo.get.guid = @guid
     end
 
     def count_segments
       @root_segment.count_segments - 1    # don't count the root segment
     end
-    
+        
     # Truncates the transaction sample to a maximum length determined
     # by the passed-in parameter. Operates recursively on the entire
     # tree of transaction segments in a depth-first manner
@@ -154,6 +154,8 @@ module NewRelic
       sample = TransactionSample.new(@start_time, sample_id)
 
       sample.params.merge! self.params
+      sample.guid = self.guid
+      sample.force_persist = self.force_persist if self.force_persist
 
       begin
         build_segment_for_transfer(sample, @root_segment, sample.root_segment, options)

data/lib/new_relic/version.rb

@@ -2,9 +2,9 @@
 module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
-    BUILD = 1 #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta1' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic.yml

@@ -96,7 +96,7 @@ common: &default_settings
   # as Tolerating transactions; and more than four times the apdex_t
   # value as Frustrating transactions. 
   # For more about the Apdex standard, see
-  # http://newrelic.com/docs/general/apdex
+  # http://support.newrelic.com/faqs/general/apdex
 
   apdex_t: 0.5
   

data/newrelic_rpm.gemspec

@@ -4,8 +4,8 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "newrelic_rpm"
-  s.version = "3.2.0.1"
+  s.name = %q{newrelic_rpm}
+  s.version = "3.3.0.beta1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Bill Kayser}, %q{Jon Guymon}, %q{Justin George}, %q{Darin Swanson}]
@@ -81,9 +81,11 @@ http://github.com/newrelic/rpm/
     "lib/new_relic/agent/shim_agent.rb",
     "lib/new_relic/agent/sql_sampler.rb",
     "lib/new_relic/agent/stats_engine.rb",
+    "lib/new_relic/agent/stats_engine/gc_profiler.rb",
     "lib/new_relic/agent/stats_engine/metric_stats.rb",
     "lib/new_relic/agent/stats_engine/samplers.rb",
     "lib/new_relic/agent/stats_engine/transactions.rb",
+    "lib/new_relic/agent/transaction_info.rb",
     "lib/new_relic/agent/transaction_sample_builder.rb",
     "lib/new_relic/agent/transaction_sampler.rb",
     "lib/new_relic/agent/worker_loop.rb",
@@ -188,6 +190,7 @@ http://github.com/newrelic/rpm/
     "test/new_relic/delayed_job_injection_test.rb",
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
+    "test/new_relic/metric_parser/metric_parser_test.rb",
     "test/new_relic/metric_spec_test.rb",
     "test/new_relic/rack/all_test.rb",
     "test/new_relic/rack/browser_monitoring_test.rb",
@@ -302,7 +305,7 @@ Refer to the README.md file for more information.
 
 Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
 for a complete description of the features and enhancements available
-in version 3.2 of the Ruby Agent.
+in version 3.3 of the Ruby Agent.
   
 }
   s.rubygems_version = %q{1.3.6}

data/test/new_relic/agent/agent/connect_test.rb

@@ -230,18 +230,20 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     @config_should_send_samples = true
     @should_send_random_samples = true
     @slowest_transaction_threshold = 5
-    log.expects(:debug).with('Transaction tracing threshold is 5 seconds.')
+    log.stubs(:debug)
     self.expects(:enable_random_samples!).with(10)
     configure_transaction_tracer!(true, 10)
     assert @should_send_samples
+    assert_equal 5, @transaction_sampler.slow_capture_threshold
   end
 
   def test_configure_transaction_tracer_positive
     @config_should_send_samples = true
     @slowest_transaction_threshold = 5
-    log.expects(:debug).with('Transaction tracing threshold is 5 seconds.')
+    log.stubs(:debug)
     configure_transaction_tracer!(true, 10)
     assert @should_send_samples
+    assert_equal 5, @transaction_sampler.slow_capture_threshold
   end
 
   def test_configure_transaction_tracer_negative
@@ -338,15 +340,6 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
     assert_equal 'initial value', @collector, "should not modify collector value"
   end
 
-  def test_configure_transaction_tracer_random_samples
-    @config_should_send_samples = true
-    @should_send_random_samples = true
-    self.expects(:enable_random_samples!).with(10)
-    log.expects(:debug)
-    configure_transaction_tracer!(true, 10)
-    assert @should_send_samples
-  end
-
   def test_query_server_for_configuration
     self.expects(:set_collector_host!)
     self.expects(:connect_to_server).returns("so happy")

data/test/new_relic/agent/beacon_configuration_test.rb

@@ -19,7 +19,8 @@ class NewRelic::Agent::BeaconConfigurationTest < Test::Unit::TestCase
     assert_equal('a browser monitoring key', bc.browser_monitoring_key)
     assert_equal('an application id', bc.application_id)
     assert_equal('a beacon', bc.beacon)
-    assert_equal(117, bc.browser_timing_header.size, "should output the javascript with all the data available")
+    s = "<script type=\"text/javascript\">var NREUMQ=NREUMQ||[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>"
+    assert_equal(s, bc.browser_timing_header)
   end
 
   def test_license_bytes_nil
@@ -81,22 +82,24 @@ class NewRelic::Agent::BeaconConfigurationTest < Test::Unit::TestCase
   def test_build_load_file_js_load_episodes_file_false
     connect_data = {'rum.load_episodes_file' => false}
     bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(160, bc.build_load_file_js(connect_data).size,
-                 "should include timing footer but not rum.js load")
+    s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
+    assert_equal(s, bc.build_load_file_js(connect_data))
   end
   
   def test_build_load_file_js_load_episodes_file_missing
     connect_data = {}
     bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(278, bc.build_load_file_js(connect_data).size,
-                 "should output the javascript when there is no configuration")
+    s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
+    
+    assert_equal(s, bc.build_load_file_js(connect_data))
   end
 
   def test_build_load_file_js_load_episodes_file_present
     connect_data = {'rum.load_episodes_file' => true}
     bc = NewRelic::Agent::BeaconConfiguration.new(connect_data)
-    assert_equal(278, bc.build_load_file_js(connect_data).size,
-            "should output the javascript when rum.load_episodes_file is true")
+    s = "if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\n"
+    
+    assert_equal(s, bc.build_load_file_js(connect_data))
   end
   
   def test_build_load_file_js_load_episodes_file_with_episodes_url

data/test/new_relic/agent/browser_monitoring_test.rb

@@ -4,7 +4,8 @@ require "new_relic/agent/browser_monitoring"
 
 class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
   include NewRelic::Agent::BrowserMonitoring
-
+  include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+  
   def setup
     NewRelic::Agent.manual_start
     @browser_monitoring_key = "fred"
@@ -12,14 +13,12 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     NewRelic::Agent.instance.instance_eval do
       @beacon_configuration = NewRelic::Agent::BeaconConfiguration.new({"rum.enabled" => true, "browser_key" => "browserKey", "application_id" => "apId", "beacon"=>"beacon", "episodes_url"=>"this_is_my_file"})
     end
-    Thread.current[:newrelic_most_recent_transaction] = "MyCoolTransaction"
+    Thread.current[:last_metric_frame] = nil
+    NewRelic::Agent::TransactionInfo.clear
   end
 
   def teardown
     mocha_teardown
-    Thread.current[:newrelic_start_time] = nil
-    Thread.current[:newrelic_metric_frame] = nil
-    Thread.current[:newrelic_most_recent_transaction] = nil
   end
 
   def test_browser_timing_header_with_no_beacon_configuration
@@ -65,8 +64,6 @@ class NewRelic::Agent::BrowserMonitoringTest < Test::Unit::TestCase
     browser_timing_header
     NewRelic::Control.instance.expects(:license_key).returns("a" * 13)
 
-    Thread.current[:newrelic_start_time] = Time.now
-
     footer = browser_timing_footer
     snippet = '<script type="text/javascript">if (!NREUMQ.f) { NREUMQ.f=function() {
 NREUMQ.push(["load",new Date().getTime()]);
@@ -74,11 +71,6 @@ var e=document.createElement("script");'
     assert footer.include?(snippet), "Expected footer to include snippet: #{snippet}, but instead was #{footer}"
   end
 
-  def test_browser_timing_footer_without_calling_header
-    Thread.current[:newrelic_start_time] = nil    
-    assert_equal "", browser_timing_footer
-  end
-
   def test_browser_timing_footer_with_no_browser_key_rum_enabled
     browser_timing_header
     NewRelic::Agent.instance.expects(:beacon_configuration).returns( NewRelic::Agent::BeaconConfiguration.new({"rum.enabled" => true, "application_id" => "apId", "beacon"=>"beacon", "episodes_url"=>"this_is_my_file"}))
@@ -95,7 +87,6 @@ var e=document.createElement("script");'
 
   def test_browser_timing_footer_with_rum_enabled_not_specified
     browser_timing_header
-    Thread.current[:newrelic_start_time] = Time.now
 
     license_bytes = [];
     ("a" * 13).each_byte {|byte| license_bytes << byte}
@@ -118,14 +109,6 @@ var e=document.createElement("script");'
     assert_equal "", footer
   end
 
-  def test_browser_timing_footer_with_no_start_time
-    browser_timing_header
-    Thread.current[:newrelic_start_time] = nil
-    NewRelic::Agent.instance.expects(:beacon_configuration).returns( NewRelic::Agent::BeaconConfiguration.new({"browser_key" => "browserKey", "application_id" => "apId", "beacon"=>"beacon", "episodes_url"=>"this_is_my_file"}))
-    footer = browser_timing_footer
-    assert_equal('', footer)
-  end
-
 
   def test_browser_timing_footer_disable_all_tracing
     browser_timing_header
@@ -157,37 +140,62 @@ var e=document.createElement("script");'
 
   def test_generate_footer_js_null_case
     self.expects(:browser_monitoring_start_time).returns(nil)
-    assert_equal('', generate_footer_js, "should not send javascript when there is no start time")
+    assert_equal('', generate_footer_js(NewRelic::Agent.instance.beacon_configuration), "should not send javascript when there is no start time")
   end
-
+ 
   def test_generate_footer_js_with_start_time
     self.expects(:browser_monitoring_start_time).returns(Time.at(100))
     fake_bc = mock('beacon configuration')
     fake_bc.expects(:application_id).returns(1)
     fake_bc.expects(:beacon).returns('beacon')
     fake_bc.expects(:browser_monitoring_key).returns('a' * 40)
-    NewRelic::Agent.instance.expects(:beacon_configuration).returns(fake_bc)
-    self.expects(:footer_js_string).with('beacon', 'a' * 40, 1).returns('footer js')
-    assert_equal('footer js', generate_footer_js, 'should generate and return the footer JS when there is a start time')
+    NewRelic::Agent.instance.stubs(:beacon_configuration).returns(fake_bc)
+    self.expects(:footer_js_string).with(NewRelic::Agent.instance.beacon_configuration, 'beacon', 'a' * 40, 1).returns('footer js')
+    assert_equal('footer js', generate_footer_js(NewRelic::Agent.instance.beacon_configuration), 'should generate and return the footer JS when there is a start time')
   end
 
   def test_browser_monitoring_transaction_name_basic
-    Thread.current[:newrelic_most_recent_transaction] = 'a transaction name'
+    mock = mock('transaction sample')
+    NewRelic::Agent::TransactionInfo.set(mock)
+    mock.stubs(:transaction_name).returns('a transaction name')
+
     assert_equal('a transaction name', browser_monitoring_transaction_name, "should take the value from the thread local")
   end
 
   def test_browser_monitoring_transaction_name_empty
-    Thread.current[:newrelic_most_recent_transaction] = ''
+    mock = mock('transaction sample')
+    NewRelic::Agent::TransactionInfo.set(mock)
+
+    mock.stubs(:transaction_name).returns('')
     assert_equal('', browser_monitoring_transaction_name, "should take the value even when it is empty")
   end
 
   def test_browser_monitoring_transaction_name_nil
-    Thread.current[:newrelic_most_recent_transaction] = nil
-    assert_equal('<unknown>', browser_monitoring_transaction_name, "should fill in a default when it is nil")
+    assert_equal('(unknown)', browser_monitoring_transaction_name, "should fill in a default when it is nil")
   end
+  
+  def test_browser_monitoring_transaction_name_when_tt_disabled
+    @sampler = NewRelic::Agent.instance.transaction_sampler
+    @sampler.disable
 
+    perform_action_with_newrelic_trace(:name => 'disabled_transactions') do
+      self.class.inspect
+    end
+        
+    assert_match(/disabled_transactions/, browser_monitoring_transaction_name,
+                 "should name transaction when transaction tracing disabled")
+  ensure
+    @sampler.enable
+  end
+  
+  
   def test_browser_monitoring_start_time
-    Thread.current[:newrelic_start_time] = Time.at(100)
+    mock = mock('transaction info')
+    
+    NewRelic::Agent::TransactionInfo.set(mock)
+    
+    mock.stubs(:start_time).returns(Time.at(100))
+    mock.stubs(:guid).returns('ABC')
     assert_equal(Time.at(100), browser_monitoring_start_time, "should take the value from the thread local")
   end
 
@@ -205,22 +213,24 @@ var e=document.createElement("script");'
   end
 
   def test_browser_monitoring_queue_time_nil
-    Thread.current[:newrelic_queue_time] = nil
     assert_equal(0.0, browser_monitoring_queue_time, 'should return zero when there is no queue time')
   end
 
   def test_browser_monitoring_queue_time_zero
-    Thread.current[:newrelic_queue_time] = 0.0
+    frame = Thread.current[:last_metric_frame] = mock('metric frame')
+    frame.expects(:queue_time).returns(0.0)
     assert_equal(0.0, browser_monitoring_queue_time, 'should return zero when there is zero queue time')
   end
 
   def test_browser_monitoring_queue_time_ducks
-    Thread.current[:newrelic_queue_time] = 'a duck'
+    frame = Thread.current[:last_metric_frame] = mock('metric frame')
+    frame.expects(:queue_time).returns('a duck')
     assert_equal(0.0, browser_monitoring_queue_time, 'should return zero when there is an incorrect queue time')
   end
 
   def test_browser_monitoring_queue_time_nonzero
-    Thread.current[:newrelic_queue_time] = 3.00002
+    frame = Thread.current[:last_metric_frame] = mock('metric frame')
+    frame.expects(:queue_time).returns(3.00002)
     assert_equal(3000, browser_monitoring_queue_time, 'should return a rounded time')
   end
 
@@ -229,16 +239,31 @@ var e=document.createElement("script");'
     license_key = ''
     application_id = 1
 
-    Thread.current[:newrelic_queue_time] = nil
     # mocking this because JRuby thinks that Time.now - Time.now
     # always takes at least 1ms
     self.expects(:browser_monitoring_app_time).returns(0)
-    Thread.current[:newrelic_most_recent_transaction] = 'most recent transaction'
-
-    self.expects(:obfuscate).with('most recent transaction').returns('most recent transaction')
-
-    value = footer_js_string(beacon, license_key, application_id)
-    assert_equal("<script type=\"text/javascript\">if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"this_is_my_file\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\nNREUMQ.push([\"nrf2\",\"\",\"\",1,\"most recent transaction\",0,0,new Date().getTime()])</script>", value, "should return the javascript given some default values")
+    frame = Thread.current[:last_metric_frame] = mock('metric frame')
+    user_attributes = {:user => "user", :account => "account", :product => "product"}
+    frame.expects(:user_attributes).returns(user_attributes).at_least_once
+    frame.expects(:queue_time).returns(0)
+
+    sample = mock('transaction info')
+    NewRelic::Agent::TransactionInfo.set(sample)
+    
+    sample.stubs(:start_time).returns(Time.at(100))
+    sample.stubs(:guid).returns('ABC')
+    sample.stubs(:transaction_name).returns('most recent transaction')
+    sample.stubs(:include_guid?).returns(true)
+    sample.stubs(:duration).returns(12.0)
+    sample.stubs(:token).returns('0123456789ABCDEF')
+    
+    self.expects(:obfuscate).with(NewRelic::Agent.instance.beacon_configuration, 'most recent transaction').returns('most recent transaction')
+    self.expects(:obfuscate).with(NewRelic::Agent.instance.beacon_configuration, 'user').returns('user')
+    self.expects(:obfuscate).with(NewRelic::Agent.instance.beacon_configuration, 'account').returns('account')
+    self.expects(:obfuscate).with(NewRelic::Agent.instance.beacon_configuration, 'product').returns('product')
+
+    value = footer_js_string(NewRelic::Agent.instance.beacon_configuration, beacon, license_key, application_id)
+    assert_equal("<script type=\"text/javascript\">if (!NREUMQ.f) { NREUMQ.f=function() {\nNREUMQ.push([\"load\",new Date().getTime()]);\nvar e=document.createElement(\"script\");\ne.type=\"text/javascript\";e.async=true;e.src=\"this_is_my_file\";\ndocument.body.appendChild(e);\nif(NREUMQ.a)NREUMQ.a();\n};\nNREUMQ.a=window.onload;window.onload=NREUMQ.f;\n};\nNREUMQ.push([\"nrfj\",\"\",\"\",1,\"most recent transaction\",0,0,new Date().getTime(),\"ABC\",\"0123456789ABCDEF\",\"user\",\"account\",\"product\"])</script>", value, "should return the javascript given some default values")
   end
 
   def test_html_safe_if_needed_unsafed
@@ -264,7 +289,7 @@ var e=document.createElement("script");'
     text = 'a happy piece of small text'
     key = (1..40).to_a
     NewRelic::Agent.instance.beacon_configuration.expects(:license_bytes).returns(key)
-    output = obfuscate(text)
+    output = obfuscate(NewRelic::Agent.instance.beacon_configuration, text)
     assert_equal('YCJrZXV2fih5Y25vaCFtZSR2a2ZkZSp/aXV1', output, "should output obfuscated text")
   end
 
@@ -272,7 +297,7 @@ var e=document.createElement("script");'
     text = 'a happy piece of small text' * 5
     key = (1..40).to_a
     NewRelic::Agent.instance.beacon_configuration.expects(:license_bytes).returns(key)
-    output = obfuscate(text)
+    output = obfuscate(NewRelic::Agent.instance.beacon_configuration, text)
     assert_equal('YCJrZXV2fih5Y25vaCFtZSR2a2ZkZSp/aXV1YyNsZHZ3cSl6YmluZCJsYiV1amllZit4aHl2YiRtZ3d4cCp7ZWhiZyNrYyZ0ZWhmZyx5ZHp3ZSVuZnh5cyt8ZGRhZiRqYCd7ZGtnYC11Z3twZCZvaXl6cix9aGdgYSVpYSh6Z2pgYSF2Znxx', output, "should output obfuscated text")
   end
 end