newrelic_rpm 3.6.0.83 → 3.6.1.85.beta

data/test/new_relic/agent_test.rb

@@ -10,6 +10,7 @@ module NewRelic
   # through the agent method or the control instance through
   # NewRelic::Control.instance . But it's nice to make sure.
   class MainAgentTest < Test::Unit::TestCase
+    include NewRelic::Agent::MethodTracer
 
     def setup
       NewRelic::Agent.reset_config
@@ -71,23 +72,20 @@ module NewRelic
                                        :start_channel_listener => true)
 
           metric = 'Custom/test/method'
-          NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric) \
-            .record_data_point(1.0)
+          NewRelic::Agent.record_metric(metric, 1.0)
 
           NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
           NewRelic::Agent.register_report_channel(:agent_test) # before fork
           pid = Process.fork do
             NewRelic::Agent.after_fork(:report_to_channel => :agent_test)
-            NewRelic::Agent.agent.stats_engine.get_stats_no_scope(metric) \
-              .record_data_point(2.0)
+            NewRelic::Agent.record_metric(metric, 2.0)
           end
           Process.wait(pid)
           NewRelic::Agent::PipeChannelManager.listener.stop
 
-          engine = NewRelic::Agent.agent.stats_engine
-          assert_equal(3.0, engine.lookup_stats(metric).total_call_time)
-          assert_equal(2, engine.lookup_stats(metric).call_count)
-          engine.reset_stats
+          assert_metrics_recorded({
+            metric => { :call_count => 2, :total_call_time => 3.0 }
+          })
         end
       end
     end
@@ -164,7 +162,7 @@ module NewRelic
     end
 
     def test_abort_transaction_bang
-      NewRelic::Agent::Instrumentation::MetricFrame.expects(:abort_transaction!)
+      NewRelic::Agent::Transaction.expects(:abort_transaction!)
       NewRelic::Agent.abort_transaction!
     end
 
@@ -263,6 +261,114 @@ module NewRelic
       NewRelic::Agent.increment_metric('foo', 12)
     end
 
+    class Transactor
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      def txn
+        yield
+      end
+      add_transaction_tracer :txn
+
+      def task_txn
+        yield
+      end
+      add_transaction_tracer :task_txn, :category => :task
+    end
+
+    def test_set_transaction_name
+      engine = NewRelic::Agent.instance.stats_engine
+      engine.reset_stats
+      Transactor.new.txn do
+        NewRelic::Agent.set_transaction_name('new_name')
+      end
+      assert engine.lookup_stats('Controller/new_name')
+    end
+
+    def test_get_transaction_name_returns_nil_outside_transaction
+      assert_equal nil, NewRelic::Agent.get_transaction_name
+    end
+
+    def test_get_transaction_name_returns_the_default_txn_name
+      engine = NewRelic::Agent.instance.stats_engine
+      engine.reset_stats
+      Transactor.new.txn do
+        assert_equal 'NewRelic::MainAgentTest::Transactor/txn', NewRelic::Agent.get_transaction_name
+      end
+    end
+
+    def test_get_transaction_name_returns_what_I_set
+      engine = NewRelic::Agent.instance.stats_engine
+      engine.reset_stats
+      Transactor.new.txn do
+        NewRelic::Agent.set_transaction_name('a_new_name')
+        assert_equal 'a_new_name', NewRelic::Agent.get_transaction_name
+      end
+    end
+
+    def test_get_txn_name_and_set_txn_name_preserves_category
+      engine = NewRelic::Agent.instance.stats_engine
+      engine.reset_stats
+      Transactor.new.txn do
+        NewRelic::Agent.set_transaction_name('a_new_name', :category => :task)
+        new_name = NewRelic::Agent.get_transaction_name + "2"
+        NewRelic::Agent.set_transaction_name(new_name)
+      end
+      assert engine.lookup_stats('OtherTransaction/Background/a_new_name2')
+    end
+
+    def test_set_transaction_name_applies_proper_scopes
+      engine = NewRelic::Agent.instance.stats_engine
+      engine.reset_stats
+      Transactor.new.txn do
+        trace_execution_scoped('Custom/something') {}
+        NewRelic::Agent.set_transaction_name('new_name')
+      end
+      assert engine.lookup_stats('Custom/something', 'Controller/new_name')
+    end
+
+    def test_set_transaction_name_sets_tt_name
+      sampler = NewRelic::Agent.instance.transaction_sampler
+      Transactor.new.txn do
+        NewRelic::Agent.set_transaction_name('new_name')
+      end
+      assert_equal 'Controller/new_name', sampler.last_sample.params[:path]
+    end
+
+    def test_set_transaction_name_gracefully_fails_when_frozen
+      engine = NewRelic::Agent.instance.stats_engine
+      engine.reset_stats
+      Transactor.new.txn do
+        NewRelic::Agent::Transaction.current.freeze_name
+        NewRelic::Agent.set_transaction_name('new_name')
+      end
+      assert_nil engine.lookup_stats('Controller/new_name')
+    end
+
+    def test_set_transaction_name_applies_category
+      engine = NewRelic::Agent.instance.stats_engine
+      engine.reset_stats
+      Transactor.new.txn do
+        NewRelic::Agent.set_transaction_name('new_name', :category => :task)
+      end
+      assert engine.lookup_stats('OtherTransaction/Background/new_name')
+      Transactor.new.txn do
+        NewRelic::Agent.set_transaction_name('new_name', :category => :rack)
+      end
+      assert engine.lookup_stats('Controller/Rack/new_name')
+      Transactor.new.txn do
+        NewRelic::Agent.set_transaction_name('new_name', :category => :sinatra)
+      end
+      assert engine.lookup_stats('Controller/Sinatra/new_name')
+    end
+
+    def test_set_transaction_name_uses_current_txn_category_default
+      engine = NewRelic::Agent.instance.stats_engine
+      engine.reset_stats
+      Transactor.new.task_txn do
+        NewRelic::Agent.set_transaction_name('new_name')
+      end
+      assert engine.lookup_stats('OtherTransaction/Background/new_name')
+    end
+
     private
 
     def mocked_agent

