newrelic_rpm 3.11.1.284 → 3.11.2.286

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a71bd82de45fa922b3f919abdffe33cf912d246
-  data.tar.gz: d446b74d6f795459bda5a62778656891b72da57d
+  metadata.gz: 24d158e960a984711fcd70df97914459118a2185
+  data.tar.gz: b13d960b29bf717bc74ae2352f94ca3d8f18a49c
 SHA512:
-  metadata.gz: dbab9fd70fb4093a30cf107cc5be8bbbe1fe8611786acdbda620d4e393f2028f9f6bc1032e283b5aa4b534554a61a9e832010d53ca89ceaa5dd64fe852b75bbb
-  data.tar.gz: 5ccc9605c5c54e7fba3655e888eb108b57581384d5eaa3e1b84e84eb3c8c093a6cb48ca41cdf30b883ca4c90377aa2dc7ab129bd9fee7fac931f5ebd838e8c2e
+  metadata.gz: ac4abe0eb22876af9449ae733d5b9170254165687a0dea29570a98cb8b7e277be912c7b90909f37400a2cfa8aaa4751e2cf7bd3e60e884f61422009d2116abb5
+  data.tar.gz: 8c0782580d17557189e01654f2e7bf978e7e958df34d8c9f8aad58906995fa8c1137e5a78a96c9c0f25770a231b001617571875a71369bfd1d3dd9439fa2a163

data/CHANGELOG

@@ -1,8 +1,49 @@
 # New Relic Ruby Agent Release Notes #
 
-## v3.11.1 ##
+## v3.11.2 ##
+
+* Better naming for Rack::URLMap
+
+  If a Rack app made direct use of Rack::URLMap, instrumentation would miss
+  out on using the clearest naming based on the app class. This has been
+  fixed.
+
+* Avoid performance regression in makara database adapter
+
+  Delegation in the makara database adapter caused performance issues when the
+  agent looked up a connection in the pool.  The agent now uses a faster
+  lookup to work around this problem in makara, and allocates less as well.
+  Thanks Mike Nelson for the help in resolving this!
+
+* Allow audit logging to STDOUT
+
+  Previously audit logs of the agent's communication with New Relic could only
+  write to a file. This prevented using the feature on cloud providers like
+  Heroku. Now STDOUT is an allowed destination for `audit_log.path`. Logging
+  can also be restricted to certain endpoints via `audit_log.endpoints`.
 
-  * Fix for segmentation fault with sequel_pg 1.6.11
+  For more information see https://docs.newrelic.com/docs/agents/ruby-agent/installation-configuration/ruby-agent-configuration#audit_log
+
+* Fix for crash during startup when Rails required but not used
+
+  If an application requires Rails but wasn't actually running it, the Ruby
+  agent would fail during startup. This has been fixed.
+
+  * Use IO.select explicitly in the event loop
+
+  If an application adds their own select method to Object/Kernel or mixes in a
+  module that overrides the select method (as with ActionView::Helpers) we would
+  previously have used their implementation instead of the intended IO.select,
+  leading to all sorts of unusual errors. We now explicitly reference IO.select
+  in the event loop to avoid these issues.
+
+  * Fix for background thread hangs on old Linux kernels
+
+  When running under Ruby 1.8.7 on Linux kernel versions 2.6.11 and earlier,
+  the background thread used by the agent to report data would hang, leading
+  to no data being reported. This has been be fixed.
+
+## v3.11.1 ##
 
   The Ruby agent incorrectly rescued exceptions at a point which caused
   sequel_pg 1.6.11 to segfault. This has been fixed. Thanks to Oldrich

data/lib/new_relic/agent/agent.rb

@@ -651,7 +651,7 @@ module NewRelic
           def handle_force_restart(error)
             ::NewRelic::Agent.logger.debug error.message
             drop_buffered_data
-            @service.reset_metric_id_cache if @service
+            @service.force_restart if @service
             @connect_state = :pending
             sleep 30
           end

data/lib/new_relic/agent/audit_logger.rb

@@ -11,6 +11,7 @@ module NewRelic
     class AuditLogger
       def initialize
         @enabled = NewRelic::Agent.config[:'audit_log.enabled']
+        @endpoints = NewRelic::Agent.config[:'audit_log.endpoints']
         @encoder = NewRelic::Agent::NewRelicService::Encoders::Identity
       end
 
