newrelic_rpm 3.5.8.64.beta → 3.5.8.70

data.tar.gz.sig

@@ -1,3 +1,2 @@
-:�����]F�4��Di<F͙�Zb�R�xX~��PӁI吘�[s/t����Mw/�žUi�{��Ӆ
-�)��7j��\�����j�r}Q�X����U��&��U-�'I�e.��M�G��f��sw
-�}A�;ŏ�0_F��W鶐@����-�����l.��X��>�jE0d�/���ŚͨdCQ̴h�}y���mt�-�s����E�+������S⓫��_��g���۝��28�yx�0ٟH�
+�xr��O=2����$Z�X���0����jU�R��[�Z��1�c��K��������i�Pa�s,�+	��ď����}��h8�'=2�R�,��tCd�+��xa,�����+Bْ9غ���
+ �-����S_�.�5�9V�$�

data/Gemfile

@@ -1,11 +1,15 @@
-source :rubygems
+source 'https://rubygems.org'
 
 group :development do
   # require 0.9.2.2.
   # There's problems with the test task in rake 10
   # https://github.com/jimweirich/rake/issues/144
   gem 'rake', '0.9.2.2'
-  gem 'mocha', '~>0.12.0'
+  if RUBY_VERSION > '1.9.0'
+    gem 'mocha', '~>0.13.0'
+  else
+    gem 'mocha', '~>0.12.0'
+  end
   gem 'shoulda', '~>3.0.1'
   gem 'sdoc-helpers'
   gem 'rdoc', '>= 2.4.2'

data/lib/new_relic/agent/cross_app_monitor.rb

@@ -7,9 +7,14 @@ module NewRelic
     class CrossAppMonitor
 
       NEWRELIC_ID_HEADER = 'X-NewRelic-ID'
-      NEWRELIC_TXN_HEADER = 'X-NewRelic-Transaction'
       NEWRELIC_APPDATA_HEADER = 'X-NewRelic-App-Data'
