wd_newrelic_rpm 3.5.6 → 3.5.8

data/lib/new_relic/transaction_sample.rb

@@ -11,7 +11,8 @@ module NewRelic
 
   class TransactionSample
 
-    attr_accessor :params, :root_segment, :profile, :force_persist, :guid
+    attr_accessor(:params, :root_segment, :profile, :force_persist, :guid,
+                  :threshold)
     attr_reader :root_segment, :params, :sample_id
 
     @@start_time = Time.now

data/lib/new_relic/transaction_sample/segment.rb

@@ -8,9 +8,10 @@ module NewRelic
       # have a timestamp.
       attr_reader :exit_timestamp
       attr_reader :parent_segment
-      attr_reader :metric_name
       attr_reader :segment_id
 
+      attr_accessor :metric_name
+
       def initialize(timestamp, metric_name, segment_id)
         @entry_timestamp = timestamp
         @metric_name = metric_name || '<unknown>'

data/lib/new_relic/version.rb

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

data/newrelic.yml

@@ -16,7 +16,7 @@ common: &default_settings
   # account.  This key binds your Agent's data to your account in the
   # New Relic service.
   license_key: '<%= license_key %>'
-  
+
   # Agent Enabled (Rails Only)
   # Use this setting to force the agent to run or not run.
   # Default is 'auto' which means the agent will install and run only
@@ -26,7 +26,7 @@ common: &default_settings
   # Valid values are true, false and auto.
   #
   # agent_enabled: auto
-  
+
   # Application Name Set this to be the name of your application as
   # you'd like it show up in New Relic. The service will then auto-map
   # instances of your application into an "application" on your
@@ -41,12 +41,12 @@ common: &default_settings
   #   app_name:
   #       - Ajax Service
   #       - All Services
-  # 
+  #
   app_name: <%= @app_name %>
 
-  # When "true", the agent collects performance data about your 
-  # application and reports this data to the New Relic service at 
-  # newrelic.com. This global switch is normally overridden for each 
+  # When "true", the agent collects performance data about your
+  # application and reports this data to the New Relic service at
+  # newrelic.com. This global switch is normally overridden for each
   # environment below (formerly called 'enabled').
   monitor_mode: true
 
@@ -64,7 +64,7 @@ common: &default_settings
   # '/var/log/') The agent will attempt to create this directory if it
   # does not exist.
   # log_file_path: 'log'
-  
+
   # Optionally set the name of the log file, defaults to 'newrelic_agent.log'
   # log_file_name: 'newrelic_agent.log'
 
@@ -79,9 +79,9 @@ common: &default_settings
   # New Relic Real User Monitoring gives you insight into the performance real users are
   # experiencing with your website. This is accomplished by measuring the time it takes for
   # your users' browsers to download and render your web pages by injecting a small amount
-  # of JavaScript code into the header and footer of each page. 
+  # of JavaScript code into the header and footer of each page.
   browser_monitoring:
-      # By default the agent automatically injects the monitoring JavaScript 
+      # By default the agent automatically injects the monitoring JavaScript
       # into web pages. Set this attribute to false to turn off this behavior.
       auto_instrument: true
 
@@ -101,7 +101,7 @@ common: &default_settings
   # See: https://newrelic.com/docs/ruby/audit-log
   audit_log:
     enabled: false
-  
+
   # Tells transaction tracer and error collector (when enabled)
   # whether or not to capture HTTP params.  When true, frameworks can
   # exclude HTTP parameters from being captured.
@@ -111,18 +111,17 @@ common: &default_settings
   #     ex: ignored_params: credit_card, ssn, password 
   capture_params: false
 
-
   # Transaction tracer captures deep information about slow
   # transactions and sends this to the service once a
   # minute. Included in the transaction is the exact call sequence of
   # the transactions including any SQL statements issued.
   transaction_tracer:
-  
+
     # Transaction tracer is enabled by default. Set this to false to
     # turn it off. This feature is only available at the Professional
     # and above product levels.
     enabled: true
-    
+
     # Threshold in seconds for when to collect a transaction
     # trace. When the response time of a controller action exceeds
     # this threshold, a transaction trace will be recorded and sent to
@@ -130,13 +129,13 @@ common: &default_settings
     # "apdex_f", which will use the threshold for an dissatisfying
     # Apdex controller action - four times the Apdex T value.
     transaction_threshold: apdex_f