@@ -25,16 +26,16 @@ module NewRelic
       end
 
       def log_request(uri, data, marshaller)
-        if enabled?
-          setup_logger unless setup?
-          request_body = if marshaller.class.human_readable?
-            marshaller.dump(data, :encoder => @encoder)
-          else
-            marshaller.prepare(data, :encoder => @encoder).inspect
-          end
-          @log.info("REQUEST: #{uri}")
-          @log.info("REQUEST BODY: #{request_body}")
+        return unless enabled? && allowed_endpoint?(uri)
+
+        setup_logger unless setup?
+        request_body = if marshaller.class.human_readable?
+          marshaller.dump(data, :encoder => @encoder)
+        else
+          marshaller.prepare(data, :encoder => @encoder).inspect
         end
+        @log.info("REQUEST: #{uri}")
+        @log.info("REQUEST BODY: #{request_body}")
       rescue StandardError, SystemStackError, SystemCallError => e
         ::NewRelic::Agent.logger.warn("Failed writing to audit log", e)
       rescue Exception => e
@@ -42,15 +43,23 @@ module NewRelic
         raise
       end
 
+      def allowed_endpoint?(uri)
+        @endpoints.any? { |endpoint| uri =~ endpoint }
+      end
+
       def setup_logger
-        path = ensure_log_path
-        if path
+        if wants_stdout?
+          # Using $stdout global for easier reassignment in testing
+          @log = ::Logger.new($stdout)
+          ::NewRelic::Agent.logger.info("Audit log enabled to STDOUT")
+        elsif path = ensure_log_path
           @log = ::Logger.new(path)
-          @log.formatter = create_log_formatter
           ::NewRelic::Agent.logger.info("Audit log enabled at '#{path}'")
         else
           @log = NewRelic::Agent::NullLogger.new
         end
+
+        @log.formatter = create_log_formatter
       end
 
       def ensure_log_path
@@ -69,10 +78,15 @@ module NewRelic
         path
       end
 
+      def wants_stdout?
+        ::NewRelic::Agent.config[:'audit_log.path'].upcase == "STDOUT"
+      end
+
       def create_log_formatter
         @hostname = NewRelic::Agent::Hostname.get
+        @prefix = wants_stdout? ? '** [NewRelic]' : ''
         Proc.new do |severity, time, progname, msg|
-          "[#{time} #{@hostname} (#{$$})] : #{msg}\n"
+          "#{@prefix}[#{time} #{@hostname} (#{$$})] : #{msg}\n"
         end
       end
     end

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

@@ -162,13 +162,10 @@ module NewRelic
           }
         end
 
-        def self.rules_ignore
-          Proc.new do |rules|
-            rules = convert_to_list(rules)
-
-            rules.map do |rule|
-              /#{rule}/
-            end
+        def self.convert_to_regexp_list(raw_value)
+          value_list = convert_to_list(raw_value)
+          value_list.map do |value|
+            /#{value}/
           end
         end
 
@@ -469,7 +466,7 @@ module NewRelic
         },
         :'resque.use_harvest_lock' => {
           :default => false,
-          :public => true,
+          :public => false,
           :type => Boolean,
           :description => 'Enable or disable synchronizing Resque job forking with New Relic\'s harvest thread. The default is <code>false</code>. This helps prevent Resque jobs from deadlocking, but prevents New Relic from starting new jobs during harvest.'
         },
@@ -529,6 +526,13 @@ module NewRelic
           :type => String,
           :description => 'Specifies a path to the audit log file (including the filename).'
         },
+        :'audit_log.endpoints' => {
+          :default => [".*"],
+          :public => true,
+          :type => Array,
+          :transform => DefaultSource.method(:convert_to_regexp_list),
+          :description => 'List of allowed endpoints to include in audit log'
+        },
         :disable_samplers => {
           :default => false,
           :public => true,
@@ -1049,6 +1053,13 @@ module NewRelic
           :dynamic_name => true,
           :description  => 'Defines whether the agent will hook into Rack::Builder\'s <code>to_app</code> method to find gems to instrument during application startup.'
         },
