newrelic_rpm 3.6.7.159 → 3.6.8.164

data/lib/new_relic/agent.rb

@@ -89,7 +89,7 @@ module NewRelic
     require 'new_relic/agent/stats_engine'
     require 'new_relic/agent/transaction_sampler'
     require 'new_relic/agent/sql_sampler'
-    require 'new_relic/agent/commands/thread_profiler'
+    require 'new_relic/agent/commands/thread_profiler_session'
     require 'new_relic/agent/error_collector'
     require 'new_relic/agent/busy_calculator'
     require 'new_relic/agent/sampler'

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: ac5ce2fccf1bb387f330b48102db9954822f6b53
-module NewRelic; module VERSION; BUILD='159'; end; end
+# GITSHA: 2af3914786d2a12b3cda44aa4f5f453ea1f845f8
+module NewRelic; module VERSION; BUILD='164'; end; end

data/lib/new_relic/coerce.rb

@@ -17,6 +17,14 @@ module NewRelic
       0
     end
 
+    def int_or_nil(value, context=nil)
+      return nil if value.nil?
+      Integer(value)
+    rescue => error
+      log_failure(value, Integer, context, error)
+      nil
+    end
+
     def float(value, context=nil)
       result = Float(value)
       raise "Value #{result.inspect} is not finite." unless result.finite?

data/lib/new_relic/control/instance_methods.rb

@@ -4,6 +4,7 @@
 
 require 'new_relic/language_support'
 require 'new_relic/agent/null_logger'
+require 'new_relic/agent/memory_logger'
 require 'new_relic/agent/agent_logger'
 
 module NewRelic

data/lib/new_relic/rack/browser_monitoring.rb

@@ -89,9 +89,23 @@ module NewRelic::Rack
           end
         end
       end
-      headers['Content-Length'] = source.length.to_s if headers['Content-Length']
+
+      if headers['Content-Length']
+        headers['Content-Length'] = calculate_content_length(source).to_s
+      end
+
       source
     end
+
+    # String does not respond to 'bytesize' in 1.8.6. Fortunately String#length
+    # returns bytes rather than characters in 1.8.6 so we can use that instead.
+    def calculate_content_length(source)
+      if source.respond_to?(:bytesize)
+        source.bytesize
+      else
+        source.length
+      end
+    end
   end
 
 end

data/lib/new_relic/rack/developer_mode.rb

@@ -241,7 +241,7 @@ module NewRelic
       end
 
       def get_samples
-        @samples = NewRelic::Agent.instance.transaction_sampler.samples.select do |sample|
+        @samples = NewRelic::Agent.instance.transaction_sampler.dev_mode_sample_buffer.samples.select do |sample|
           sample.params[:path] != nil
         end
 

data/lib/new_relic/transaction_sample.rb

@@ -15,8 +15,8 @@ module NewRelic
 
   class TransactionSample
 
-    attr_accessor(:params, :root_segment, :profile, :force_persist, :guid,
-                  :threshold)
+    attr_accessor :params, :root_segment, :profile, :force_persist, :guid,
+                  :threshold, :finished, :xray_session_id
     attr_reader :root_segment, :params, :sample_id
 
     @@start_time = Time.now
@@ -71,12 +71,14 @@ module NewRelic
       trace_tree = encoder.encode(self.to_array)
       [ Helper.time_to_millis(@start_time),
         Helper.time_to_millis(duration),
-        string(@params[:path]),
+        string(transaction_name),
         string(@params[:uri]),
         trace_tree,
         string(@guid),
         nil,
-        !!@force_persist ]
+        forced?,
+        int_or_nil(xray_session_id)
+      ]
     end
 
     def start_time
@@ -87,9 +89,21 @@ module NewRelic
       @root_segment.path_string
     end
 
+    def transaction_name
+      @params[:path]
+    end
+
+    def transaction_name=(new_name)
+      @params[:path] = new_name
+    end
+
+    def forced?
+      !!@force_persist || !int_or_nil(xray_session_id).nil?
+    end
+
     # relative_timestamp is seconds since the start of the transaction
     def create_segment(relative_timestamp, metric_name=nil, segment_id = nil)
-      raise TypeError.new("Frozen Transaction Sample") if frozen?
+      raise TypeError.new("Frozen Transaction Sample") if finished
       @params[:segment_count] += 1
       @segment_count += 1
       NewRelic::TransactionSample::Segment.new(relative_timestamp, metric_name, segment_id)
