newrelic_rpm 3.9.5.251 → 3.9.6.257

data/lib/new_relic/agent/transaction_state.rb

@@ -114,11 +114,11 @@ module NewRelic
       end
 
       def in_background_transaction?
-        !current_transaction.nil? && current_transaction.request.nil?
+        !current_transaction.nil? && !current_transaction.recording_web_transaction?
       end
 
-      def in_request_transaction?
-        !current_transaction.nil? && !current_transaction.request.nil?
+      def in_web_transaction?
+        !current_transaction.nil? && current_transaction.recording_web_transaction?
       end
 
       # Execution tracing on current thread

data/lib/new_relic/agent/vm/mri_vm.rb

@@ -29,11 +29,11 @@ module NewRelic
 
           if GC.respond_to?(:stat)
             gc_stats = GC.stat
-            snap.total_allocated_object = gc_stats[:total_allocated_object]
+            snap.total_allocated_object = gc_stats[:total_allocated_object] || gc_stats[:total_allocated_objects]
             snap.major_gc_count = gc_stats[:major_gc_count]
             snap.minor_gc_count = gc_stats[:minor_gc_count]
-            snap.heap_live = gc_stats[:heap_live_slot] || gc_stats[:heap_live_num]
-            snap.heap_free = gc_stats[:heap_free_slot] || gc_stats[:heap_free_num]
+            snap.heap_live = gc_stats[:heap_live_slot] || gc_stats[:heap_live_slots] || gc_stats[:heap_live_num]
+            snap.heap_free = gc_stats[:heap_free_slot] || gc_stats[:heap_free_slots] || gc_stats[:heap_free_num]
           end
         end
 

data/lib/new_relic/control/frameworks/rails3.rb

@@ -4,6 +4,7 @@
 
 require 'new_relic/control/frameworks/rails'
 require 'new_relic/rack/error_collector'
+
 module NewRelic
   class Control
     module Frameworks
@@ -22,22 +23,6 @@ module NewRelic
           ::Rails.root.to_s
         end
 
-        def init_config(options={})
-          super
-          if Agent.config[:agent_enabled] && Agent.config[:'error_collector.enabled']
-            if !rails_config.middleware.respond_to?(:include?) ||
-                !rails_config.middleware.include?(NewRelic::Rack::ErrorCollector)
-              add_error_collector_middleware
-            end
-          end
-        end
-
-        def add_error_collector_middleware
-          rails_config.middleware.use NewRelic::Rack::ErrorCollector
-        rescue => e
-          NewRelic::Agent.logger.debug("Error encountered installing ErrorCollector: #{e}")
-        end
-
         def vendor_root
           @vendor_root ||= File.join(root,'vendor','rails')
         end

data/lib/new_relic/control/instance_methods.rb

@@ -76,6 +76,8 @@ module NewRelic
           install_instrumentation
         elsif !Agent.config[:agent_enabled]
           install_shim
+        else
+          DependencyDetection.detect!
         end
       end
 

data/lib/new_relic/json_wrapper.rb

@@ -7,9 +7,24 @@ module NewRelic
     def self.load_native_json
       begin
         require 'json' unless defined?(::JSON)
-        @load_method = ::JSON.method(:load)
-        @dump_method = ::JSON.method(:dump)
-        @backend_name = :json
+
+        # yajl's replacement methods on ::JSON override both dump and generate.
+        # Because stdlib dump just calls generate, we end up calling into yajl
+        # when we don't want to. As such, we use generate directly instead of
+        # dump, although we have to fuss with defaults to make that ok.
+        generate_method = ::JSON.method(:generate)
+        if ::JSON.respond_to?(:dump_default_options)
+          options = ::JSON.dump_default_options
+        else
+          # These were the defaults from json 1.1.9 up to 1.6.1
+          options = { :allow_nan => true, :max_nesting => false }
+        end
+        @dump_method = Proc.new do |obj|
+          generate_method.call(obj, options)
+        end
+
+        @load_method    = ::JSON.method(:load)
+        @backend_name   = :json
         return true
       rescue StandardError, ScriptError
         NewRelic::Agent.logger.debug "%p while loading JSON library: %s" % [ err, err.message ] if

data/lib/new_relic/rack/browser_monitoring.rb

@@ -22,8 +22,9 @@ module NewRelic::Rack
     def traced_call(env)
       result = @app.call(env)   # [status, headers, response]
 