+        :disable_rack_urlmap => {
+          :default      => false,
+          :public       => true,
+          :type         => Boolean,
+          :dynamic_name => true,
+          :description  => 'Defines whether the agent will hook into Rack::URLMap to install middleware tracing.'
+        },
         :disable_rubyprof => {
           :default      => false,
           :public       => true,
@@ -1123,7 +1134,7 @@ module NewRelic
           :default      => [],
           :public       => true,
           :type         => Array,
-          :transform    => DefaultSource.rules_ignore,
+          :transform    => DefaultSource.method(:convert_to_regexp_list),
           :description  => 'A list of patterns that will cause a transaction to be ignored if any of them match the URI.'
         },
         :'synthetics.traces_limit' => {

data/lib/new_relic/agent/event_loop.rb

@@ -115,7 +115,7 @@ module NewRelic
 
       def wait_to_run(nonblock)
         timeout = nonblock ? 0 : next_timeout
-        ready = select([@self_pipe_rd], nil, nil, timeout)
+        ready = IO.select([@self_pipe_rd], nil, nil, timeout)
 
         if ready && ready[0] && ready[0][0] && ready[0][0] == @self_pipe_rd
           @self_pipe_rd.read(1)
@@ -182,7 +182,11 @@ module NewRelic
       end
 
       def wakeup
-        @self_pipe_wr << '.'
+        begin
+          @self_pipe_wr.write_nonblock '.'
+        rescue Errno::EAGAIN
+          ::NewRelic::Agent.logger.debug "Failed to wakeup event loop"
+        end
       end
     end
   end

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

@@ -78,8 +78,16 @@ module NewRelic
         def active_record_config_for_event(event)
           return unless event.payload[:connection_id]
 
-          connections = ::ActiveRecord::Base.connection_handler.connection_pool_list.map { |handler| handler.connections }.flatten
-          connection = connections.detect { |cnxn| cnxn.object_id == event.payload[:connection_id] }
+          connection = nil
+          connection_id = event.payload[:connection_id]
+
+          ::ActiveRecord::Base.connection_handler.connection_pool_list.each do |handler|
+            connection = handler.connections.detect do |conn|
+              conn.object_id == connection_id
+            end
+
+            break if connection
+          end
 
           connection.instance_variable_get(:@config) if connection
         end

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

@@ -114,6 +114,15 @@ module NewRelic
           result
         end
       end
+
+      module RackURLMap
+        def self.generate_traced_map(map)
+          map.inject({}) do |traced_map, (url, handler)|
+            traced_map[url] = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(handler, true)
+            traced_map
+          end
+        end
+      end
     end
   end
 end
@@ -148,6 +157,30 @@ DependencyDetection.defer do
         alias_method :use, :use_with_newrelic
       end
     end
+
   end
 end
 
+DependencyDetection.defer do
+  named :rack_urlmap
+
+  depends_on do
+    defined?(::Rack) && defined?(::Rack::URLMap)
+  end
+
+  depends_on do
+    ::NewRelic::Agent::Instrumentation::RackHelpers.middleware_instrumentation_enabled? &&
+      !::NewRelic::Agent.config[:disable_rack]
+  end
+
+  executes do
+    class ::Rack::URLMap
+      alias_method :initialize_without_newrelic, :initialize
+
+      def initialize(map = {})
+        traced_map = ::NewRelic::Agent::Instrumentation::RackURLMap.generate_traced_map(map)
+        initialize_without_newrelic(traced_map)
+      end
+    end
+  end
+end

data/lib/new_relic/agent/new_relic_service.rb

@@ -86,6 +86,11 @@ module NewRelic
         @metric_id_cache = {}
       end
 
+      def force_restart
+        reset_metric_id_cache
+        close_shared_connection
+      end
+
       # takes an array of arrays of spec and id, adds it into the
       # metric cache so we can save the collector some work by
       # sending integers instead of strings the next time around
@@ -244,6 +249,10 @@ module NewRelic
         end
       end
 
+      def has_shared_connection?
+        !@shared_tcp_connection.nil?
+      end
+
       def ssl_cert_store
         path = cert_file_path
         if !@ssl_cert_store || path != @cached_cert_store_path

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

@@ -62,6 +62,10 @@ module NewRelic
             install_browser_monitoring(rails_config)
             install_agent_hooks(rails_config)
           end
+        rescue => e
+          ::NewRelic::Agent.logger.error("Failure during init_config for Rails. Is Rails required in a non-Rails app? Set NEW_RELIC_FRAMEWORK=ruby to avoid this message.",
+                                         "The Ruby agent will continue running, but Rails-specific features may be missing.",
+                                         e)
         end
 
         def install_agent_hooks(config)

data/lib/new_relic/control/instance_methods.rb

@@ -48,9 +48,7 @@ module NewRelic
       # init_config({}) which is called one or more times.
       #
       def init_plugin(options={})
-        env = options[:env] || self.env
-        Agent.logger.info("Starting the New Relic agent in #{env.inspect} environment.")
-        Agent.logger.info("To prevent agent startup add a NEWRELIC_AGENT_ENABLED=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
+        env = determine_env(options)
 
         configure_agent(env, options)
 
@@ -81,6 +79,21 @@ module NewRelic
         end
       end
 
+      def determine_env(options)
+        env = options[:env] || self.env
+        env = env.to_s
+
+        if @started_in_env && @started_in_env != env
+          Agent.logger.error("Attempted to start agent in #{env.inspect} environment, but agent was already running in #{@started_in_env.inspect}",
+                             "The agent will continue running in #{@started_in_env.inspect}. To alter this, ensure the desired environment is set before the agent starts.")
+        else
+          Agent.logger.info("Starting the New Relic agent in #{env.inspect} environment.",
+                            "To prevent agent startup add a NEWRELIC_AGENT_ENABLED=false environment variable or modify the #{env.inspect} section of your newrelic.yml.")
+        end
+
+        env
+      end
+
       def configure_agent(env, options)
         manual = Agent::Configuration::ManualSource.new(options)
         Agent.config.replace_or_add_config(manual)
@@ -96,6 +109,7 @@ module NewRelic
 
       # Install the real agent into the Agent module, and issue the start command.
       def start_agent
+        @started_in_env = self.env
         NewRelic::Agent.agent.start
       end
 

data/lib/new_relic/environment_report.rb

@@ -86,6 +86,7 @@ module NewRelic
         ENV['RAILS_ENV']
       end
     end
+    report_on('OpenSSL version') { ::OpenSSL::OPENSSL_VERSION }
     # end reporting logic
     ####################################
 

data/lib/new_relic/version.rb

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

data/test/multiverse/suites/agent_only/config/newrelic.yml

@@ -20,3 +20,8 @@ development:
     auto_instrument: true
   labels:
     Server: Yaml
+
+# A few tests use this in confirming behavior around mis-matched environments
+# Doesn't need to actually support running the agent in production mode.
+production:
+  enabled: false

data/test/multiverse/suites/agent_only/script/env_change.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# 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.
+
+ENV["NEW_RELIC_LOG_FILE_PATH"] = "STDOUT"
+
+require 'newrelic_rpm'
+
+NewRelic::Agent.manual_start(:env => "production")

data/test/multiverse/suites/agent_only/script/symbol_env.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# 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.
+
+ENV["NEW_RELIC_LOG_FILE_PATH"] = "STDOUT"
+
+require 'newrelic_rpm'
+
+NewRelic::Agent.manual_start(:env => :development)

data/test/multiverse/suites/agent_only/start_up_test.rb

@@ -25,10 +25,17 @@ class StartUpTest < Minitest::Test
   end
 
   def test_instrumentation_loads_clean_even_without_dependencies
-    output = `bundle exec ruby script/loading.rb`
+    assert_runs_without_errors("bundle exec ruby script/loading.rb")
+  end
 
-    problems = output.scan(/ERROR : .*/)
-    assert_empty problems
+  def test_manual_start_with_symbol_for_environment
+    assert_runs_without_errors("bundle exec ruby script/symbol_env.rb")
+  end
+
+  def test_manual_start_logs_about_mismatched_environment
+    output = `bundle exec ruby script/env_change.rb`
+
+    assert_match(/ERROR.*Attempted to start agent.*production.*development/, output, output)
   end
 
   def test_after_fork_does_not_blow_away_manual_start_settings
@@ -38,4 +45,11 @@ class StartUpTest < Minitest::Test
 
     assert_equal('my great app', NewRelic::Agent.config[:app_name])
   end
+
+  def assert_runs_without_errors(command)
+    output = `#{command}`
+
+    problems = output.scan(/ERROR : .*/)
+    assert_empty problems
+  end
 end

data/test/multiverse/suites/rack/Envfile

@@ -1,3 +1,8 @@
+gemfile <<-RB
+  gem 'rack', '~>1.6.0'
+  gem 'rack-test'
+RB
+
 gemfile <<-RB
   gem 'rack', '~>1.5.0'
   gem 'rack-test'
@@ -8,6 +13,11 @@ gemfile <<-RB
   gem 'rack-test'
 RB
 
+gemfile <<-RB
+  gem 'rack', '1.3.10'
+  gem 'rack-test'
+RB
+
 gemfile <<-RB
   gem 'rack', '1.2.8'
   gem 'rack-test'
@@ -22,4 +32,4 @@ RB
 gemfile <<-RB
   gem 'rack', '1.0.1'
   gem 'rack-test'
-RB
+RB

data/test/multiverse/suites/rack/builder_map_test.rb

@@ -0,0 +1,128 @@
+# 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.
+
+# These tests confirm functionality when using the Rack::Builder class. In
+# particular, combinations of map, use and run should result in the right
+# metrics. In internals changed across Rack versions, so it's important to
+# check as our middleware and Rack instrumentation has grown.
+
+require 'multiverse_helpers'
+
+if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
+
+class BuilderMapTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  include Rack::Test::Methods
+
+  class SimpleMiddleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      @app.call(env)
+    end
+  end
+
+  class MiddlewareOne   < SimpleMiddleware; end
+  class MiddlewareTwo   < SimpleMiddleware; end
+  class MiddlewareThree < SimpleMiddleware; end
+
+  class ExampleApp
+    def call(env)
+      [200, {}, [self.class.name]]
+    end
+  end
+
+  class PrefixAppOne < ExampleApp; end
+  class PrefixAppTwo < ExampleApp; end
+
+  def app
+    Rack::Builder.app do
+      use MiddlewareOne
+      use MiddlewareTwo
+
+      map '/prefix1' do
+        run PrefixAppOne.new
+      end
+
+      map '/prefix2' do
+        use MiddlewareThree
+        run PrefixAppTwo.new
+      end
+
+      # Rack versions prior to 1.4 did not support combining map and run at the
+      # top-level in the same Rack::Builder.
+      if Rack::VERSION[1] >= 4
+        run ExampleApp.new
+      end
+    end
+  end
+
+  if Rack::VERSION[1] >= 4
+    def test_metrics_for_default_prefix
+      get '/'
+
+      assert_metrics_recorded_exclusive([
+        'Apdex',
+        'ApdexAll',
+        'HttpDispatcher',
+        'Middleware/all',
+        'Controller/Rack/BuilderMapTest::ExampleApp/call',
+        'Apdex/Rack/BuilderMapTest::ExampleApp/call',
+        'Middleware/Rack/BuilderMapTest::MiddlewareOne/call',
+        'Middleware/Rack/BuilderMapTest::MiddlewareTwo/call',
+        'Nested/Controller/Rack/BuilderMapTest::ExampleApp/call',
+        ['Middleware/Rack/BuilderMapTest::MiddlewareOne/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call'],
+        ['Middleware/Rack/BuilderMapTest::MiddlewareTwo/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call'],
+        ['Nested/Controller/Rack/BuilderMapTest::ExampleApp/call', 'Controller/Rack/BuilderMapTest::ExampleApp/call']
+      ])
+    end
+  end
+
+  def test_metrics_for_mapped_prefix
+    get '/prefix1'
+
+    assert_metrics_recorded([
+      'Apdex',
+      'ApdexAll',
+      'HttpDispatcher',
+      'Middleware/all',
+      'Controller/Rack/BuilderMapTest::PrefixAppOne/call',
+      'Apdex/Rack/BuilderMapTest::PrefixAppOne/call',
+      'Middleware/Rack/BuilderMapTest::MiddlewareOne/call',
+      'Middleware/Rack/BuilderMapTest::MiddlewareTwo/call',
+      'Nested/Controller/Rack/BuilderMapTest::PrefixAppOne/call',
+      ['Middleware/Rack/BuilderMapTest::MiddlewareOne/call', 'Controller/Rack/BuilderMapTest::PrefixAppOne/call'],
+      ['Middleware/Rack/BuilderMapTest::MiddlewareTwo/call', 'Controller/Rack/BuilderMapTest::PrefixAppOne/call'],
+      ['Nested/Controller/Rack/BuilderMapTest::PrefixAppOne/call', 'Controller/Rack/BuilderMapTest::PrefixAppOne/call']
+    ])
+  end
+
+  def test_metrics_for_mapped_prefix_with_extra_middleware
+    get '/prefix2'
+
+    assert_metrics_recorded([
+      'Apdex',
+      'ApdexAll',
+      'HttpDispatcher',
+      'Middleware/all',
+      'Controller/Rack/BuilderMapTest::PrefixAppTwo/call',
+      'Apdex/Rack/BuilderMapTest::PrefixAppTwo/call',
+      'Middleware/Rack/BuilderMapTest::MiddlewareOne/call',
+      'Middleware/Rack/BuilderMapTest::MiddlewareTwo/call',
+      'Middleware/Rack/BuilderMapTest::MiddlewareThree/call',
+      'Nested/Controller/Rack/BuilderMapTest::PrefixAppTwo/call',
+      ['Middleware/Rack/BuilderMapTest::MiddlewareOne/call', 'Controller/Rack/BuilderMapTest::PrefixAppTwo/call'],
+      ['Middleware/Rack/BuilderMapTest::MiddlewareTwo/call', 'Controller/Rack/BuilderMapTest::PrefixAppTwo/call'],
+      ['Middleware/Rack/BuilderMapTest::MiddlewareThree/call', 'Controller/Rack/BuilderMapTest::PrefixAppTwo/call'],
+      ['Nested/Controller/Rack/BuilderMapTest::PrefixAppTwo/call', 'Controller/Rack/BuilderMapTest::PrefixAppTwo/call']
+    ])
+  end
+end
+
+end

data/test/multiverse/suites/rack/url_map_test.rb

@@ -2,6 +2,10 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+# These tests are for confirming that our direct support Rack::URLMap works
+# properly. Tests against the builder interface more commonly used (i.e. map)
+# can be found elsewhere in this suite.
+
 if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
 
 class UrlMapTest < Minitest::Test
@@ -23,7 +27,6 @@ class UrlMapTest < Minitest::Test
 
   class MiddlewareOne   < SimpleMiddleware; end
   class MiddlewareTwo   < SimpleMiddleware; end
-  class MiddlewareThree < SimpleMiddleware; end
 
   class ExampleApp
     def call(env)
@@ -39,20 +42,9 @@ class UrlMapTest < Minitest::Test
       use MiddlewareOne
       use MiddlewareTwo
 
-      map '/prefix1' do
-        run PrefixAppOne.new
-      end
-
-      map '/prefix2' do
-        use MiddlewareThree
-        run PrefixAppTwo.new
-      end
-
-      # Rack versions prior to 1.4 did not support combining map and run at the
-      # top-level in the same Rack::Builder.
-      if Rack::VERSION[1] >= 4
-        run ExampleApp.new
-      end
+      run Rack::URLMap.new(
+        '/prefix1' => PrefixAppOne.new,
+        '/prefix2' => PrefixAppTwo.new)
     end
   end
 
@@ -69,10 +61,12 @@ class UrlMapTest < Minitest::Test
         'Apdex/Rack/UrlMapTest::ExampleApp/call',
         'Middleware/Rack/UrlMapTest::MiddlewareOne/call',
         'Middleware/Rack/UrlMapTest::MiddlewareTwo/call',
+        'Nested/Controller/Rack/Rack::URLMap/call',
         'Nested/Controller/Rack/UrlMapTest::ExampleApp/call',
         ['Middleware/Rack/UrlMapTest::MiddlewareOne/call', 'Controller/Rack/UrlMapTest::ExampleApp/call'],
         ['Middleware/Rack/UrlMapTest::MiddlewareTwo/call', 'Controller/Rack/UrlMapTest::ExampleApp/call'],
-        ['Nested/Controller/Rack/UrlMapTest::ExampleApp/call', 'Controller/Rack/UrlMapTest::ExampleApp/call']
+        ['Nested/Controller/Rack/UrlMapTest::ExampleApp/call', 'Controller/Rack/UrlMapTest::ExampleApp/call'],
+        ['Nested/Controller/Rack/Rack::URLMap/call', 'Controller/Rack/UrlMapTest::ExampleApp/call']
       ])
     end
   end