data/test/test_helper.rb

@@ -55,7 +55,6 @@ rescue LoadError => e
 end
 
 require 'test/unit'
-require 'shoulda'
 begin
   require 'mocha/setup'
 rescue LoadError
@@ -80,6 +79,7 @@ def default_service(stubbed_method_overrides = {})
     :metric_data => nil,
     :error_data => nil,
     :transaction_sample_data => nil,
+    :sql_trace_data => nil,
     :get_agent_commands => []
   }
 
@@ -106,9 +106,13 @@ def assert_between(floor, ceiling, value, message="expected #{floor} <= #{value}
   assert((floor <= value && value <= ceiling), message)
 end
 
+def assert_in_delta(expected, actual, delta)
+  assert_between((expected - delta), (expected + delta), actual)
+end
+
 def check_metric_time(metric, value, delta)
   time = NewRelic::Agent.get_stats(metric).total_call_time
-  assert_between((value - delta), (value + delta), time)
+  assert_in_delta(value, time, delta)
 end
 
 def check_metric_count(metric, value)
@@ -175,6 +179,76 @@ def compare_metrics(expected, actual)
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
 
+def metric_spec_from_specish(specish)
+  spec = case specish
+  when String then NewRelic::MetricSpec.new(specish)
+  when Array  then NewRelic::MetricSpec.new(*specish)
+  end
+  spec
+end
+
+def _normalize_metric_expectations(expectations)
+  case expectations
+  when Array
+    hash = {}
+    expectations.each { |k| hash[k] = { :call_count => 1 } }
+    hash
+  else
+    expectations
+  end
+end
+
+def assert_metrics_recorded(expected)
+  expected = _normalize_metric_expectations(expected)
+  expected.each do |specish, expected_attrs|
+    expected_spec = metric_spec_from_specish(specish)
+    actual_stats = NewRelic::Agent.instance.stats_engine.lookup_stats(*Array(specish))
+    if !actual_stats
+      all_specs = NewRelic::Agent.instance.stats_engine.metric_specs
+      matches = all_specs.select { |spec| spec.name == expected_spec.name }
+      matches.map! { |m| "  #{m.inspect}" }
+      msg = "Did not find stats for spec #{expected_spec.inspect}."
+      msg += "\nDid find specs: [\n#{matches.join(",\n")}\n]" unless matches.empty?
+      assert(actual_stats, msg)
+    end
+    expected_attrs.each do |attr, expected_value|
+      actual_value = actual_stats.send(attr)
+      if attr == :call_count
+        assert_equal(expected_value, actual_value,
+          "Expected #{attr} for #{expected_spec} to be #{expected_value}, got #{actual_value}")
+      else
+        assert_in_delta(expected_value, actual_value, 0.0001,
+          "Expected #{attr} for #{expected_spec} to be ~#{expected_value}, got #{actual_value}")
+      end
+    end
+  end
+end
+
+def assert_metrics_recorded_exclusive(expected, options={})
+  expected = _normalize_metric_expectations(expected)
+  assert_metrics_recorded(expected)
+  recorded_metrics = NewRelic::Agent.instance.stats_engine.metrics
+  if options[:filter]
+    recorded_metrics = recorded_metrics.select { |m| m.match(options[:filter]) }
+  end
+  expected_metrics = expected.keys.map { |s| metric_spec_from_specish(s).to_s }
+  unexpected_metrics = recorded_metrics.select{|m| m !~ /GC\/cumulative/}
+  unexpected_metrics -= expected_metrics
+  assert_equal(0, unexpected_metrics.size, "Found unexpected metrics: [#{unexpected_metrics.join(', ')}]")
+end
+
+def assert_metrics_not_recorded(not_expected)
+  not_expected = _normalize_metric_expectations(not_expected)
+  found_but_not_expected = []
+  not_expected.each do |specish, _|
+    spec = metric_spec_from_specish(specish)
+    if NewRelic::Agent.instance.stats_engine.lookup_stats(*Array(specish))
+      found_but_not_expected << spec
+    end
+  end
+  assert_equal([], found_but_not_expected, "Found unexpected metrics: [#{found_but_not_expected.join(', ')}]")
+end
+
 def with_config(config_hash, opts={})
   opts = { :level => 0, :do_not_cast => false }.merge(opts)
   if opts[:do_not_cast]
@@ -211,35 +285,90 @@ ensure
   ::NewRelic::Agent.logger = logger
 end
 
+def in_transaction(name='dummy')
+  NewRelic::Agent.instance.instance_variable_set(:@transaction_sampler,
+                        NewRelic::Agent::TransactionSampler.new)
+  NewRelic::Agent.instance.stats_engine.transaction_sampler = \
+    NewRelic::Agent.instance.transaction_sampler
+  NewRelic::Agent::Transaction.start(:other)
+  val = yield
+  NewRelic::Agent::Transaction.stop(name)
+  val
+end
+
+def freeze_time(now=Time.now)
+  Time.stubs(:now).returns(now)
+end
+
+def advance_time(seconds)
+  freeze_time(Time.now + seconds)
+end
+
 module NewRelic
   def self.fixture_path(name)
     File.join(File.dirname(__FILE__), 'fixtures', name)
   end
 end
 
+def fixture_tcp_socket( response )
+  # Don't actually talk to Google.
+  socket = stub("socket") do
+    stubs(:closed?).returns(false)
+    stubs(:close)
+
+    # Simulate a bunch of socket-ey stuff since Mocha doesn't really
+    # provide any other way to do it
+    class << self
+      attr_accessor :response, :write_checker
+    end
+
+    def self.check_write
+      self.write_checker = Proc.new
+    end
+
+    def self.write( buf )
+      self.write_checker.call( buf ) if self.write_checker
+      buf.length
+    end
+
+    def self.sysread( size, buf='' )
+      @data ||= response.to_s
+      raise EOFError if @data.empty?
+      buf.replace @data.slice!( 0, size )
+      buf
+    end
+    class << self
+      alias_method :read_nonblock, :sysread
+    end
+
+  end
+
+  socket.response = response
+  TCPSocket.stubs( :open ).returns( socket )
+
+  return socket
+end
+
 module TransactionSampleTestHelper
   module_function
   def make_sql_transaction(*sql)
     sampler = NewRelic::Agent::TransactionSampler.new
     sampler.notice_first_scope_push Time.now.to_f
-    sampler.notice_transaction '/path', nil, :jim => "cool"
+    sampler.notice_transaction(nil, :jim => "cool")
     sampler.notice_push_scope "a"
-
-    sampler.notice_transaction '/path/2', nil, :jim => "cool"
-
     sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "test"}, 0 ) }
 
     sleep 0.02
     yield if block_given?
     sampler.notice_pop_scope "a"
