newrelic_rpm 3.6.1.85.beta → 3.6.1.86.beta

data/CHANGELOG

@@ -28,6 +28,13 @@
   IP address of New Relic server to which it is sending data, since DNS may not
   be available in some environments. Thanks to Bill Kirtley for the contribution
 
+  * Added NewRelic::Agent.set_transaction_name and NewRelic::Agent.get_transaction_name
+
+  Ordinarily the name of your transaction is defined up-front, but if you'd like to 
+  change the name of a transaction while it is still running you can use 
+  **NewRelic::Agent.set_transaction_name()**.  Similarly, if you need to know the name
+  of the currently running transaction, you can use **NewRelic::Agent.get_transaction_name()**.
+
 ## v3.6.0 ##
 
   * Sidekiq supprt

data/lib/new_relic/agent.rb

@@ -138,6 +138,9 @@ module NewRelic
 
     class BackgroundLoadingError < StandardError; end
 
+    # placeholder name used when we cannot determine a transaction's name
+    UNKNOWN_METRIC = '(unknown)'.freeze
+
     @agent = nil
 
     # The singleton Agent instance.  Used internally.
@@ -405,6 +408,7 @@ module NewRelic
     #
     def notice_error(exception, options={})
       Transaction.notice_error(exception, options)
+      nil # don't return a noticed error datastructure. it can only hurt.
     end
 
     # Add parameters to the current transaction trace (and traced error if any)

data/lib/new_relic/agent/autostart.rb

@@ -44,7 +44,7 @@ module NewRelic
 
       def in_blacklisted_rake_task?
         tasks = begin
-            Rake.application.top_level_tasks
+            ::Rake.application.top_level_tasks
           rescue => e
             ::NewRelic::Agent.logger.debug("Not in Rake environment so skipping blacklisted_rake_tasks check: #{e}")
             []

data/lib/new_relic/agent/browser_monitoring.rb

@@ -23,7 +23,7 @@ module NewRelic
         end
 
         def name
-          '(unknown)'
+          ::NewRelic::Agent::UNKNOWN_METRIC
         end
       end
 
@@ -78,7 +78,7 @@ module NewRelic
       end
 
       def browser_monitoring_transaction_name
-        current_transaction.name || '(unknown)'
+        current_transaction.name || ::NewRelic::Agent::UNKNOWN_METRIC
       end
 
       def browser_monitoring_queue_time

data/lib/new_relic/agent/configuration/yaml_source.rb

@@ -29,7 +29,7 @@ module NewRelic
             license_key = ''
 
             erb = ERB.new(file).result(binding)
-            confighash = YAML.load(erb)
+            confighash = with_yaml_engine { YAML.load(erb) }
             ::NewRelic::Agent.logger.error("Config (#{path}) doesn't include a '#{env}' environment!") unless
               confighash.key?(env)
 
@@ -51,6 +51,16 @@ module NewRelic
 
         protected
 
+        def with_yaml_engine
+          return yield unless NewRelic::LanguageSupport.needs_syck?
+
+          yamler = ::YAML::ENGINE.yamler
+          ::YAML::ENGINE.yamler = 'syck'
+          result = yield
+          ::YAML::ENGINE.yamler = yamler
+          result
+        end
+
         def booleanify_values(config, *keys)
           # auto means defer ro default
           keys.each do |option|

data/lib/new_relic/agent/error_collector.rb

@@ -108,6 +108,17 @@ module NewRelic
           exception.instance_variable_set(EXCEPTION_TAG_IVAR, true)
         end
 
+        def blamed_metric_name(options)
+          if options[:metric] && options[:metric] != ::NewRelic::Agent::UNKNOWN_METRIC
+            "Errors/#{options[:metric]}"
+          else
+            txn_info = TransactionInfo.get
+            if txn_info && txn_info.transaction
+              "Errors/#{txn_info.transaction.name}"
+            end
+          end
+        end
+
         # Increments a statistic that tracks total error rate
         # Be sure not to double-count same exception. This clears per harvest.
         def increment_error_count!(exception, options={})
@@ -115,9 +126,9 @@ module NewRelic
           tag_as_seen(exception)
 
           metric_names = ["Errors/all"]
-          if options[:metric] && options[:metric] != '(unknown)'
-            metric_names << "Errors/#{options[:metric]}"
-          end
+          blamed_metric = blamed_metric_name(options)
+          metric_names << blamed_metric if blamed_metric
+
           stats_engine = NewRelic::Agent.agent.stats_engine
           stats_engine.record_metrics(metric_names) do |stats|
             stats.increment_count

data/lib/new_relic/agent/instrumentation/action_view_subscriber.rb

@@ -44,7 +44,7 @@ module NewRelic
           def recordable?
             name[0] == '!' ||
               metric_name == 'View/text template/Rendering' ||
-              metric_name == 'View/(unknown)/Partial'
+              metric_name == "View/#{::NewRelic::Agent::UNKNOWN_METRIC}/Partial"
           end
 
           def metric_name