-      NEWRELIC_ID_HEADER_KEYS = %W{#{NEWRELIC_ID_HEADER} HTTP_X_NEWRELIC_ID X_NEWRELIC_ID}
+      NEWRELIC_TXN_HEADER = 'X-NewRelic-Transaction'
+      NEWRELIC_TXN_HEADER_KEYS = %W{
+        #{NEWRELIC_TXN_HEADER} HTTP_X_NEWRELIC_TRANSACTION X_NEWRELIC_TRANSACTION
+      }
+      NEWRELIC_ID_HEADER_KEYS = %W{
+        #{NEWRELIC_ID_HEADER} HTTP_X_NEWRELIC_ID X_NEWRELIC_ID
+      }
       CONTENT_LENGTH_HEADER_KEYS = %w{Content-Length HTTP_CONTENT_LENGTH CONTENT_LENGTH}
 
       # Because we aren't in the right spot when our transaction actually
@@ -26,7 +31,7 @@ module NewRelic
         module_function
 
         def obfuscate_with_key(key, text)
-          [ encode_with_key(key, text) ].pack('m').chomp
+          [ encode_with_key(key, text) ].pack('m').chomp.gsub(/\n/, '')
         end
 
         def decode_with_key(key, text)
@@ -104,9 +109,12 @@ module NewRelic
 
       def save_referring_transaction_info(request_headers)
         key = NewRelic::Agent.config[:encoding_key]
-        txn_header = request_headers[NEWRELIC_TXN_HEADER] or return
+        txn_header = from_headers( request_headers, NEWRELIC_TXN_HEADER_KEYS ) or return
         txn_header = decode_with_key( key, txn_header )
-        NewRelic::Agent::AgentThread.current[THREAD_TXN_KEY] = NewRelic.json_load( txn_header )
+        txn_info = NewRelic.json_load( txn_header )
+        NewRelic::Agent.logger.debug "Referring txn_info: %p" % [ txn_info ]
+
+        NewRelic::Agent::AgentThread.current[THREAD_TXN_KEY] = txn_info
       end
 
       def clear_referring_transaction_info
@@ -167,8 +175,8 @@ module NewRelic
         payload = [
           NewRelic::Agent.config[:cross_process_id],
           transaction_name,
-          timings.queue_time_in_seconds,
-          timings.app_time_in_seconds,
+          timings.queue_time_in_seconds.to_f,
+          timings.app_time_in_seconds.to_f,
           content_length,
           transaction_guid()
         ]
@@ -179,10 +187,11 @@ module NewRelic
       def set_transaction_custom_parameters
         # We expect to get the before call to set the id (if we have it) before
         # this, and then write our custom parameter when the transaction starts
-        NewRelic::Agent.add_custom_parameters(:client_cross_process_id => client_cross_app_id) if client_cross_app_id()
-        NewRelic::Agent.add_custom_parameters(:transaction_guid => transaction_guid()) if transaction_guid()
-        NewRelic::Agent.add_custom_parameters(:transaction_referring_guid => client_referring_transaction_guid()) if
+        NewRelic::Agent.add_custom_parameters(:client_cross_process_id => client_cross_app_id()) if client_cross_app_id()
+        NewRelic::Agent.add_custom_parameters(:referring_transaction_guid => client_referring_transaction_guid()) if
           client_referring_transaction_guid()
+
+        NewRelic::Agent.logger.debug "Referring transaction guid: %p" % [client_referring_transaction_guid()]
       end
 
       def set_error_custom_parameters(options)

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

@@ -388,10 +388,12 @@ module NewRelic
         def path_class_and_action(options)
           metric_class = options[:class_name]
 
-          if !metric_class && (self.is_a?(Class) || self.is_a?(Module))
-            metric_class = self.name
-          else
-            metric_class = self.class.name
+          if !metric_class
+            if (self.is_a?(Class) || self.is_a?(Module))
+              metric_class = self.name
+            else
+              metric_class = self.class.name
+            end
           end
 
           [ metric_class, options[:name] ].compact.join('/')

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

@@ -0,0 +1,145 @@
+# 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.
+
+module NewRelic
+  module Agent
+    module Instrumentation
+      module Rails4
+        module ActionController
+          def self.newrelic_write_attr(attr_name, value) # :nodoc:
+            write_inheritable_attribute(attr_name, value)
+          end
+
+          def self.newrelic_read_attr(attr_name) # :nodoc:
+            read_inheritable_attribute(attr_name)
+          end
+
+          # determine the path that is used in the metric name for
+          # the called controller action
+          def newrelic_metric_path(action_name_override = nil)
+            action_part = action_name_override || action_name
+            if action_name_override || self.class.action_methods.include?(action_part)
+              "#{self.class.controller_path}/#{action_part}"
+            else
+              "#{self.class.controller_path}/(other)"
+            end
+          end
+
+          def process_action(*args)
+            # skip instrumentation if we are in an ignored action
+            if _is_filtered?('do_not_trace')
+              NewRelic::Agent.disable_all_tracing do
+                return super
+              end
+            end
+
+            perform_action_with_newrelic_trace(:category => :controller, :name => self.action_name, :path => newrelic_metric_path, :params => request.filtered_parameters, :class_name => self.class.name)  do
+              super
+            end
+          end
+
+        end
+
+        module ActionView
+          module NewRelic
+            extend self
+            def template_metric(identifier, options = {})
+              if options[:file]
+                "file"
+              elsif identifier.nil?
+                "(unknown)"
+              elsif identifier.include? '/' # this is a filepath
+                identifier.split('/')[-2..-1].join('/')
+              else
+                identifier
+              end
+            end
+            def render_type(file_path)
+              file = File.basename(file_path)
+              if file.starts_with?('_')
+                return 'Partial'
+              else
+                return 'Rendering'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+DependencyDetection.defer do
+  @name = :rails4_controller
+
+  depends_on do
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
+  end
+
+  depends_on do
+    defined?(ActionController) && defined?(ActionController::Base)
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Rails 4 Controller instrumentation'
+  end
+
+  executes do
+    class ActionController::Base
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      include NewRelic::Agent::Instrumentation::Rails4::ActionController
+    end
+  end
+end
+
+DependencyDetection.defer do
+  @name = :rails40_view
+
+  depends_on do
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 4
+  end
+
+  depends_on do
+    !NewRelic::Agent.config[:disable_view_instrumentation]
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Rails 4 view instrumentation'
+  end
+
+  executes do
+    ActionView::TemplateRenderer.class_eval do
+      include NewRelic::Agent::MethodTracer
+      # namespaced helper methods
+
+      def render_with_newrelic(context, options)
+        @details = extract_details(options) if respond_to? :extract_details, true
+        identifier = determine_template(options) ? determine_template(options).identifier : nil
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails4::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
+        trace_execution_scoped str do
+          render_without_newrelic(context, options)
+        end
+      end
+
+      alias_method :render_without_newrelic, :render
+      alias_method :render, :render_with_newrelic
+    end
+
+    ActionView::PartialRenderer.class_eval do
+      include NewRelic::Agent::MethodTracer
+
+      def render_with_newrelic(*args, &block)
+        setup(*args, &block)
+        identifier = find_partial ? find_partial.identifier : nil
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails4::ActionView::NewRelic.template_metric(identifier)}/Partial"
+        trace_execution_scoped str do
+          render_without_newrelic(*args, &block)
+        end
+      end
+
+      alias_method :render_without_newrelic, :render
+      alias_method :render, :render_with_newrelic
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/rails4/errors.rb