@@ -89,9 +83,11 @@ class UrlMapTest < Minitest::Test
       'Apdex/Rack/UrlMapTest::PrefixAppOne/call',
       'Middleware/Rack/UrlMapTest::MiddlewareOne/call',
       'Middleware/Rack/UrlMapTest::MiddlewareTwo/call',
+      'Nested/Controller/Rack/Rack::URLMap/call',
       'Nested/Controller/Rack/UrlMapTest::PrefixAppOne/call',
       ['Middleware/Rack/UrlMapTest::MiddlewareOne/call', 'Controller/Rack/UrlMapTest::PrefixAppOne/call'],
       ['Middleware/Rack/UrlMapTest::MiddlewareTwo/call', 'Controller/Rack/UrlMapTest::PrefixAppOne/call'],
+      ['Nested/Controller/Rack/Rack::URLMap/call', 'Controller/Rack/UrlMapTest::PrefixAppOne/call'],
       ['Nested/Controller/Rack/UrlMapTest::PrefixAppOne/call', 'Controller/Rack/UrlMapTest::PrefixAppOne/call']
     ])
   end
@@ -108,11 +104,11 @@ class UrlMapTest < Minitest::Test
       'Apdex/Rack/UrlMapTest::PrefixAppTwo/call',
       'Middleware/Rack/UrlMapTest::MiddlewareOne/call',
       'Middleware/Rack/UrlMapTest::MiddlewareTwo/call',