-    sampler.notice_scope_empty
+    sampler.notice_scope_empty(stub('txn', :name => '/path', :custom_parameters => {}))
 
     sampler.samples[0]
   end
 
   def run_sample_trace_on(sampler, path='/path')
     sampler.notice_first_scope_push Time.now.to_f
-    sampler.notice_transaction path, path, {}
+    sampler.notice_transaction(path, {})
     sampler.notice_push_scope "Controller/sandwiches/index"
     sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", nil, 0)
     sampler.notice_push_scope "ab"
@@ -250,7 +379,7 @@ module TransactionSampleTestHelper
     sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", nil, 0)
     sampler.notice_pop_scope "lew"
     sampler.notice_pop_scope "Controller/sandwiches/index"
-    sampler.notice_scope_empty
+    sampler.notice_scope_empty(stub('txn', :name => path, :custom_parameters => {}))
     sampler.samples[0]
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.0.83
-  prerelease: 
+  version: 3.6.1.85.beta
+  prerelease: 9
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -95,6 +95,7 @@ files:
 - lib/new_relic/agent/agent.rb
 - lib/new_relic/agent/agent_logger.rb
 - lib/new_relic/agent/audit_logger.rb
+- lib/new_relic/agent/autostart.rb
 - lib/new_relic/agent/beacon_configuration.rb
 - lib/new_relic/agent/browser_monitoring.rb
 - lib/new_relic/agent/busy_calculator.rb