@@ -176,6 +190,7 @@ module NewRelic
       sample.params.merge! self.params
       sample.guid = self.guid
       sample.force_persist = self.force_persist if self.force_persist
+      sample.xray_session_id = self.xray_session_id
 
       build_segment_for_transfer(sample, @root_segment, sample.root_segment, options)
 

data/lib/new_relic/version.rb

@@ -12,7 +12,7 @@ module NewRelic
 
     MAJOR = 3
     MINOR = 6
-    TINY  = 7
+    TINY  = 8
 
     begin
       require File.join(File.dirname(__FILE__), 'build')

data/newrelic.yml

@@ -188,18 +188,16 @@ common: &default_settings
 
 development:
   <<: *default_settings
-  # Turn off communication to New Relic service in development mode (also
-  # 'enabled').
-  # NOTE: for initial evaluation purposes, you may want to temporarily
-  # turn the agent on in development mode.
-  monitor_mode: false
+  # Turn on communication to New Relic service in development mode
+  monitor_mode: true
+  app_name: <%= @app_name %> (Development)
 
   # Rails Only - when running in Developer Mode, the New Relic Agent will
   # present performance information on the last 100 transactions you have
   # executed since starting the mongrel.
   # NOTE: There is substantial overhead when running in developer mode.
   # Do not use for production or load testing.
-  developer_mode: true
+  developer_mode: false
 
   # Enable textmate links
   # textmate: true