@@ -70,7 +70,7 @@ module NewRelic
             elsif (parts = identifier.split('/')).size > 1
               parts[-2..-1].join('/')
             else
-              '(unknown)'
+              ::NewRelic::Agent::UNKNOWN_METRIC
             end
           end
 

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

@@ -0,0 +1,28 @@
+# 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.
+
+# This is a legacy support shim now that the MetricFrame functionality has
+# moved over to the Transaction class instead.
+#
+# This class is deprecated and will be removed in a future agent version.
+#
+# This class is not part of the public API.  Avoid making calls on it directly.
+#
+module NewRelic
+  module Agent
+    module Instrumentation
+      class MetricFrame
+
+        def self.recording_web_transaction?
+          Transaction.recording_web_transaction?
+        end
+
+        def self.abort_transaction!
+          Transaction.abort_transaction!
+        end
+
+      end
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/rails3/action_controller.rb

@@ -48,7 +48,7 @@ module NewRelic
               if options[:file]
                 "file"
               elsif identifier.nil?
-                "(unknown)"
+                ::NewRelic::Agent::UNKNOWN_METRIC
               elsif identifier.include? '/' # this is a filepath
                 identifier.split('/')[-2..-1].join('/')
               else

data/lib/new_relic/agent/instrumentation/sinatra.rb

@@ -81,7 +81,7 @@ module NewRelic
           end
 
           def transaction_name(routes, request)
-            name = '(unknown)'
+            name = ::NewRelic::Agent::UNKNOWN_METRIC
             verb = http_verb(request)
 
             Array(routes[verb]).each do |pattern, keys, conditions, block|
@@ -94,7 +94,7 @@ module NewRelic
               end
             end
 
-            name.gsub!(%r{^[/^]*(.*?)[/\$\?]*$}, '\1')
+            name = name.gsub(%r{^[/^]*(.*?)[/\$\?]*$}, '\1')
             if verb
               name = verb + ' ' + name
             end
@@ -102,7 +102,7 @@ module NewRelic
             name
           rescue => e
             ::NewRelic::Agent.logger.debug("#{e.class} : #{e.message} - Error encountered trying to identify Sinatra transaction name")
-            '(unknown)'
+            ::NewRelic::Agent::UNKNOWN_METRIC
           end
         end
       end

data/lib/new_relic/agent/transaction.rb

@@ -159,7 +159,7 @@ module NewRelic
 
       # Unwind one stack level.  It knows if it's back at the outermost caller and
       # does the appropriate wrapup of the context.
-      def stop(metric='(unknown)')
+      def stop(metric=::NewRelic::Agent::UNKNOWN_METRIC)
         @name ||= metric unless name_frozen?
         freeze_name
         log_underflow if @type.nil?

data/lib/new_relic/control/instance_methods.rb

@@ -8,7 +8,6 @@ require 'new_relic/agent/agent_logger'
 
 module NewRelic
   class Control
-    include NewRelic::LanguageSupport::Control
 
     # Contains methods that relate to the runtime usage of the control
     # object. Note that these are subject to override in the

data/lib/new_relic/language_support.rb

@@ -5,25 +5,10 @@
 module NewRelic::LanguageSupport
   extend self
 
-  module Control
-    def self.included(base)
-      # need to use syck rather than psych when possible
-      if defined?(::YAML::ENGINE)
-        if !NewRelic::LanguageSupport.using_engine?('jruby') &&
-            (NewRelic::LanguageSupport.using_version?('1.9.1') ||
-             NewRelic::LanguageSupport.using_version?('1.9.2'))
-          base.class_eval do
-            def load_newrelic_yml(*args)
-              yamler = ::YAML::ENGINE.yamler
-              ::YAML::ENGINE.yamler = 'syck'
-              val = super
-              ::YAML::ENGINE.yamler = yamler
-              val
-            end
-          end
-        end
-      end
-    end
+  # need to use syck rather than psych when possible
+  def needs_syck?
+    !NewRelic::LanguageSupport.using_engine?('jruby') &&
+         NewRelic::LanguageSupport.using_version?('1.9.2')
   end
 
   @@forkable = nil

data/lib/new_relic/rack/error_collector.rb

@@ -23,12 +23,10 @@ module NewRelic::Rack
           {'error' => warning}
         end
 
-        transaction_name = NewRelic::Agent::TransactionInfo.get.transaction.name
-        NewRelic::Agent::Transaction.notice_error(exception,
-                                                  :uri => request.path,
-                                                  :referer => request.referer,
-                                                  :metric => transaction_name,
-                                                  :request_params => params)
+        NewRelic::Agent.notice_error(exception,
+                                      :uri => request.path,
+                                      :referer => request.referer,
+                                      :request_params => params)
       end
       raise exception
     end

data/test/multiverse/suites/rails/app.rb

@@ -12,10 +12,27 @@ if !defined?(MyApp)
 
   ENV['NEW_RELIC_DISPATCHER'] = 'test'
 