- 
+
     # When transaction tracer is on, SQL statements can optionally be
     # recorded. The recorder has three modes, "off" which sends no
     # SQL, "raw" which sends the SQL statement in its original form,
     # and "obfuscated", which strips out numeric and string literals.
     record_sql: obfuscated
-    
+
     # Threshold in seconds for when to collect stack trace for a SQL
     # call. In other words, when SQL statements exceed this threshold,
     # then capture and send the current stack trace. This is
@@ -148,42 +147,29 @@ common: &default_settings
     # set to false when using other adapters.
     # explain_enabled: true
 
-    # Threshold for query execution time below which query plans will not 
+    # Threshold for query execution time below which query plans will not
     # not be captured.  Relevant only when `explain_enabled` is true.
     # explain_threshold: 0.5
-  
+
   # Error collector captures information about uncaught exceptions and
   # sends them to the service for viewing.
   error_collector:
-    
+
     # Error collector is enabled by default. Set this to false to turn
     # it off. This feature is only available at the Professional and above
     # product levels.
     enabled: true
-    
-    # Rails Only - tells error collector whether or not to capture a 
-    # source snippet around the place of the error when errors are View 
+
+    # Rails Only - tells error collector whether or not to capture a
+    # source snippet around the place of the error when errors are View
     # related.
-    capture_source: true    
-    
+    capture_source: true
+
     # To stop specific errors from reporting to New Relic, set this property
     # to comma separated values.  Default is to ignore routing errors
     # which are how 404's get triggered.
     ignore_errors: ActionController::RoutingError
 
-  # (Advanced) Uncomment this to ensure the cpu and memory samplers
-  # won't run. Useful when you are using the agent to monitor an
-  # external resource.
-  # disable_samplers: true
-  
-  # If you aren't interested in visibility in these areas, you can
-  # disable the instrumentation to reduce overhead.
-  #
-  # disable_view_instrumentation: true
-  # disable_activerecord_instrumentation: true
-  # disable_memcache_instrumentation: true
-  # disable_dj: true
-
   # If you're interested in capturing memcache keys as though they
   # were SQL uncomment this flag. Note that this does increase
   # overhead slightly on every memcached call, and can have security
@@ -202,19 +188,19 @@ common: &default_settings
 
 development:
   <<: *default_settings
-  # Turn off communication to New Relic service in development mode (also 
+  # Turn off communication to New Relic service in development mode (also
   # 'enabled').
-  # NOTE: for initial evaluation purposes, you may want to temporarily 
+  # NOTE: for initial evaluation purposes, you may want to temporarily
   # turn the agent on in development mode.
   monitor_mode: false
 
-  # Rails Only - when running in Developer Mode, the New Relic Agent will 
+  # 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.  
+  # Do not use for production or load testing.
   developer_mode: true
-  
+
   # Enable textmate links
   # textmate: true
 

data/test/multiverse/suites/agent_only/Envfile

@@ -1,5 +1,9 @@
 gemfile <<-RB
   gem 'rack'
   gem 'rack-test'
-  gem 'mocha', '< 0.13'
+  if RUBY_VERSION >= '1.9.0'
+    gem 'mocha', '~> 0.13.0'
+  else
+    gem 'mocha', '< 0.13'
+  end
 RB

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

@@ -67,7 +67,7 @@ class AuditLogTest < Test::Unit::TestCase
   def run_agent_with_options(options)
     NewRelic::Agent.manual_start(options)
     yield NewRelic::Agent.agent if block_given?
-    NewRelic::Agent.shutdown    
+    NewRelic::Agent.shutdown
   end
 
   def test_logs_nothing_by_default
@@ -90,10 +90,8 @@ class AuditLogTest < Test::Unit::TestCase
       agent.sql_sampler.notice_scope_empty
       agent.send(:harvest_and_send_slowest_sql)
     end
-
     $collector.agent_data.each do |req|
-      body = $collector.unpack_inner_blobs(req)
-      assert_audit_log_contains_object(body, format)
+      assert_audit_log_contains_object(req.body, format)
     end
   end
 end

data/test/multiverse/suites/agent_only/config/newrelic.yml

@@ -3,7 +3,7 @@ development:
   error_collector:
     capture_source: true
     enabled: true
-  apdex_t: 0.5
+  apdex_t: 0.24
   ssl: false
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
@@ -16,7 +16,6 @@ development:
     record_sql: obfuscated
     enabled: true
     stack_trace_threshold: 0.5
-    transaction_threshold: 1.0
   capture_params: false
   log_level: debug
   log_file_path: agent.log