-      if (NewRelic::Agent.browser_timing_header != "") && should_instrument?(env, result[0], result[1])
-        response_string = autoinstrument_source(result[2], result[1])
+      js_to_inject = NewRelic::Agent.browser_timing_header
+      if (js_to_inject != "") && should_instrument?(env, result[0], result[1])
+        response_string = autoinstrument_source(result[2], result[1], js_to_inject)
 
         env[ALREADY_INSTRUMENTED_KEY] = true
         if response_string
@@ -40,7 +41,8 @@ module NewRelic::Rack
     ALREADY_INSTRUMENTED_KEY = "newrelic.browser_monitoring_already_instrumented"
 
     def should_instrument?(env, status, headers)
-      status == 200 &&
+      NewRelic::Agent.config[:'browser_monitoring.auto_instrument'] &&
+        status == 200 &&
         !env[ALREADY_INSTRUMENTED_KEY] &&
         is_html?(headers) &&
         !is_attachment?(headers) &&
@@ -64,7 +66,7 @@ module NewRelic::Rack
     CHARSET_RE         = /<\s*meta[^>]+charset\s*=[^>]*>/im.freeze
     X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv\s*=\s*['"]x-ua-compatible['"][^>]*>/im.freeze
 
-    def autoinstrument_source(response, headers)
+    def autoinstrument_source(response, headers, js_to_inject)
       source = gather_source(response)
       close_old_response(response)
       return nil unless source
@@ -86,7 +88,7 @@ module NewRelic::Rack
 
         if insertion_index
           source = source[0...insertion_index] <<
-            NewRelic::Agent.browser_timing_header <<
+            js_to_inject <<
             source[insertion_index..-1]
         else
           NewRelic::Agent.logger.debug "Skipping RUM instrumentation. Could not properly determine location to inject script."

data/lib/new_relic/rack/developer_mode.rb

@@ -52,6 +52,8 @@ module NewRelic
       protected
 
       def _call(env)
+        NewRelic::Agent.ignore_transaction
+
         @req = ::Rack::Request.new(env)
         @rendered = false
         case @req.path_info

data/lib/new_relic/rack/error_collector.rb

@@ -6,62 +6,23 @@ require 'new_relic/rack/agent_middleware'
 require 'new_relic/agent/instrumentation/middleware_proxy'
 
 module NewRelic::Rack
-  # This middleware is used by the agent in order to capture exceptions that
-  # occur within your web application. It will normally be injected into the
-  # middleware chain automatically, but if automatic injection fails in your
-  # environment, you may alternately include it manually.
+  # This middleware is no longer used by the agent by default, but remains here
+  # for API compatibility purposes.
+  #
+  # You should remove any references to it from your config.ru or other rack
+  # middleware configuration files.
+  #
+  # The agent will instead now automatically collect errors for all Rack
+  # applications if automatic Rack middleware instrumentation is enabled (it is
+  # by default), or if you have manually added any New Relic middlewares into
+  # your middleware stack.
   #
   # @api public
+  # @deprecated
   #
   class ErrorCollector < AgentMiddleware
-    def params_from_env(env)
-      if defined?(ActionDispatch::Request)
-        # We use ActionDispatch::Request if it's available so that we can get
-        # the parameter filtering supplied by Rails via filtered_parameters.
-        # The action and controller params are synthesized by
-        # ActionDispatch::Request, so we strip them for consistency with Rack::Request
-        params = ActionDispatch::Request.new(env).filtered_parameters
-        params.delete('action')
-        params.delete('controller')
-        params
-      else
-        Rack::Request.new(env).params
-      end
-    rescue => e
-      warning = "failed to capture request parameters: %p: %s" % [ e.class, e.message ]
-      NewRelic::Agent.logger.warn(warning)
-      { 'error' => warning }
-    end
-
-    def strip_query_string(s)
-      s.gsub(/\?.*/, '')
-    end
-
-    def uri_from_env(env)
-      strip_query_string("#{env['SCRIPT_NAME']}#{env['PATH_INFO']}")
-    end
-
-    def referrer_from_env(env)
-      strip_query_string(env['HTTP_REFERER'].to_s)
-    end
-
     def traced_call(env)
-      begin
-        @app.call(env)
-      rescue Exception => exception
-        NewRelic::Agent.logger.debug "collecting %p: %s" % [ exception.class, exception.message ]
-        if !should_ignore_error?(exception, env)
-          NewRelic::Agent.notice_error(exception,
-                                       :uri => uri_from_env(env),
-                                       :referer => referrer_from_env(env),
-                                       :request_params => params_from_env(env))
-        end
-        raise exception
-      end
-    end
-
-    def should_ignore_error?(error, env)
-      NewRelic::Agent.instance.error_collector.error_is_ignored?(error)
+      @app.call(env)
     end
   end
 end

data/lib/new_relic/transaction_sample.rb

@@ -52,10 +52,6 @@ module NewRelic
       @start_time - @@start_time.to_f
     end
 
-    def to_json
-      JSON.dump(self.to_array)
-    end
-
     def set_custom_param(name, value)
       @params[:custom_params] ||= {}
       @params[:custom_params][name] = value

data/lib/new_relic/transaction_sample/segment.rb

@@ -53,10 +53,6 @@ module NewRelic
           [ (@called_segments ? @called_segments.map{|s| s.to_array} : []) ]
       end
 
-      def to_json
-        JSON.dump(self.to_array)
-      end
-
       def path_string
         "#{metric_name}[#{called_segments.collect {|segment| segment.path_string }.join('')}]"
       end

data/lib/new_relic/version.rb

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

data/newrelic_rpm.gemspec

@@ -8,8 +8,9 @@ require 'new_relic/latest_changes'
 Gem::Specification.new do |s|
   s.name = "newrelic_rpm"
   s.version = NewRelic::VERSION::STRING
+  s.required_ruby_version = '>= 1.8.7'
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = [ "Jason Clark", "Sam Goldstein", "Jonan Scheffler", "Ben Weintraub", "Chris Pine" ]
+  s.authors = [ "Jason Clark", "Tim Krajcar", "Chris Pine", "Jonan Scheffler", "Ben Weintraub" ]
   s.date = Time.now.strftime('%Y-%m-%d')
   s.licenses    = ['New Relic', 'MIT', 'Ruby']
   s.description = <<-EOS
@@ -55,7 +56,7 @@ EOS
   if RUBY_PLATFORM == 'java'
     s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
   else
-    s.add_development_dependency 'sqlite3', '1.3.8'
+    s.add_development_dependency 'sqlite3'
   end
 
   if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'

data/test/agent_helper.rb

@@ -287,7 +287,7 @@ end
 # Convenience wrapper around in_transaction that sets the category so that it
 # looks like we are in a web transaction
 def in_web_transaction(name='dummy')
-  in_transaction(name, :category => :controller) do
+  in_transaction(name, :category => :controller, :request => stub()) do
     yield
   end
 end

data/test/config/test.cert.crt

@@ -1,14 +1,18 @@
 -----BEGIN CERTIFICATE-----
-MIICLzCCAZgCCQCnkGSReKv/pTANBgkqhkiG9w0BAQUFADBcMQswCQYDVQQGEwJV
-UzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDESMBAGA1UEChMJ
-TmV3IFJlbGljMRUwEwYDVQQDEwxuZXdyZWxpYy5jb20wHhcNMTMwNjIxMTcxNzEy
-WhcNMjMwNjE5MTcxNzEyWjBcMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29u
-MREwDwYDVQQHEwhQb3J0bGFuZDESMBAGA1UEChMJTmV3IFJlbGljMRUwEwYDVQQD
-EwxuZXdyZWxpYy5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOsuntDM
-BSdK2YHRYzzqzm5adZspXUrEMZJa/D/vp/xtf3b7WCtKpstvS/wkhvHmpLGbrI+Q
-SnhijZKBVsps1eGDBXD+7ieHLSmI/74VL/PayHn5OKXb9RJ1VmYavM+1AWFNv75A
-akqNL84vykpeqk13nfJGqjzpiqnMg1xg1usNAgMBAAEwDQYJKoZIhvcNAQEFBQAD
-gYEAeG8F0vIQY6nCgUQl/k+JTG40PAQUdASpzkxgINX/CbzReFIp6r29/szjTI0n
-kujAl1XWmIf1Q+xapoW23eWEo0eqlWdjiz+F27VjCraTo1I84+LtGwFZfAAi3wCl
-qwZz9vdk1wUN8Pfo3fSZsnk97//c7+UFPMdyDlSlLbYJ8NI=
+MIIC4TCCAkqgAwIBAgIJAOIPeejXAamDMA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
+BAYTAlVTMQswCQYDVQQIEwJPUjERMA8GA1UEBxMIUG9ydGxhbmQxEjAQBgNVBAoT
+CU5ldyBSZWxpYzESMBAGA1UEAxMJbG9jYWxob3N0MB4XDTE0MTAxNzE2MzYyOVoX
+DTI0MTAxNDE2MzYyOVowVTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk9SMREwDwYD
+VQQHEwhQb3J0bGFuZDESMBAGA1UEChMJTmV3IFJlbGljMRIwEAYDVQQDEwlsb2Nh
+bGhvc3QwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANLOzYXpWdEXCa1+uvB5
+KDDHD0mn+FbDhjQnR9oT3Hf4UBNMCHjdL4FP1I5FYH8W1qBHHNJNjTr29BtcUMGR
+0YzLJXplGS48JmcdvigCGVTqoTl52H9AwaDwKGsQxwTtws2E6IydnQlRYeyMA1tF
+oFUbDGYoRCWTmOmJwf5gPPpTAgMBAAGjgbgwgbUwHQYDVR0OBBYEFAJsqdk2gCV3
+pUm6II55XfIT6Rp1MIGFBgNVHSMEfjB8gBQCbKnZNoAld6VJuiCOeV3yE+kadaFZ
+pFcwVTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk9SMREwDwYDVQQHEwhQb3J0bGFu
+ZDESMBAGA1UEChMJTmV3IFJlbGljMRIwEAYDVQQDEwlsb2NhbGhvc3SCCQDiD3no
+1wGpgzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBALuLxN2r5zKenhyq
+vqzox7ru9Rz4BOmJ0u86u/d+l/umMCkZUM3eOu6ey+0k1RkSEyOXb3jfEnRcK3KB
+5XJN4ZPmmyyNSCyHa/E0/7VrDHD5V+DwOGqFr6qalBFj5t+SRha3UgRE3AJa9hKs
+ombbF12X44MsW+Ksd9vC69x8DHXi
 -----END CERTIFICATE-----

data/test/config/test.cert.key

@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDrLp7QzAUnStmB0WM86s5uWnWbKV1KxDGSWvw/76f8bX92+1gr
-SqbLb0v8JIbx5qSxm6yPkEp4Yo2SgVbKbNXhgwVw/u4nhy0piP++FS/z2sh5+Til
-2/USdVZmGrzPtQFhTb++QGpKjS/OL8pKXqpNd53yRqo86YqpzINcYNbrDQIDAQAB
-AoGABbLXfk+zQER8CL0+HlfCMMJYXy4daJZgbR9vRU1VULSGhieI92OTrxI/URjB
-fFMOYo9XGxNv+oLI02f25mjEtepGahrD/8/26dPyYWRaOIC9rO7YWxPzlo9QV+z4
-AyNlTfgfO8qUYW3M/egk8rualpSNN9TS5nUdTC+dlbeEhIECQQD4wOWwFm85aJN9
-6Nh7qn7ZW7gx7adECRqnpRve/TsqiAKr+kshCVE7JGrgzqeqAcA9oYLn3B1UZEGm
-KoZaGfdpAkEA8giDYTQpJ+2REYEUO3AKIVDCVuI4lESM8AuwjQH7KlJ1nbVXv0U+
-nHSLGu+Qj7CVGmvuEutBwa7nCQs9qs+mBQJALW4FRMiEHab0sN0SlFtJ+WZf2HZ/
-wtQq0w07btkushDO9ButFuZ9uGBpSI9VXZ4ePuM9Zhz0GlKJDtDbYp81aQJAGl5b
-EegA49y6BVIuxhr6v45w3c5fo6ekQzLC1Vn15zJ8peXv3WLJ43m+/fxDn6P5WpuP
-oHgI/fT0LsQOv+FHkQJBAKn0+5AMaAcQPQRBofT3i9SYQBjZKwshTRni1ktwGu7S
-19BkWaPJR9h9xxnPxC7U8PG0HuZ7jYOt0PgypJU2/No=
+MIICXQIBAAKBgQDSzs2F6VnRFwmtfrrweSgwxw9Jp/hWw4Y0J0faE9x3+FATTAh4
+3S+BT9SORWB/FtagRxzSTY069vQbXFDBkdGMyyV6ZRkuPCZnHb4oAhlU6qE5edh/
+QMGg8ChrEMcE7cLNhOiMnZ0JUWHsjANbRaBVGwxmKEQlk5jpicH+YDz6UwIDAQAB
+AoGAQk3jXLwhkN9DHvueRqaE2pqxl0QqmveSjXLRaakXjfBfF0Kx43oGSBDY1QrD
+KBYB2ZWkXg0gX6xu6PAnQkrf8msNkcuNEXwYV13NE3L/orhhANEjdps9OV3G0uov
+k3/nugo1eonY38aMx9swFLQGh/hr4Lpk+6TlR59jlPHYo0kCQQD8Oj3s4psAz80p
+cUOoZCPN7m+IhWM20LviAlpTKECgYdqUt/f/Alyhdr8N2axrJ2Xe58RllFusiCyw
+m+FqZwmtAkEA1fX36c1e0fMqlpdEsuPa1bAg8D2dY9jE07nI8cAhC0Fa1tw7Qh/m
+zfEVktRTgf561DhKM2InpTTfHglVVryT/wJAc3tfGvRtr6N09cKMDa87zW+b1U/t
+Kw3K2CHnpSdK36Ot5mWMwE8ehjbOJtNA5Ba3x6UqALA6gPYgMARO4t6mSQJBAKmH
+HaqTvbiOekUdkCJJ5b+AsWiI+Wb+f13fC7d46vW3D9nEX/ORwVeV2Okg8RXD4+C4
+xRoXgKAm104+SO7TtlMCQQC9St4s8Z76CeUZv/AN5200pjMQBdKpStViQ13rGE2c
+fkTLYOSU8AuUyfzaDY+J7tyRCtagVpdnQh98uINoLXHn
 -----END RSA PRIVATE KEY-----

data/test/environments/lib/environments/runner.rb

@@ -14,6 +14,9 @@ module Environments
       "1.9"         => ["rails21", "rails22"],
       "2"           => ["rails21", "rails22", "rails23"],
 
+      # https://github.com/rails/rails/issues/17017
+      "2.2"         => ["rails30", "rails31", "rails32"],
+
       "1.8.7"       => ["rails40", "rails41", "rails42"],
       "1.9.2"       => ["rails40", "rails41", "rails42"],
       "ree"         => ["rails40", "rails41", "rails42"],

data/test/environments/rails30/Gemfile

@@ -11,8 +11,8 @@ gem 'rack-test'
 gem 'newrelic_rpm', :path => '../../..'
 
 if (RUBY_PLATFORM == 'java')
-  gem "activerecord-jdbcmysql-adapter", '1.2.5'
-  gem "activerecord-jdbcsqlite3-adapter", '1.2.5'
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
   gem "jruby-openssl"
 else
   gem "mysql", "~>2.9.1"

data/test/environments/rails31/Gemfile

@@ -11,8 +11,8 @@ gem 'rack-test'
 gem 'newrelic_rpm', :path => '../../..'
 
 if (RUBY_PLATFORM == 'java')
-  gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
-  gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
   gem "jruby-openssl"
 else
   gem "mysql", "~>2.9.1"

data/test/environments/rails32/Gemfile

@@ -11,8 +11,8 @@ gem 'rack-test'
 gem "newrelic_rpm", :path => "../../.."
 
 platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter", "~>1.2.9"
-  gem "activerecord-jdbcsqlite3-adapter", "~>1.2.9"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
   gem "jruby-openssl"
 end
 

data/test/environments/rails40/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.0.4'
+gem 'rails', '~>4.0.10'
 
 # Do not automatically require minitest, since this will break with rbx-2.2.5.
 # rbx-2.2.5 helpfully bundles minitest-5.3.0.
@@ -25,9 +25,7 @@ end
 
 platforms :ruby do
   gem "mysql"
-  # Lock at 1.3.8 to work around:
-  # https://github.com/sparklemotion/sqlite3-ruby/issues/122
-  gem "sqlite3", '1.3.8'
+  gem "sqlite3"
 end
 
 platforms :rbx do

data/test/environments/rails41/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.1.0'
+gem 'rails', '~>4.1.6'
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false
@@ -17,9 +17,7 @@ end
 
 platforms :ruby do
   gem "mysql"
-  # Lock at 1.3.8 to work around:
-  # https://github.com/sparklemotion/sqlite3-ruby/issues/122
-  gem "sqlite3", '1.3.8'
+  gem "sqlite3"
 end
 
 platforms :rbx do

data/test/environments/rails42/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake'
 
-gem 'rails', '~>4.2.0.beta1'
+gem 'rails', '~>4.2.0.beta2'
 
 gem 'minitest', '5.2.3'
 gem 'mocha', :require => false
@@ -17,9 +17,7 @@ end
 
 platforms :ruby do
   gem "mysql"
-  # Lock at 1.3.8 to work around:
-  # https://github.com/sparklemotion/sqlite3-ruby/issues/122
-  gem "sqlite3", '1.3.8'
+  gem "sqlite3"
 end
 
 platforms :rbx do