@@ -112,20 +113,22 @@ files:
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/event_listener.rb
 - lib/new_relic/agent/instrumentation.rb
+- lib/new_relic/agent/instrumentation/action_controller_subscriber.rb
+- lib/new_relic/agent/instrumentation/action_view_subscriber.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
 - lib/new_relic/agent/instrumentation/active_record.rb
 - lib/new_relic/agent/instrumentation/active_record_helper.rb
+- lib/new_relic/agent/instrumentation/active_record_subscriber.rb
 - lib/new_relic/agent/instrumentation/acts_as_solr.rb
 - lib/new_relic/agent/instrumentation/authlogic.rb
 - lib/new_relic/agent/instrumentation/browser_monitoring_timings.rb
 - lib/new_relic/agent/instrumentation/controller_instrumentation.rb
 - lib/new_relic/agent/instrumentation/data_mapper.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
+- lib/new_relic/agent/instrumentation/evented_subscriber.rb
 - lib/new_relic/agent/instrumentation/memcache.rb
 - lib/new_relic/agent/instrumentation/merb/controller.rb
 - lib/new_relic/agent/instrumentation/merb/errors.rb
-- lib/new_relic/agent/instrumentation/metric_frame.rb
-- lib/new_relic/agent/instrumentation/metric_frame/pop.rb
 - lib/new_relic/agent/instrumentation/net.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
 - lib/new_relic/agent/instrumentation/queue_time.rb
@@ -165,11 +168,15 @@ files:
 - lib/new_relic/agent/stats_engine/samplers.rb
 - lib/new_relic/agent/stats_engine/stats_hash.rb
 - lib/new_relic/agent/stats_engine/transactions.rb
+- lib/new_relic/agent/system_info.rb
 - lib/new_relic/agent/thread.rb
 - lib/new_relic/agent/thread_profiler.rb
+- lib/new_relic/agent/transaction.rb
+- lib/new_relic/agent/transaction/pop.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/uri_util.rb
 - lib/new_relic/agent/worker_loop.rb
 - lib/new_relic/coerce.rb
 - lib/new_relic/collection_helper.rb
@@ -258,6 +265,7 @@ files:
 - test/multiverse/suites/agent_only/rename_rule_test.rb
 - test/multiverse/suites/agent_only/rum_instrumentation_test.rb
 - test/multiverse/suites/agent_only/service_timeout_test.rb