data/test/multiverse/suites/agent_only/{cross_process_test.rb → cross_application_tracing_test.rb}

@@ -35,17 +35,17 @@ class CrossProcessTest < Test::Unit::TestCase
     @@wrapper_app
   end
 
-  def test_cross_process_doesnt_modify_without_header
+  def test_cross_app_doesnt_modify_without_header
     get '/'
     assert_nil last_response.headers["X-NewRelic-App-Data"]
   end
 
-  def test_cross_process_doesnt_modify_with_invalid_header
+  def test_cross_app_doesnt_modify_with_invalid_header
     get '/', nil, {'X-NewRelic-ID' => Base64.encode64('otherjunk')}
     assert_nil last_response.headers["X-NewRelic-App-Data"]
   end
 
-  def test_cross_process_writes_out_information
+  def test_cross_app_writes_out_information
     get '/', nil, {'X-NewRelic-ID' => Base64.encode64('1#234')}
     assert_not_nil last_response.headers["X-NewRelic-App-Data"]
 

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

@@ -0,0 +1,66 @@
+class KeyTransactionsTest < Test::Unit::TestCase
+  class TestWidget
+    include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+    def key_txn
+      sleep 0.05
+    end
+    add_transaction_tracer :key_txn
+
+    def other_txn
+      sleep 0.05
+    end
+    add_transaction_tracer :other_txn
+  end
+
+  def setup
+    $collector ||= NewRelic::FakeCollector.new
+    $collector.reset
+    key_apdex_config = { 'Controller/KeyTransactionsTest::TestWidget/key_txn' => 0.01 }
+    $collector.mock['connect'] = [200, {'return_value' => {
+                                      "agent_run_id" => 666,
+                            'web_transactions_apdex' => key_apdex_config,
+                                           'apdex_t' => 0.1
+                                    }}]
+    $collector.run
+
+    NewRelic::Agent.manual_start(:sync_startup => true,
+                                 :force_reconnect => true)
+  end
+
+  def teardown
+    NewRelic::Agent.shutdown
+  end
+
+  SATISFYING = 0
+  TOLERATING = 1
+  FAILING    = 2
+
+  def test_applied_correct_apdex_t_to_key_txn
+    TestWidget.new.key_txn
+    NewRelic::Agent.instance.send(:harvest_and_send_timeslice_data)
+
+    stats = $collector.reported_stats_for_metric('Apdex')[0]
+    assert_equal 1.0, stats[FAILING]
+  end
+
+  def test_applied_correct_apdex_t_to_regular_txn
+    TestWidget.new.other_txn
+    NewRelic::Agent.instance.send(:harvest_and_send_timeslice_data)
+
+    stats = $collector.reported_stats_for_metric('Apdex')[0]
+    assert_equal 1.0, stats[SATISFYING]
+  end
+
+  def test_applied_correct_tt_theshold
+    TestWidget.new.key_txn
+    TestWidget.new.other_txn
+
+    NewRelic::Agent.instance.send(:harvest_and_send_slowest_sample)
+
+    traces = $collector.calls_for('transaction_sample_data')
+    assert_equal 1, traces.size
+    assert_equal('Controller/KeyTransactionsTest::TestWidget/key_txn',
+                 traces[0].metric_name)
+  end
+end

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

@@ -41,31 +41,23 @@ class MarshalingTest < Test::Unit::TestCase
       marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
     end
 
-    assert_equal(666,
-                 $collector.agent_data.select{|x| x.action == 'transaction_sample_data'}[0].body[0])
+    assert_equal('666', $collector.calls_for('transaction_sample_data')[0].run_id)
     assert_equal(expected_sample.to_collector_array(marshaller.default_encoder),
-                 $collector.agent_data.select{|x| x.action == 'transaction_sample_data'}[0].body[1][0])
+                 $collector.calls_for('transaction_sample_data')[0][1][0])
   end
 
   def test_metric_data_marshalling
     stats = NewRelic::Agent.instance.stats_engine.get_stats_no_scope('Custom/test/method')
     stats.record_data_point(1.0)
     stats.record_data_point(2.0, 1.0)
-    expected = [ [ {'name' => 'Custom/test/method', 'scope' => ''},
-                           [2, 3.0, 2.0, 1.0, 2.0, 5.0] ] ]
+    expected = [ 2, 3.0, 2.0, 1.0, 2.0, 5.0 ]
 
     @agent.service.connect
     @agent.send(:harvest_and_send_timeslice_data)
 