+  class ErrorMiddleware
+    def initialize(app, options={})
+      @app = app
+    end
+
+    def call(env)
+      path = ::Rack::Request.new(env).path_info
+      raise "middleware error" if path.match(/\/middleware_error\/before/)
+      result = @app.call(env)
+      raise "middleware error" if path.match(/\/middleware_error\/after/)
+      result
+    end
+  end
+
   class MyApp < Rails::Application
     # We need a secret token for session, cookies, etc.
     config.active_support.deprecation = :log
     config.secret_token = "49837489qkuweoiuoqwehisuakshdjksadhaisdy78o34y138974xyqp9rmye8yrpiokeuioqwzyoiuxftoyqiuxrhm3iou1hrzmjk"
+    initializer "install_error_middleware" do
+      config.middleware.use ErrorMiddleware
+    end
   end
   MyApp.initialize!
 

data/test/multiverse/suites/rails/error_tracing_test.rb

@@ -38,6 +38,10 @@ class ErrorController < ApplicationController
     newrelic_notice_error(RuntimeError.new('this error should be noticed'))
     render :text => "Shoulda noticed an error"
   end
+
+  def middleware_error
+    render :text => 'everything went great'
+  end
 end
 
 class IgnoredError < StandardError; end
@@ -56,6 +60,7 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
     NewRelic::Agent.instance_variable_set(:@agent, nil)
     NewRelic::Agent::Agent.instance_variable_set(:@instance, nil)
     NewRelic::Agent.manual_start
+    NewRelic::Agent::TransactionInfo.reset
 
     reset_error_collector
   end
@@ -166,6 +171,16 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
     assert_error_reported_once('this is a server ignored error')
   end
 
+  def test_should_capture_errors_raised_in_middleware_before_call
+    get '/error/middleware_error/before'
+    assert_error_reported_once('middleware error')
+  end
+
+  def test_should_capture_errors_raised_in_middleware_after_call
+    get '/error/middleware_error/after'
+    assert_error_reported_once('middleware error')
+  end
+
  protected
 
   def assert_errors_reported(message, queued_count, total_count=queued_count, txn_name=nil)
@@ -182,7 +197,7 @@ class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
 
     assert_equal(queued_count,
       @error_collector.errors.select{|error| error.message == message}.size,
-      "Wrong number of errors with message '#{message} found'")
+      "Wrong number of errors with message #{message.inspect} found")
   end
 
   def assert_error_reported_once(message, txn_name=nil)

data/test/new_relic/agent/instrumentation/metric_frame_test.rb

@@ -0,0 +1,22 @@
+# 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 File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+
+class NewRelic::Agent::Instrumentation::MetricFrameTest < Test::Unit::TestCase
+
+  # These tests are just here to make sure that we're maintaining the required
+  # old interface for folks. Real testing of the underlying functionality
+  # should go with the Transaction methods we invoke, not these tests.
+
+  def test_recording_web_transaction
+    NewRelic::Agent::Transaction.expects(:recording_web_transaction?)
+    NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
+  end
+
+  def test_abort_transaction
+    NewRelic::Agent::Transaction.expects(:abort_transaction!)
+    NewRelic::Agent::Instrumentation::MetricFrame.abort_transaction!
+  end
+end

data/test/new_relic/agent_test.rb

@@ -369,6 +369,17 @@ module NewRelic
       assert engine.lookup_stats('OtherTransaction/Background/new_name')
     end
 
+    # It's not uncommon for customers to conclude a rescue block with a call to
+    # notice_error.  We should always return nil, which mean less folks
+    # unexpectedly get a noticed error Hash returned from their methods.
+    def test_notice_error_returns_nil
+      begin
+        raise "WTF"
+      rescue => e
+        assert_equal nil, ::NewRelic::Agent.notice_error(e)
+      end
+    end
+
     private
 
     def mocked_agent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.1.85.beta
+  version: 3.6.1.86.beta
   prerelease: 9
 platform: ruby
 authors:
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -129,6 +129,7 @@ files:
 - 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/net.rb
 - lib/new_relic/agent/instrumentation/passenger_instrumentation.rb
 - lib/new_relic/agent/instrumentation/queue_time.rb
@@ -350,6 +351,7 @@ 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_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
@@ -523,7 +525,12 @@ post_install_message: ! "\n# New Relic Ruby Agent Release Notes #\n\n## v3.6.1 #
   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
+  in some environments. Thanks to Bill Kirtley for the contribution\n\n* Added NewRelic::Agent.set_transaction_name
+  and NewRelic::Agent.get_transaction_name\n\n  Ordinarily the name of your transaction
+  is defined up-front, but if you'd like to \n  change the name of a transaction while
+  it is still running you can use \n  **NewRelic::Agent.set_transaction_name()**.
+  \ Similarly, if you need to know the name\n  of the currently running transaction,
+  you can use **NewRelic::Agent.get_transaction_name()**.\n\nSee https://github.com/newrelic/rpm/blob/master/CHANGELOG
   for a full list of\nchanges.\n"
 rdoc_options:
 - --line-numbers