+- test/multiverse/suites/agent_only/set_transaction_name_test.rb
 - test/multiverse/suites/agent_only/ssl_test.rb
 - test/multiverse/suites/agent_only/start_up_test.rb
 - test/multiverse/suites/agent_only/test_trace_method_with_punctuation.rb
@@ -321,6 +329,7 @@ files:
 - test/new_relic/agent/agent_test_controller_test.rb
 - test/new_relic/agent/apdex_from_server_test.rb
 - test/new_relic/agent/audit_logger_test.rb
+- test/new_relic/agent/autostart_test.rb
 - test/new_relic/agent/beacon_configuration_test.rb
 - test/new_relic/agent/browser_monitoring_test.rb
 - test/new_relic/agent/busy_calculator_test.rb
@@ -333,6 +342,7 @@ files:
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
 - test/new_relic/agent/event_listener_test.rb
+- test/new_relic/agent/instrumentation/action_controller_subscriber_test.rb
 - test/new_relic/agent/instrumentation/action_view_subscriber_test.rb
 - test/new_relic/agent/instrumentation/active_record_helper_test.rb
 - test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb
@@ -340,8 +350,6 @@ files:
 - test/new_relic/agent/instrumentation/browser_monitoring_timings_test.rb
 - test/new_relic/agent/instrumentation/controller_instrumentation_test.rb
 - test/new_relic/agent/instrumentation/instrumentation_test.rb
-- test/new_relic/agent/instrumentation/metric_frame/pop_test.rb
-- test/new_relic/agent/instrumentation/metric_frame_test.rb
 - test/new_relic/agent/instrumentation/net_instrumentation_test.rb
 - test/new_relic/agent/instrumentation/queue_time_test.rb
 - test/new_relic/agent/instrumentation/rack_test.rb
@@ -369,9 +377,12 @@ files:
 - test/new_relic/agent/thread_profiler_test.rb
 - test/new_relic/agent/thread_test.rb
 - test/new_relic/agent/threaded_test.rb
+- test/new_relic/agent/transaction/pop_test.rb
 - test/new_relic/agent/transaction_info_test.rb
 - test/new_relic/agent/transaction_sample_builder_test.rb
 - test/new_relic/agent/transaction_sampler_test.rb
+- test/new_relic/agent/transaction_test.rb
+- test/new_relic/agent/uri_util_test.rb
 - test/new_relic/agent/worker_loop_test.rb
 - test/new_relic/agent_test.rb
 - test/new_relic/coerce_test.rb
@@ -413,7 +424,6 @@ files:
 - test/script/ci_agent-tests_runner.sh
 - test/script/ci_bench.sh
 - test/script/ci_multiverse_runner.sh
-- test/test_contexts.rb
 - test/test_helper.rb
 - ui/helpers/developer_mode_helper.rb
 - ui/helpers/google_pie_chart.rb
@@ -496,72 +506,25 @@ files:
 - lib/new_relic/build.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-post_install_message: ! '