-    assert_equal(666,
-       $collector.agent_data.select{|x| x.action == 'metric_data'}[0].body[0])
+    assert_equal('666', $collector.calls_for('metric_data')[0].run_id)
 
-    metric_data = $collector.agent_data \
-      .select{|x| x.action == 'metric_data'}[0].body[3]
-    assert metric_data
-
-    custom_metric = metric_data \
-      .select{|m| m[0]['name'] == 'Custom/test/method' }
+    custom_metric = $collector.reported_stats_for_metric('Custom/test/method')[0]
     assert_equal(expected, custom_metric)
   end
 
@@ -74,11 +66,9 @@ class MarshalingTest < Test::Unit::TestCase
     @agent.service.connect
     @agent.send(:harvest_and_send_errors)
 
-    assert_equal(666,
-       $collector.agent_data.select{|x| x.action == 'error_data'}[0].body[0])
+    assert_equal('666', $collector.calls_for('error_data')[0].run_id)
 
-    error_data = $collector.agent_data \
-      .select{|x| x.action == 'error_data'}[0].body[1][0]
+    error_data = $collector.calls_for('error_data')[0][1][0]
     assert_equal('test error', error_data[2])
   end
 
@@ -92,8 +82,7 @@ class MarshalingTest < Test::Unit::TestCase
     @agent.service.connect
     @agent.send(:harvest_and_send_slowest_sql)
 
-    sql_data = $collector.agent_data \
-      .select{|x| x.action == 'sql_trace_data'}[0].body[0]
+    sql_data = $collector.calls_for('sql_trace_data')[0][0]
     assert_equal('select * from test', sql_data[0][3])
   end
 
@@ -101,9 +90,7 @@ class MarshalingTest < Test::Unit::TestCase
     @agent.service.connect('pid' => 1, 'agent_version' => '9000',
                            'app_name' => 'test')
 
-    connect_data = $collector.agent_data \
-      .select{|x| x.action == 'connect'}[0].body[0]
+    connect_data = $collector.calls_for('connect')[0]
     assert_equal '9000', connect_data['agent_version']
   end
 end
-

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

@@ -0,0 +1,57 @@
+class RenameRuleTest < Test::Unit::TestCase
+  class TestWidget
+    include ::NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+    def txn
+      mthd
+    end
+    add_transaction_tracer :txn
+
+    def mthd
+      'doot de doo'
+    end
+    add_method_tracer :mthd
+  end
+
+  def setup
+    $collector ||= NewRelic::FakeCollector.new
+    $collector.reset
+    txn_rule_specs = [ { 'match_expression' => 'RenameRuleTest',
+                         'replacement' => 'Class' } ]
+    metric_rule_specs = [ { 'match_expression' => 'RenameRuleTest',
+                            'replacement' => 'Class' } ]
+    $collector.mock['connect'] = [200, {'return_value' => {
+                                      "agent_run_id" => 666,
+                            'transaction_name_rules' => txn_rule_specs,
+                                 'metric_name_rules' => metric_rule_specs
+                                    }}]
+    $collector.run
+
+    NewRelic::Agent.manual_start(:sync_startup => true,
+                                 :force_reconnect => true)
+    TestWidget.new.txn
+  end
+
+  def teardown
+    NewRelic::Agent.shutdown
+  end
+
+  def test_transaction_name_rules
+    metric_names = ::NewRelic::Agent.instance.stats_engine.metrics
+    assert(metric_names.include?('Controller/Class::TestWidget/txn'),
+           "'Controller/Class::TestWidget/txn' not found in #{metric_names}")
+    assert(metric_names.include?('Apdex/Class::TestWidget/txn'),
+           "'Apdex/Class::TestWidget/txn' not found in #{metric_names}")
+    assert(!metric_names.include?('Controller/RenameRuleTest::TestWidget/txn'),
+           "'Controller/RenameRuleTest::TestWidget/txn' should not be in #{metric_names}")
+  end
+
+  def test_metric_name_rules
+    NewRelic::Agent.instance.send(:harvest_and_send_timeslice_data)
+    metric_names = $collector.calls_for('metric_data')[0].body[3].map{|m| m[0]['name']}
+    assert(metric_names.include?('Custom/Class::TestWidget/mthd'),
+           "'Custom/Class::TestWidget/mthd' not found in #{metric_names}")
+    assert(!metric_names.include?('Custom/RenameRuleTest::TestWidget/mthd'),
+           "'Custom/RenameRuleTest::TestWidget/mthd' should not be in #{metric_names}")
+  end
+end