-      'Middleware/Rack/UrlMapTest::MiddlewareThree/call',
+      'Nested/Controller/Rack/Rack::URLMap/call',
       'Nested/Controller/Rack/UrlMapTest::PrefixAppTwo/call',
       ['Middleware/Rack/UrlMapTest::MiddlewareOne/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call'],
       ['Middleware/Rack/UrlMapTest::MiddlewareTwo/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call'],
-      ['Middleware/Rack/UrlMapTest::MiddlewareThree/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call'],
+      ['Nested/Controller/Rack/Rack::URLMap/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call'],
       ['Nested/Controller/Rack/UrlMapTest::PrefixAppTwo/call', 'Controller/Rack/UrlMapTest::PrefixAppTwo/call']
     ])
   end

data/test/new_relic/agent/agent/start_worker_thread_test.rb

@@ -28,7 +28,9 @@ class NewRelic::Agent::Agent::StartWorkerThreadTest < Minitest::Test
 
     self.expects(:drop_buffered_data)
     self.expects(:sleep).with(30)
+
     @connected = true
+    @service = mock('service', :force_restart => nil)
 
     handle_force_restart(error)
 

data/test/new_relic/agent/audit_logger_test.rb

@@ -73,6 +73,18 @@ class AuditLoggerTest < Minitest::Test
     assert_equal(expected, result)
   end
 
