newrelic_rpm 3.4.0.1 → 3.4.1.beta1

data/CHANGELOG

@@ -1,3 +1,18 @@
+ 
+v3.4.1.beta1
+ * Fix edge case in RUM auto instrumentation where X-UA-Compatible meta tag is 
+   present but </head> tag is missing.
+ * Fixed reference to @service.request_timeout to @request_timeout in 
+   new_relic_service.rb. (Thanks to Matthew Savage)
+ * preserve visibility on traced methods. Aliased methods now have the same 
+   visibility as the original traced method. A couple
+   of the esoteric methods created in the process weren't getting the visibility 
+   set properly. fixed.
+ * Agent service does not connect to directed shard collector after connecting 
+   to proxy
+ * corrupt marshal data from pipe children crashing agent
+ * should reset RubyBench GC counter between polls
+
 v3.4.0.1
  * Prevent the agent from resolving the collector address when disabled.
  * Fix for error collector configuration that was introduced during beta.

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

@@ -139,6 +139,7 @@ module NewRelic
               options_arg << %Q[:#{key} => #{valuestr}]
             end
             traced_method, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
+            visibility = NewRelic::Helper.instance_method_visibility self, method
 
             class_eval <<-EOC
               def #{traced_method.to_s}_with_newrelic_transaction_trace#{punctuation}(*args, &block)
@@ -147,8 +148,12 @@ module NewRelic
                  end
               end
             EOC
-            alias_method "#{traced_method.to_s}_without_newrelic_transaction_trace#{punctuation}", method.to_s
-            alias_method method.to_s, "#{traced_method.to_s}_with_newrelic_transaction_trace#{punctuation}"
+            without_method_name = "#{traced_method.to_s}_without_newrelic_transaction_trace#{punctuation}"
+            with_method_name = "#{traced_method.to_s}_with_newrelic_transaction_trace#{punctuation}"
+            alias_method without_method_name, method.to_s
+            alias_method method.to_s, with_method_name
+            send visibility, method
+            send visibility, with_method_name
             NewRelic::Control.instance.log.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
           end
         end

data/lib/new_relic/agent/method_tracer.rb

@@ -481,9 +481,13 @@ module NewRelic
 
           traced_method = code_to_eval(method_name, metric_name_code, options)
 
+          visibility = NewRelic::Helper.instance_method_visibility self, method_name
+
           class_eval traced_method, __FILE__, __LINE__
           alias_method _untraced_method_name(method_name, metric_name_code), method_name
           alias_method method_name, _traced_method_name(method_name, metric_name_code)
+          send visibility, method_name
+          send visibility, _traced_method_name(method_name, metric_name_code)
           NewRelic::Control.instance.log.debug("Traced method: class = #{self.name},"+
                     "method = #{method_name}, "+
                     "metric = '#{metric_name_code}'")

data/lib/new_relic/agent/new_relic_service.rb

@@ -24,8 +24,9 @@ module NewRelic
       end
       
       def connect(settings={})
-        host = get_redirect_host
-        @collector.name = host if host
+        if host = get_redirect_host
+          @collector = NewRelic::Control.instance.server_from_host(host)
+        end
         response = invoke_remote(:connect, settings)
         @agent_id = response['agent_run_id']
         response
@@ -167,7 +168,7 @@ module NewRelic
             response = http.request(request)
           end
         rescue Timeout::Error
-          log.warn "Timed out trying to post data to New Relic (timeout = #{@request_timeout} seconds)" unless @service.request_timeout < 30
+          log.warn "Timed out trying to post data to New Relic (timeout = #{@request_timeout} seconds)" unless @request_timeout < 30
           raise
         end
         if response.is_a? Net::HTTPServiceUnavailable

data/lib/new_relic/agent/pipe_channel_manager.rb

@@ -1,8 +1,15 @@
+require 'base64'
+
 module NewRelic
   module Agent
+
+    #--
+    # Manages the registering and servicing of pipes used by child
+    # processes to report data to their parent, rather than directly
+    # to the collector.
     module PipeChannelManager
       extend self
-      
+
       def register_report_channel(id)
         listener.register_pipe(id)
       end
@@ -121,7 +128,7 @@ module NewRelic
             payload = unmarshal(got)
             if payload == 'EOF'
               pipe.close
-            else
+            elsif payload
               NewRelic::Agent.agent.merge_data_from([payload[:stats],
                                                      payload[:transaction_traces],
                                                      payload[:error_traces]])
@@ -137,8 +144,12 @@ module NewRelic
           else
             Marshal.load(data)
           end
+        rescue StandardError => e
+          msg = "#{e.class.name} '#{e.message}' trying to load #{Base64.encode64(data)}"
+          NewRelic::Control.instance.log.debug(msg)
+          nil
         end
-        
+                
         def should_keep_listening?
           @started || @pipes.values.find{|pipe| !pipe.in.closed?}
         end

data/lib/new_relic/agent/stats_engine/gc_profiler.rb

@@ -72,6 +72,10 @@ module NewRelic
           def call_count
             ::GC.collections
           end
+
+          def reset
+            ::GC.clear_stats
+          end
         end
         
         class Ruby19 < Profiler

data/lib/new_relic/control/server_methods.rb

@@ -31,7 +31,10 @@ module NewRelic
       # information pulled from the config file
       def proxy_server
         @proxy_server ||=
-          NewRelic::Control::ProxyServer.new self['proxy_host'], self['proxy_port'], self['proxy_user'], self['proxy_pass']
+          NewRelic::Control::ProxyServer.new(self['proxy_host'],
+                                             self['proxy_port'],
+                                             self['proxy_user'],
+                                             self['proxy_pass'])
       end
       
       # turns a hostname into an ip address and returns a
@@ -40,7 +43,9 @@ module NewRelic
         host = hostname || self['host'] || 'collector.newrelic.com'
 
         # if the host is not an IP address, turn it into one
-        NewRelic::Control::Server.new host, (self['port'] || (use_ssl? ? 443 : 80)).to_i, convert_to_ip_address(host)
+        NewRelic::Control::Server.new(host,
+                                  (self['port'] || (use_ssl? ? 443 : 80)).to_i,
+                                  convert_to_ip_address(host))
       end
 
       # Check to see if we need to look up the IP address

data/lib/new_relic/helper.rb

@@ -17,5 +17,15 @@ module NewRelic
       end
     end
 
+    def instance_method_visibility(klass, method_name)
+      if klass.private_instance_methods.map{|s|s.to_sym}.include? method_name.to_sym
+        :private
+      elsif klass.protected_instance_methods.map{|s|s.to_sym}.include? method_name.to_sym
+        :protected
+      else
+        :public
+      end
+    end
+
   end
 end

data/lib/new_relic/language_support.rb

@@ -69,9 +69,13 @@ module NewRelic::LanguageSupport
 
   def with_disabled_gc
     if defined?(::GC) && ::GC.respond_to?(:disable)
-      ::GC.disable
-      val = yield
-      ::GC.enable
+      val = nil
+      begin
+        ::GC.disable
+        val = yield
+      ensure
+        ::GC.enable
+      end
       val
     else
       yield

data/lib/new_relic/rack/browser_monitoring.rb

@@ -44,22 +44,28 @@ module NewRelic::Rack
         footer = NewRelic::Agent.browser_timing_footer
         header = NewRelic::Agent.browser_timing_header
 
-        if beginning_of_source.include?('X-UA-Compatible')
+        head_pos = if beginning_of_source.include?('X-UA-Compatible')
           # put at end of header if UA-Compatible meta tag found
-          head_pos = beginning_of_source.index("</head>")
-        elsif head_open = beginning_of_source.index("<head")
+          beginning_of_source.index("</head>")
+       elsif head_open = beginning_of_source.index("<head")
           # put at the beginning of the header
-          head_pos = beginning_of_source.index(">", head_open) + 1
-        else
-          # put the header right above body start
-          head_pos = body_start
+          beginning_of_source.index(">", head_open) + 1
         end
+        # otherwise put the header right above body start
+        head_pos ||= body_start
 
-        source = source[0..(head_pos-1)] + header + source[head_pos..(body_close-1)] + footer + source[body_close..-1]
-
-        headers['Content-Length'] = source.length.to_s if headers['Content-Length']
+        # check that head_pos is less than body close.  If it's not something
+        # is really weird and we should punt.
+        if head_pos < body_close
+          # rebuild the source
+          source = source[0..(head_pos-1)] <<
+            header <<
+            source[head_pos..(body_close-1)] <<
+            footer <<
+            source[body_close..-1]
+        end
       end
-
+      headers['Content-Length'] = source.length.to_s if headers['Content-Length']
       source
     end
   end

data/lib/new_relic/version.rb

@@ -3,8 +3,8 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 4
-    TINY  = 0
-    BUILD = 1 # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    TINY  = 1
+    BUILD = 'beta1' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -1,18 +1,17 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
-  s.version = "3.4.0.1"
+  s.version = "3.4.1.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
-  s.date = "2012-06-25"
+  s.date = "2012-07-24"
   s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com).  New Relic provides you with deep\ninformation about the performance of your web application as it runs\nin production. The New Relic Ruby Agent is dual-purposed as a either a\nGem or plugin, hosted on\nhttp://github.com/newrelic/rpm/\n"
   s.email = "support@newrelic.com"