-
-  # New Relic Ruby Agent Release Notes #
-
-
-  ## v3.6.0 ##
-
-
-  * Sidekiq supprt
-
-
-  The Ruby agent now supports the Sidekiq background job framework. Traces from
-
-  Sidekiq jobs will automatically show up in the Background tasks on New Relic
-
-  similar to Resque and Delayed::Job tasks.
-
-
-  * Improved thread safety
-
-
-  The primary metrics data structures in the Ruby agent are now thread safe.
-
-  This should provide better reliability for the agent under JRuby and threaded
-
-  scenarios such as Sidekiq or Puma.
-
-
-  * More robust environment report
-
-
-  The agent''s analysis of the local environment (e.g. OS, Processors, loaded
-
-  gems) will now work in a wider variety of app environments, including
-
-  Sinatra.
-
-
-  * Experimental Rainbows! support
-
-
-  The Ruby agent now automatically detects and instruments the Rainbows! web
-
-  server. This support is considered experimental at present, and has not been
-
-  tested with all dispatch modes.
-
-
-  Thanks to Joseph Chen for the contribution.
-
-
-  * Fix a potential file descriptor leak in Resque instrumentation
-
-
-  A file descriptor leak that occurred when DontPerform exceptions were used to
-
-  abort processing of a job has been fixed. This should allow the Resque
-
-  instrumentation work correctly with the resque-lonely_job gem.
-
-
-  See https://github.com/newrelic/rpm/blob/master/CHANGELOG for a full list of
-
-  changes.
-
-'
+post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.6.1 ##\n\n*
+  Full URIs for HTTP requests are recorded in transaction traces\n\n  When recording
+  a transaction trace node for an outgoing HTTP call via\n  Net::HTTP, the agent will
+  now save the full URI (instead of just the hostname)\n  for the request. Embedded
+  credentials, the query string, and the fragment will\n  be stripped from the URI
+  before it is saved.\n\n* Simplify Agent Autostart Logic\n\n  Previously the agent
+  would only start when it detected a supported\n  \"Dispatcher\", meaning a known
+  web server or background task framework.  This\n  was problematic for customers
+  using webservers that the agent was not\n  configured to detect (e.g. Puma).  Now
+  the agent will attempt to report any\n  time it detects it is running in a monitored
+  environment (e.g. production).\n  There are two exceptions to this.  The agent will
+  not autostart in a rails\n  console or irb session or when the process was invoked
+  by a rake task (e.g.\n  rake assets:precompile).  The NEWRELIC_ENABLE environment
+  variable can be set\n  to true or false to force the agent to start or not start.\n\n*
+  Don't attempt to resolve collector hostname when proxy is in use\n\n  When a proxy
+  is configured, the agent will not attempt to lookup and cache the\n  IP address
+  of New Relic server to which it is sending data, since DNS may not\n  be available
+  in some environments. Thanks to Bill Kirtley for the contribution\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
+  for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers
 - --inline-source

data/lib/new_relic/agent/instrumentation/metric_frame/pop.rb

@@ -1,84 +0,0 @@
-# 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.
-
-require 'new_relic/agent/instrumentation'
-module NewRelic
-  module Agent
-    module Instrumentation
-      class MetricFrame
-        module Pop
-
-          def clear_thread_metric_frame!
-            Thread.current[:newrelic_metric_frame] = nil
-          end
-
-          def set_new_scope!(metric)
-            agent.stats_engine.scope_name = metric
-          end
-
-          def log_underflow
-            ::NewRelic::Agent.logger.error "Underflow in metric frames: #{caller.join("\n   ")}"
-          end
-
-          def notice_scope_empty
-            transaction_sampler.notice_scope_empty
-            sql_sampler.notice_scope_empty
-          end
-
-          def record_transaction_cpu
-            burn = cpu_burn
-            transaction_sampler.notice_transaction_cpu_time(burn) if burn
-          end
-
-          def normal_cpu_burn
-            return unless @process_cpu_start
-            process_cpu - @process_cpu_start
-          end
-
-          def jruby_cpu_burn
-            return unless @jruby_cpu_start
-            burn = (jruby_cpu_time - @jruby_cpu_start)
-            record_jruby_cpu_burn(burn)
-            burn
-          end
-
-          # we need to do this here because the normal cpu sampler
-          # process doesn't work on JRuby. See the cpu_sampler.rb file
-          # to understand where cpu is recorded for non-jruby processes
-          def record_jruby_cpu_burn(burn)
-            NewRelic::Agent.record_metric(NewRelic::Metrics::USER_TIME, burn)
-          end
-
-          def cpu_burn
-            normal_cpu_burn || jruby_cpu_burn
-          end
-
-          def end_transaction!
-            agent.stats_engine.end_transaction
-          end
-
-          def notify_transaction_sampler(web_transaction)
-            record_transaction_cpu
-            notice_scope_empty
-          end
-
-          def traced?
-            NewRelic::Agent.is_execution_traced?
-          end
-
-          def handle_empty_path_stack(metric)
-            raise 'path stack not empty' unless @path_stack.empty?
-            notify_transaction_sampler(metric.is_web_transaction?) if traced?
-            end_transaction!
-            clear_thread_metric_frame!
-          end
-
-          def current_stack_metric
-            metric_name
-          end
-        end
-      end
-    end
-  end
-end