+  def test_log_formatter_to_stdout
+    with_config(:'audit_log.path' => "STDOUT") do
+      Socket.stubs(:gethostname).returns('dummyhost')
+      formatter = NewRelic::Agent::AuditLogger.new.create_log_formatter
+      time = '2012-01-01 00:00:00'
+      msg = 'hello'
+      result = formatter.call(Logger::INFO, time, 'bleh', msg)
+      expected = "** [NewRelic][2012-01-01 00:00:00 dummyhost (#{$$})] : hello\n"
+      assert_equal(expected, result)
+    end
+  end
+
   def test_ensure_path_returns_nil_with_bogus_path
     with_config(:'audit_log.path' => '/really/really/not/a/path') do
       FileUtils.stubs(:mkdir_p).raises(SystemCallError, "i'd rather not")
@@ -130,6 +142,24 @@ class AuditLoggerTest < Minitest::Test
     end
   end
 
+  def test_allows_through_endpoints
+    fake_metrics = { 'metric' => 'yup' }
+    with_config(:'audit_log.endpoints' => ['metric_data']) do
+      setup_fake_logger
+      @logger.log_request('host/metric_data', fake_metrics, @marshaller)
+      assert_log_contains_string(fake_metrics.inspect)
+    end
+  end
+
+  def test_filters_endpoints
+    fake_txn = { 'txn' => 'nope' }
+    with_config(:'audit_log.endpoints' => ['metric_data']) do
+      setup_fake_logger
+      @logger.log_request('host/transaction_sample_data', fake_txn, @marshaller)
+      assert_empty read_log_body
+    end
+  end
+
   def test_should_cache_hostname
     Socket.expects(:gethostname).once.returns('cachey-mccaherson')
     setup_fake_logger