-  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
+  s.executables = ["newrelic_cmd", "newrelic", "mongrel_rpm"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -191,6 +190,7 @@ Gem::Specification.new do |s|
     "test/new_relic/delayed_job_injection_test.rb",
     "test/new_relic/fake_collector.rb",
     "test/new_relic/fake_service.rb",
+    "test/new_relic/load_test.rb",
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
     "test/new_relic/metric_parser/metric_parser_test.rb",

data/test/new_relic/agent/new_relic_service_test.rb

@@ -2,7 +2,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_hel
 
 class NewRelicServiceTest < Test::Unit::TestCase
   def setup
-    @server = NewRelic::Control::Server.new('127.0.0.1', 30303)    
+    @server = NewRelic::Control::Server.new('somewhere.example.com',
+                                            30303, '10.10.10.10')
     @service = NewRelic::Agent::NewRelicService.new('license-key', @server)
     @http_handle = HTTPHandle.new
     NewRelic::Control.instance.stubs(:http_connection).returns(@http_handle)
@@ -21,18 +22,24 @@ class NewRelicServiceTest < Test::Unit::TestCase
   end
 
   def test_connect_sets_redirect_host
-    assert_equal '127.0.0.1', @service.collector.name
+    assert_equal 'somewhere.example.com', @service.collector.name
     @service.connect    
     assert_equal 'localhost', @service.collector.name
   end
-
+  
+  def test_connect_resets_cached_ip_address
+    assert_equal '10.10.10.10', @service.collector.ip
+    @service.connect    
+    assert_nil @service.collector.ip # 'localhost' resolves to nil
+  end
+  
   def test_connect_uses_proxy_collector_if_no_redirect_host
     @http_handle.reset
     @http_handle.respond_to(:get_redirect_host, nil)
     @http_handle.respond_to(:connect, {'agent_run_id' => 1})
 
     @service.connect
-    assert_equal '127.0.0.1', @service.collector.name
+    assert_equal 'somewhere.example.com', @service.collector.name
   end
 
   def test_connect_sets_agent_id
@@ -97,7 +104,21 @@ class NewRelicServiceTest < Test::Unit::TestCase
       @service.send(:invoke_remote, :bogus_method)
     end
   end
+  
+  def test_should_connect_to_proxy_only_once_per_run
+    @service.expects(:get_redirect_host).once
 
+    @service.connect
+    @http_handle.respond_to(:metric_data, '0')
+    @service.metric_data(Time.now - 60, Time.now, {})
+    
+    @http_handle.respond_to(:transaction_sample_data, '1')
+    @service.transaction_sample_data([])
+
+    @http_handle.respond_to(:sql_trace_data, '2')
+    @service.sql_trace_data([])
+  end
+  
   class HTTPHandle
     attr_accessor :read_timeout, :route_table
 

data/test/new_relic/agent/pipe_channel_manager_test.rb

@@ -103,6 +103,17 @@ class NewRelic::Agent::PipeChannelManagerTest < Test::Unit::TestCase
       assert(!NewRelic::Agent::PipeChannelManager.channels[669] ||
              NewRelic::Agent::PipeChannelManager.channels[669].closed?)
     end
+
+    def test_manager_does_not_crash_when_given_bad_data
+      listener = start_listener_with_pipe(670)
+      assert_nothing_raised do
+        pid = Process.fork do
+          listener.pipes[670].in << 'some unloadable garbage'
+        end
+        Process.wait(pid)
+        listener.stop
+      end
+    end
   end
   
   def start_listener_with_pipe(pipe_id)

data/test/new_relic/agent/stats_engine_test.rb

@@ -195,9 +195,12 @@ class NewRelic::Agent::StatsEngineTest < Test::Unit::TestCase
       ::GC::Profiler.stubs(:enabled?).returns(true)
       ::GC::Profiler.stubs(:total_time).returns(1.0, 4.0) 
       ::GC.stubs(:count).returns(1, 3)      
-    elsif NewRelic::LanguageSupport.using_version?('1.8')
+    elsif NewRelic::LanguageSupport.using_version?('1.8.7') &&
+        RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
       ::GC.stubs(:time).returns(1000000, 4000000)
       ::GC.stubs(:collections).returns(1, 3)
+    else
+      return true # no need to test if we're not collecting GC metrics
     end
     
     engine = NewRelic::Agent.instance.stats_engine

data/test/new_relic/load_test.rb

@@ -0,0 +1,13 @@
+# require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+require 'test/unit'
+require 'resolv'
+require 'mocha'
+
+class LoadTest < Test::Unit::TestCase
+  def test_loading_agent_when_disabled_does_not_resolv_addresses
+    ::Resolv.expects(:getaddress).never
+    ::IPSocket.expects(:getaddress).never
+
+    require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
+  end
+end

data/test/script/ci.sh

@@ -127,4 +127,14 @@ fi
 
 export RAILS_ENV=test
 bundle
-bundle exec rake --trace db:create:all ci:setup:testunit test:newrelic
+
+# FIXME:  Here we actually trigger the tests. Since the agent deals so heavily
+# in units of time we have many tests that assert that durations are measured
+# correctly.  These almost always pass, but as the CI machine has come under
+# heavier load there tend to be discrepencies between the duration measured in
+# the test and the duration the agent measures.  This is due to lags in CPU
+# scheduling since many processes are running on the box simultaneously.
+# To reduce the noise from these sporardic failures we rerun the test suite if
+# there are failures to see if they are transient (instead of re-running it by
+# hand).  Ultimately we'll move towards a more elegant solution.
+bundle exec rake --trace db:create:all test:newrelic || bundle exec rake --trace test:newrelic || bundle exec rake --trace test:newrelic

metadata

@@ -1,10 +1,17 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: newrelic_rpm
-version: !ruby/object:Gem::Version
-  version: 3.4.0.1
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: -2372133300
+  prerelease: 6
+  segments: 
+  - 3
+  - 4
+  - 1
+  - beta
+  - 1
+  version: 3.4.1.beta1
 platform: ruby
-authors:
+authors: 
 - Bill Kayser
 - Jon Guymon
 - Justin George
@@ -12,66 +19,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &2158373720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2158373720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &2158373160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2158373160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &2158372660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *2158372660
-description: ! 'New Relic is a performance management system, developed by New Relic,
-
+  version_requirements: *id003
+description: |
+  New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
-
   information about the performance of your web application as it runs
-
   in production. The New Relic Ruby Agent is dual-purposed as a either a
-
   Gem or plugin, hosted on
-
   http://github.com/newrelic/rpm/
 
-'
 email: support@newrelic.com
-executables:
-- mongrel_rpm
-- newrelic
+executables: 
 - newrelic_cmd
+- newrelic
+- mongrel_rpm
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
 - README.rdoc
 - newrelic.yml
-files:
+files: 
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -243,6 +256,7 @@ files:
 - test/new_relic/delayed_job_injection_test.rb
 - test/new_relic/fake_collector.rb
 - test/new_relic/fake_service.rb
+- test/new_relic/load_test.rb
 - test/new_relic/local_environment_test.rb
 - test/new_relic/metric_data_test.rb
 - test/new_relic/metric_parser/metric_parser_test.rb
@@ -347,39 +361,63 @@ files:
 - vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-post_install_message: ! "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper
-  Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version
-  2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.
-  \ To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode
-  to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least
-  version 1.4 or \nlater because of issues with the implementation of the timeout
-  library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor
-  a complete description of the features and enhancements available\nin version 3.4
-  of the Ruby Agent.\n  \n"
-rdoc_options:
+
+post_install_message: |
+  
+  PLEASE NOTE:
+  
+  Developer Mode is now a Rack middleware.
+  
+  Developer Mode is no longer available in Rails 2.1 and earlier.
+  However, starting in version 2.12 you can use Developer Mode in any
+  Rack based framework, in addition to Rails.  To install developer mode
+  in a non-Rails application, just add NewRelic::Rack::DeveloperMode to
+  your middleware stack.
+  
+  If you are using JRuby, we recommend using at least version 1.4 or 
+  later because of issues with the implementation of the timeout library.
+  
+  Refer to the README.md file for more information.
+  
+  Please see http://github.com/newrelic/rpm/blob/master/CHANGELOG
+  for a complete description of the features and enhancements available
+  in version 3.4 of the Ruby Agent.
+    
+
+rdoc_options: 
 - --charset=UTF-8
 - --line-numbers
 - --inline-source
 - --title
 - New Relic Ruby Agent
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: New Relic Ruby Agent
 test_files: []
+