@@ -0,0 +1,45 @@
+# 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.
+
+module NewRelic
+  module Agent
+    module Instrumentation
+      module Rails4
+        module Errors
+          def newrelic_notice_error(exception, custom_params = {})
+            filtered_params = (respond_to? :filter_parameters) ? filter_parameters(params) : params
+            filtered_params.merge!(custom_params)
+            NewRelic::Agent::Instrumentation::MetricFrame.notice_error( \
+                exception, \
+                :request => request, \
+                :metric => newrelic_metric_path, \
+                :custom_params => filtered_params)
+          end
+        end
+      end
+    end
+  end
+end
+
+DependencyDetection.defer do
+  @name = :rails4_error
+  
+  depends_on do
+    defined?(::Rails) && ::Rails.respond_to?(:version) && ::Rails.version.to_i == 4
+  end
+
+  depends_on do
+    defined?(ActionController) && defined?(ActionController::Base)
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Rails4 Error instrumentation'
+  end
+
+  executes do
+    class ActionController::Base
+      include NewRelic::Agent::Instrumentation::Rails4::Errors
+    end
+  end
+end

data/lib/new_relic/build.rb

@@ -1,2 +1,2 @@
-# GITSHA: c6b10366c93b81b0fcab3b8fe19d565dd525b039
-module NewRelic; module VERSION; BUILD='64.beta'; end; end
+# GITSHA: 7f84cb6c12bae5f32b489a4ac5b3b7c28d5cb3f6
+module NewRelic; module VERSION; BUILD='70'; end; end

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/resque/instrumentation_test.rb

@@ -17,6 +17,7 @@ class ResqueTest < Test::Unit::TestCase
     $collector.run(COLLECTOR_PORT)
     $redis.del('queue:resque_test')
     $redis.set('index_key', 0)
+    Resque::Stat.clear('processed')
     @pidfile = "resque_test.#{$$}.pid"
     JOB_COUNT.times do |i|
       Resque.enqueue(JobForTesting, 'index_key', i + 1)
@@ -89,7 +90,7 @@ class ResqueTest < Test::Unit::TestCase
   def wait_for_jobs
     time_for_jobs = 5
     begin
-      Timeout.timeout(time_for_jobs) { sleep(0.1) until Resque.info[:pending].zero? }
+      Timeout.timeout(time_for_jobs) { sleep(0.1) until Resque.info[:processed] == JOB_COUNT }
     rescue Timeout::Error => err
       raise err.exception("waiting #{time_for_jobs}s for completion of #{JOB_COUNT} jobs")
     end

data/test/new_relic/agent/cross_app_monitor_test.rb

@@ -57,6 +57,7 @@ module NewRelic::Agent
 
       when_request_runs
 
+      assert_equal 'WyJxd2VydHkiLCJ0cmFuc2FjdGlvbiIsMTAwMC4wLDIwMDAuMCwtMSwiOTQxQjBFODAwMUU0NDRFOCJd', response_app_data
       assert_equal [AGENT_CROSS_APP_ID, TRANSACTION_NAME, QUEUE_TIME, APP_TIME, -1, TRANSACTION_GUID], unpacked_response
     end
 
@@ -136,8 +137,7 @@ module NewRelic::Agent
       with_default_timings
 
       NewRelic::Agent.expects(:add_custom_parameters).with(:client_cross_process_id => REQUEST_CROSS_APP_ID)