@@ -160,4 +190,24 @@ class AuditLoggerTest < Minitest::Test
     end
   end
 
+  def test_writes_to_stdout
+    with_config(:'audit_log.path' => "STDOUT") do
+      output = capturing_stdout do
+        @logger = NewRelic::Agent::AuditLogger.new
+        @logger.log_request(@uri, @dummy_data, @marshaller)
+      end
+
+      assert_includes output, @dummy_data.inspect
+    end
+  end
+
+  def capturing_stdout
+    orig = $stdout.dup
+    output = ""
+    $stdout = StringIO.new(output)
+    yield
+    output
+  ensure
+    $stdout = orig
+  end
 end

data/test/new_relic/agent/configuration/default_source_test.rb

@@ -80,8 +80,9 @@ module NewRelic::Agent::Configuration
       nil
     end
 
-    def test_transform_for_returns_a_proc_for_settings_with_a_transform
-      assert_equal Proc, DefaultSource.transform_for(:'rules.ignore_url_regexes').class
+    def test_transform_for_returns_something_callable
+      transform = DefaultSource.transform_for(:'rules.ignore_url_regexes')
+      assert transform.respond_to?(:call)
     end
 
     def test_transform_for_returns_nil_for_settings_that_do_not_have_a_transform

data/test/new_relic/agent/new_relic_service_test.rb

@@ -825,6 +825,18 @@ class NewRelicServiceTest < Minitest::Test
     ])
   end
 
+  def test_force_restart_clears_metric_cache
+    @service.metric_id_cache[1] = "boo"
+    @service.force_restart
+    assert_empty @service.metric_id_cache
+  end
+
+  def test_force_restart_closes_shared_connections
+    @service.establish_shared_connection
+    @service.force_restart
+    refute @service.has_shared_connection?
+  end
+
   def build_stats_hash(items={})
     hash = NewRelic::Agent::StatsHash.new
     items.each do |key, value|

data/test/new_relic/environment_report_test.rb

@@ -59,6 +59,10 @@ class EnvironmentReportTest < Minitest::Test
     assert_equal RUBY_VERSION, @report['Ruby version']
   end
 
+  def test_gathers_openssl_version
+    refute_nil @report['OpenSSL version']
+  end
+
   def test_gathers_system_info
     NewRelic::Agent::SystemInfo.stubs({
       :num_logical_processors => 8,
@@ -95,6 +99,7 @@ class EnvironmentReportTest < Minitest::Test
       'Rails Env',
       'Rails version',
       'Rails threadsafe',
+      'OpenSSL version',
     ].each do |key|
       assert NewRelic::EnvironmentReport.registered_reporters.has_key?(key), "Expected logic for #{key.inspect} in EnvironmentReport."
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.11.1.284
+  version: 3.11.2.286
 platform: ruby
 authors:
 - Jason Clark
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -811,7 +811,9 @@ files:
 - test/multiverse/suites/agent_only/pipe_manager_test.rb
 - test/multiverse/suites/agent_only/rename_rule_test.rb
 - test/multiverse/suites/agent_only/rum_instrumentation_test.rb
+- test/multiverse/suites/agent_only/script/env_change.rb
 - test/multiverse/suites/agent_only/script/loading.rb
+- test/multiverse/suites/agent_only/script/symbol_env.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
@@ -895,6 +897,7 @@ files:
 - test/multiverse/suites/padrino/config/newrelic.yml
 - test/multiverse/suites/padrino/padrino_test.rb
 - test/multiverse/suites/rack/Envfile
+- test/multiverse/suites/rack/builder_map_test.rb
 - test/multiverse/suites/rack/example_app.rb
 - test/multiverse/suites/rack/http_response_code_test.rb
 - test/multiverse/suites/rack/nested_non_rack_app_test.rb