data/newrelic_rpm.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
   s.version = NewRelic::VERSION::STRING
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Jason Clark", "Sam Goldstein", "Michael Granger", "Jonan Scheffler", "Ben Weintraub" ]
+  s.authors = [ "Jason Clark", "Sam Goldstein", "Jonan Scheffler", "Ben Weintraub" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.description = <<-EOS
 New Relic is a performance management system, developed by New Relic,

data/test/agent_helper.rb

@@ -97,6 +97,11 @@ unless defined?( assert_not_includes )
   end
 end
 
+def assert_equal_unordered(left, right)
+  assert_equal(left.length, right.length, "Lengths don't match. #{left.length} != #{right.length}")
+  left.each { |element| assert_includes(right, element) }
+end
+
 def compare_metrics(expected, actual)
   actual.delete_if {|a| a.include?('GC/cumulative') } # in case we are in REE
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
@@ -184,6 +189,12 @@ def assert_falsy(expected, msg = nil)
   assert_block( msg ) { !expected }
 end
 
+unless defined?( assert_false )
+  def assert_false(expected)
+    assert_equal false, expected
+  end
+end
+
 # Mock up a transaction for testing purposes, optionally specifying a name and
 # transaction type. The given block will be executed within the context of the
 # dummy transaction.

data/test/environments/lib/environments/runner.rb

@@ -87,7 +87,11 @@ module Environments
 
     def bundle(dir)
       puts "Bundling..."
-      bundling = `cd #{dir} && bundle install`
+      bundling = `cd #{dir} && bundle install --local`
+      unless $?.success?
+        puts "Failed local bundle, trying again with full bundle..."
+        bundling = `cd #{dir} && bundle install`
+      end
       puts red(bundling) unless $?.success?
     end
 

data/test/environments/rails21/Gemfile

@@ -13,8 +13,8 @@ gem 'rack-test'
 gem 'newrelic_rpm', :path => "../../.."
 
 if (RUBY_PLATFORM == 'java')
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
+  gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 else
   gem "mysql", RUBY_VERSION == '1.8.6' ? '2.7' : '2.8.1'

data/test/environments/rails22/Gemfile

@@ -12,8 +12,8 @@ gem 'rack-test'
 gem 'newrelic_rpm', :path => '../../..'
 
 if (RUBY_PLATFORM == 'java')
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
+  gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 else
   gem "sqlite3-ruby", "1.2.5"

data/test/environments/rails23/Gemfile

@@ -11,8 +11,8 @@ gem 'rack-test'
 gem "newrelic_rpm", :path => '../../..'
 
 if(RUBY_PLATFORM == 'java')
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
+  gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 else
   gem "mysql", RUBY_VERSION == '1.8.6' ? '2.7' : '2.8.1'

data/test/environments/rails31/Gemfile

@@ -8,8 +8,8 @@ gem 'rack'
 gem 'rack-test'
 
 if (RUBY_PLATFORM == 'java')
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
+  gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 else
   gem "mysql"

data/test/environments/rails32/Gemfile

@@ -9,8 +9,8 @@ gem 'rack'
 gem 'rack-test'
 
 platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
+  gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
   gem "jruby-openssl"
 end
 

data/test/multiverse/suites/agent_only/marshaling_test.rb

@@ -28,7 +28,7 @@ class MarshalingTest < MiniTest::Unit::TestCase
     sampler.notice_scope_empty(OpenStruct.new(:name => 'path',
                                                :custom_parameters => {}))
 
-    expected_sample = sampler.instance_variable_get(:@slowest_sample)
+    expected_sample = sampler.last_sample
 
     agent.service.connect
     agent.send(:harvest_and_send_slowest_sample)

data/test/multiverse/suites/agent_only/testing_app.rb

@@ -17,6 +17,12 @@ class TestingApp
   end
 
   def call(env)
+    request = Rack::Request.new(env)
+    params = request.params
+    if params['transaction_name']
+      NewRelic::Agent.set_transaction_name(params['transaction_name'])
+    end
+    sleep(params['sleep'].to_f) if params['sleep']
     [200, headers, [response]]
   end
 

data/test/multiverse/suites/agent_only/thread_profiling_test.rb

@@ -23,7 +23,7 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
     agent.service.request_timeout = 0.5
     agent.service.agent_id = 666
 
-    @thread_profiler = agent.thread_profiler
+    @thread_profiler_session = agent.agent_command_router.thread_profiler_session
     @threads = []
   end
 
@@ -69,7 +69,7 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
 
     profile_data = $collector.calls_for('profile_data')[0]
     assert_equal('666', profile_data.run_id, "Missing run_id, profile_data was #{profile_data.inspect}")
-    assert(profile_data.poll_count > 10, "Expected poll_count > 10, but was #{profile_data.poll_count}")
+    assert(profile_data.sample_count > 10, "Expected sample_count > 10, but was #{profile_data.sample_count}")
 
     assert_saw_traces(profile_data, "OTHER")
     assert_saw_traces(profile_data, "AGENT")
@@ -85,12 +85,12 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
 
     profile_data = $collector.calls_for('profile_data')[0]
     assert_equal('666', profile_data.run_id, "Missing run_id, profile_data was #{profile_data.inspect}")
-    assert(profile_data.poll_count < 50, "Expected poll_count < 50, but was #{profile_data.poll_count}")
+    assert(profile_data.sample_count < 50, "Expected sample_count < 50, but was #{profile_data.sample_count}")
   end
 
   def issue_command(cmd)
     $collector.stub('get_agent_commands', cmd)
-    agent.send(:handle_agent_commands)
+    agent.send(:check_for_and_handle_agent_commands)
   end
 
   # Runs a thread we expect to span entire test and be killed at the end
@@ -103,7 +103,7 @@ class ThreadProfilingTest < MiniTest::Unit::TestCase
 
   def let_it_finish
     Timeout.timeout(5) do
-      until @thread_profiler.finished?
+      until @thread_profiler_session.ready_to_harvest?
         sleep(0.1)
       end
     end

data/test/multiverse/suites/agent_only/xray_sessions_test.rb

@@ -0,0 +1,163 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+# https://newrelic.atlassian.net/wiki/display/eng/Agent+Thread+Profiling
+# https://newrelic.atlassian.net/browse/RUBY-917
+
+if RUBY_VERSION >= '1.9'
+
+require 'rack/test'
+require 'multiverse_helpers'
+require './testing_app'
+
+class XraySessionsTest < MiniTest::Unit::TestCase
+
+  AGENT_RUN_ID = 123
+
+  include MultiverseHelpers
+  include Rack::Test::Methods
+
+  setup_and_teardown_agent() do |collector|
+    collector.stub('connect', {"agent_run_id" => AGENT_RUN_ID })
+  end
+
+  def after_setup
+    agent.service.request_timeout = 0.5
+    agent.service.agent_id = AGENT_RUN_ID
+  end
+
+  def app
+    @app ||= TestingApp.new
+  end
+
+  def test_tags_transaction_traces_with_xray_id
+    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
+    with_xray_sessions(session) do
+      5.times { get '/?transaction_name=A' }
+      trigger_harvest
+    end
+
+    posts = $collector.calls_for('transaction_sample_data')
+    assert_equal(1, posts.size, "Expected exactly one transaction_sample_data post")
+
+    traces = posts.first.samples
+    assert_equal(5, traces.size)
+    assert traces.all? { |t| t.metric_name == 'Controller/Rack/A' }
+    assert traces.all? { |t| t.xray_id == session['x_ray_id'] }
+  end
+
+  def test_does_not_collect_traces_for_non_xrayed_transactions
+    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
+    with_xray_sessions(session) do
+      get '/?transaction_name=OtherThing'
+      get '/?transaction_name=A'
+      trigger_harvest
+    end
+
+    posts = $collector.calls_for('transaction_sample_data')
+    assert_equal(1, posts.size, "Expected exactly one transaction_sample_data post")
+
+    # We expect exactly one transaction trace, for A only
+    assert_equal(1, posts.first.samples.size)
+  end
+
+  def test_gathers_transaction_traces_from_multiple_concurrent_xray_sessions
+    sessionA = build_xray_session('x_ray_id' => 12, 'key_transaction_name' => 'Controller/Rack/A')
+    sessionB = build_xray_session('x_ray_id' => 13, 'key_transaction_name' => 'Controller/Rack/B')
+
+    with_xray_sessions(sessionA, sessionB) do
+      2.times do
+        get '/?transaction_name=A'
+        get '/?transaction_name=B'
+      end
+      trigger_harvest
+    end
+
+    posts = $collector.calls_for('transaction_sample_data')
+    assert_equal(1, posts.size, "Expected exactly one transaction_sample_data post")
+
+    traces = posts.first.samples
+    assert_equal(4, traces.size)
+
+    tracesA = traces.select { |t| t.metric_name == 'Controller/Rack/A' }
+    tracesB = traces.select { |t| t.metric_name == 'Controller/Rack/B' }
+    assert_equal(2, tracesA.size, "Expected 2 traces for transaction A")
+    assert_equal(2, tracesB.size, "Expected 2 traces for transaction B")
+  end
+
+  def test_gathers_thread_profiles
+    session = build_xray_session('key_transaction_name' => 'Controller/Rack/A')
+    with_xray_sessions(session) do
+      get '/?transaction_name=A&sleep=1'
+      trigger_harvest
+    end
+
+    # assert that a thread profile was submitted
+    posts = $collector.calls_for('profile_data')
+    assert_equal(1, posts.size, "Expected exactly one profile_data post")
+
+    profile_data_post = posts.first
+    assert(profile_data_post.sample_count > 1, "Expected at least one sample")
+    assert_saw_traces(profile_data_post, 'REQUEST')
+  end
+
+  ## Helpers
+
+  def next_xray_session_id
+    @xray_session_id ||= 0
+    @xray_session_id += 1
+    @xray_session_id
+  end
+
+  def build_xray_session(overrides={})
+    defaults = {
+      "x_ray_id"              => next_xray_session_id,
+      "xray_session_name"     => "Test XRay Session",
+      "key_transaction_name"  => "Controller/Rack/Transaction",
+      "requested_trace_count" => 10,
+      "duration"              => 100,
+      "sample_period"         => 0.1,
+      "run_profiler"          => true
+    }
+    defaults.merge(overrides)
+  end
+
+  def build_active_xrays_command(active_xray_ids)
+    [[
+      AGENT_RUN_ID,
+      {
+        'name' => 'active_xray_sessions',
+        'arguments' => { 'xray_ids' => active_xray_ids }
+      }
+    ]]
+  end
+
+  def with_xray_sessions(*xray_metadatas)
+    xray_session_ids = xray_metadatas.map { |m| m['x_ray_id'] }
+    activate_cmd = build_active_xrays_command(xray_session_ids)
+    
+    $collector.stub('get_xray_metadata', xray_metadatas)
+    issue_command(activate_cmd)
+
+    yield
+
+    deactivate_cmd = build_active_xrays_command([])
+    issue_command(deactivate_cmd)
+  end
+
+  def issue_command(cmd)
+    $collector.stub('get_agent_commands', cmd)
+    agent.send(:check_for_and_handle_agent_commands)
+  end
+
+  def trigger_harvest
+    agent.send(:transmit_data)
+  end
+
+  def assert_saw_traces(profile_data, type)
+    assert !profile_data.traces[type].empty?, "Missing #{type} traces"
+  end
+
+end
+end