-      NewRelic::Agent.expects(:add_custom_parameters).with(:transaction_guid => TRANSACTION_GUID)
-      NewRelic::Agent.expects(:add_custom_parameters).with(:transaction_referring_guid => REF_TRANSACTION_GUID)
+      NewRelic::Agent.expects(:add_custom_parameters).with(:referring_transaction_guid => REF_TRANSACTION_GUID)
 
       when_request_runs
     end

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

@@ -45,7 +45,7 @@ module NewRelic::Agent::Instrumentation
       t = BrowserMonitoringTimings.new(1000, @transaction)
       original = t.app_time_in_seconds
 
-      Time.stubs(:now).returns(3000)
+      Time.stubs(:now).returns(Time.at(3000))
       later = t.app_time_in_seconds
 
       assert_equal original, later

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

@@ -89,4 +89,19 @@ class NewRelic::Agent::Instrumentation::ControllerInstrumentationTest < Test::Un
     NewRelic::Agent.instance.instance_variable_set(:@transaction_rules,
                                               NewRelic::Agent::RulesEngine.new)
   end
+
+  def test_path_class_and_action
+    result = @object.send(:path_class_and_action, {})
+    assert_equal("NewRelic::Agent::Instrumentation::ControllerInstrumentationTest::TestObject", result)
+  end
+
+  def test_path_class_and_action_with_name
+    result = @object.send(:path_class_and_action, :name => "test")
+    assert_equal("NewRelic::Agent::Instrumentation::ControllerInstrumentationTest::TestObject/test", result)
+  end
+
+  def test_path_class_and_action_with_overridden_class_name
+    result = @object.send(:path_class_and_action, :name => "perform", :class_name => 'Resque')
+    assert_equal("Resque/perform", result)
+  end
 end

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

@@ -269,7 +269,12 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
 
   def test_adds_a_request_header_to_outgoing_requests_if_xp_enabled
     @socket.check_write do |data|
-      assert_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
+
+      # assert_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
+      # The above assertion won't work in Ruby 2.0.0-p0 because of a bug in the
+      # regexp engine.  Until that's fixed we'll check the header name case
+      # sensitively.
+      assert_match /X-Newrelic-Id: VURQV1BZRkZdXUFT/, data
     end
 
     with_config(:"cross_application_tracer.enabled" => true) do
@@ -279,7 +284,11 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
 
   def test_adds_a_request_header_to_outgoing_requests_if_old_xp_config_is_present
     @socket.check_write do |data|
-      assert_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
+      # assert_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
+      # The above assertion won't work in Ruby 2.0.0-p0 because of a bug in the
+      # regexp engine.  Until that's fixed we'll check the header name case
+      # sensitively.
+      assert_match /X-Newrelic-Id: VURQV1BZRkZdXUFT/, data
     end
 
     with_config(:cross_application_tracing => true) do
@@ -289,7 +298,11 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Test::Unit::Tes
 
   def test_agent_doesnt_add_a_request_header_to_outgoing_requests_if_xp_disabled
     @socket.check_write do |data|
-      assert_no_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
+      # assert_no_match /(?i:x-newrelic-id): VURQV1BZRkZdXUFT/, data
+      # The above assertion won't work in Ruby 2.0.0-p0 because of a bug in the
+      # regexp engine.  Until that's fixed we'll check the header name case
+      # sensitively.
+      assert_no_match /X-Newrelic-Id: VURQV1BZRkZdXUFT/, data
     end
 
     Net::HTTP.get URI.parse('http://www.google.com/index.html')

data/test/new_relic/agent/worker_loop_test.rb

@@ -79,6 +79,6 @@ class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase
   end
 
   def ticks(start, finish, step)
-    (start..finish).step(step).to_a
+    (start..finish).step(step).map{|i| Time.at(i)}
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.5.8.64.beta
-  prerelease: 9
+  version: 3.5.8.70
+  prerelease: 
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -134,6 +134,8 @@ files:
 - lib/new_relic/agent/instrumentation/rails/errors.rb
 - lib/new_relic/agent/instrumentation/rails3/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails3/errors.rb
+- lib/new_relic/agent/instrumentation/rails4/action_controller.rb
+- lib/new_relic/agent/instrumentation/rails4/errors.rb
 - lib/new_relic/agent/instrumentation/resque.rb
 - lib/new_relic/agent/instrumentation/sinatra.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb