newrelic_rpm 3.14.0.305 → 3.14.1.311

data/lib/new_relic/agent/pipe_service.rb

@@ -49,6 +49,10 @@ module NewRelic
         write_to_pipe(:error_data, errors) if errors
       end
 
+      def error_event_data(events)
+        write_to_pipe(:error_event_data, events) if events
+      end
+
       def sql_trace_data(sql)
         write_to_pipe(:sql_trace_data, sql) if sql
       end

data/lib/new_relic/agent/transaction.rb

@@ -546,6 +546,11 @@ module NewRelic
         if @request_attributes
           @request_attributes.assign_agent_attributes self
         end
+
+        display_host = Agent.config[:'process_host.display_name']
+        unless display_host == NewRelic::Agent::Hostname.get
+          add_agent_attribute(:'host.displayName', display_host, default_destinations)
+        end
       end
 
       def assign_intrinsics(state)

data/lib/new_relic/version.rb

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

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

@@ -208,6 +208,21 @@ class AgentAttributesTest < Minitest::Test
     refute_event_has_attribute('httpResponseCode')
   end
 
+  def test_host_display_name_included_when_enabled_and_set
+    config = {:'process_host.display_name' => 'Fancy Host Name',
+              :'transaction_events.attributes.include' => 'host.displayName',}
+    run_transaction(config)
+
+    assert_event_has_agent_attribute('host.displayName', 'Fancy Host Name')
+  end
+
+  def test_host_display_name_excluded_when_enabled_but_not_set
+    config = {:'transaction_events.attributes.include' => 'host.displayName',}
+    run_transaction(config)
+
+    refute_event_has_attribute('host.displayName')
+  end
+
   def run_transaction(config = {}, txn_options = {})
     default_config = {
       :'transaction_tracer.transaction_threshold' => -10,

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

@@ -5,7 +5,9 @@
 class ErrorEventsTest < Minitest::Test
   include MultiverseHelpers
 
-  setup_and_teardown_agent
+  setup_and_teardown_agent do
+    freeze_time
+  end
 
   def test_error_events_are_submitted
     txn = generate_errors
@@ -64,6 +66,18 @@ class ErrorEventsTest < Minitest::Test
     assert_equal(0, $collector.calls_for(:error_event_data).size)
   end
 
+  def test_error_events_created_outside_of_transaction
+    NewRelic::Agent.notice_error RuntimeError.new "No Txn"
+    NewRelic::Agent.agent.send(:harvest_and_send_error_event_data)
+
+    intrinsics, _, _ = last_error_event
+
+    assert_equal "TransactionError", intrinsics["type"]
+    assert_in_delta Time.now.to_f, intrinsics["timestamp"], 0.001
+    assert_equal "RuntimeError", intrinsics["error.class"]
+    assert_equal "No Txn", intrinsics["error.message"]
+  end
+
   def generate_errors num_errors = 1
     in_transaction :transaction_name => "Controller/blogs/index" do |t|
       num_errors.times { t.notice_error RuntimeError.new "Big Controller" }

data/test/multiverse/suites/delayed_job/Envfile

@@ -22,6 +22,16 @@ if RUBY_VERSION >= '1.9.3'
   RB
 end
 
+if RUBY_VERSION >= '1.9.3'
+  gemfile <<-RB
+    gem 'delayed_job', '~> 4.1.0'
+    gem 'delayed_job_active_record', '~> 4.1.0'
+    gem 'activerecord', '~> 3.2.19'
+    gem 'i18n', '~> 0.6.11'
+    #{boilerplate_gems}
+  RB
+end
+
 # delayed_job_active_record (and older baked into delayed_job) support
 if RUBY_VERSION >= '1.9.3'
   dj4_with_active_record = <<-DJ

data/test/multiverse/suites/delayed_job/before_suite.rb

@@ -29,5 +29,15 @@ if Delayed::Worker.backend.to_s == "Delayed::Backend::ActiveRecord::Job"
     @connection = $db_connection
   end
 
+  class CreatePelicans < ActiveRecord::Migration
+    @connection = $db_connection
+    def self.up
+      create_table :pelicans do |t|
+        t.string :name
+      end
+    end
+  end
+
   CreateDelayedJobs.up
+  CreatePelicans.up
 end

data/test/multiverse/suites/delayed_job/delayed_job_instrumentation_test.rb

@@ -0,0 +1,106 @@
+# 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.
+
+if defined?(Delayed::Backend::ActiveRecord) && Delayed::Worker.respond_to?(:delay_jobs)
+  class DelayedJobInstrumentationTest < Minitest::Test
+    include MultiverseHelpers
+
+    class QuackJob
+      def initialize(index)
+        @index = index
+      end
+
+      def display_name
+        "Quack Job: #{@index}"
+      end
+
+      def perform
+        "Performing Quack Job #{@index} .."
+      end
+    end
+
+    class Pelican < ActiveRecord::Base
+      self.table_name = :pelicans
+
+      def quack
+        "quack..."
+      end
+
+      def quack_later
+        "...quack"
+      end
+
+      handle_asynchronously :quack_later
+    end
+
+    setup_and_teardown_agent
+
+    def after_setup
+      Delayed::Worker.delay_jobs = false
+      # We set Delayed::Worker.delay_jobs = false to run jobs inline for testing purposes, but
+      # we unfortunately hook the initialize method on Delayed::Worker
+      # to install our instrumentation.  Delayed::Workers are not initialized when running
+      # tests inline so we have to manually instantiate one to install our instrumentation.
+      # We also need to take care to only install the instrumentation once.
+      unless Delayed::Job.instance_methods.any? { |m|  m == :invoke_job_without_new_relic || m == "invoke_job_without_new_relic" }
+        Delayed::Worker.new
+      end
+    end
+
+    def after_teardown
+      Delayed::Worker.delay_jobs = true
+    end
+
+    # Delayed Job doesn't expose a version number, so we have to resort to checking Gem.loaded_specs.
+    # Additionally, earlier versions of Delayed Job do not call invoke_job when running jobs inline.
+    # We can only test methods using delay and handle_asynchronously on versions that run jobs via
+    # the invoke_job method.
+    def self.dj_invokes_job_inline?
+      Gem.loaded_specs["delayed_job"].version >= Gem::Version.new("3.0.0")
+    end
+
+    if dj_invokes_job_inline?
+      def test_delay_method
+        p = Pelican.create(:name => "Charlie")
+        p.delay.quack
+
+        assert_metrics_recorded [
+          'OtherTransaction/all',
+          'OtherTransaction/DelayedJob/all',
+          'OtherTransaction/DelayedJob/DelayedJobInstrumentationTest::Pelican#quack'
+        ]
+      end
+
+      def test_handle_asynchronously
+        p = Pelican.create(:name => "Charlieee")
+        p.quack_later
+
+        assert_metrics_recorded [
+          'OtherTransaction/all',
+          'OtherTransaction/DelayedJob/all',
+          'OtherTransaction/DelayedJob/DelayedJobInstrumentationTest::Pelican#quack_later_without_delay'
+        ]
+      end
+    end
+
+    def test_enqueue_standalone_job
+      job = QuackJob.new rand(100)
+      invoke_job(job)
+
+      assert_metrics_recorded [
+        'OtherTransaction/all',
+        'OtherTransaction/DelayedJob/all',
+        'OtherTransaction/DelayedJob/DelayedJobInstrumentationTest::QuackJob'
+      ]
+    end
+
+    # Note we use this method instead of Delayed::Job.enqueue because Delayed Job 2.1.4 does
+    # not call invoke_job when running jobs inline it instead calls perform directly.  This
+    # allows us to test the stand alone job case on all supported versions of Delayed Job.
+    def invoke_job(job)
+      job = Delayed::Job.new(:payload_object => job)
+      job.invoke_job
+    end
+  end
+end

data/test/multiverse/suites/mongo/mongo2_instrumentation_test.rb

@@ -179,6 +179,51 @@ if NewRelic::Agent::Datastores::Mongo.is_supported_version? &&
             assert_metrics_recorded(expected)
           end
 
+          def test_batched_queries
+            25.times do |i|
+              @collection.insert_one :name => "test-#{i}", :active => true
+            end
+            NewRelic::Agent.drop_buffered_data
+
+            @collection.find(:active => true).batch_size(10).to_a
+
+            expected = {
+              "Datastore/statement/MongoDB/#{@collection_name}/find" => {:call_count=>1},
+              "Datastore/statement/MongoDB/#{@collection_name}/getMore" => {:call_count=>2},
+              "Datastore/operation/MongoDB/find" => {:call_count=>1},
+              "Datastore/operation/MongoDB/getMore" => {:call_count=>2},
+              "Datastore/MongoDB/allWeb" => {:call_count=>3},
+              "Datastore/MongoDB/all" => {:call_count=>3},
+              "Datastore/allWeb" => { :call_count=>3},
+              "Datastore/all" => {:call_count=>3}
+            }
+            assert_metrics_recorded_exclusive expected
+          end
+
+          def test_batched_queries_have_node_per_query
+            25.times do |i|
+              @collection.insert_one :name => "test-#{i}", :active => true
+            end
+            NewRelic::Agent.drop_buffered_data
+            in_transaction "webby" do
+              @collection.find(:active => true).batch_size(10).to_a
+            end
+
+            expected = [
+              "Datastore/statement/MongoDB/#{@collection_name}/find",
+              "Datastore/statement/MongoDB/#{@collection_name}/getMore",
+              "Datastore/statement/MongoDB/#{@collection_name}/getMore"
+            ]
+
+            trace = last_transaction_trace
+            actual = []
+            trace.each_node do |n|
+              actual << n.metric_name if n.metric_name.start_with? "Datastore/statement/MongoDB"
+            end
+
+            assert_equal expected, actual
+          end
+
           def test_drop_collection
             @collection.drop
 

data/test/multiverse/suites/rack/Envfile

@@ -1,3 +1,13 @@
+gemfile <<-RB
+  gem 'puma', '~>2.12.3'
+RB
+
+gemfile <<-RB
+  gem 'puma', '~>2.12.3'
+  gem 'rack', '~>1.6.0'
+  gem 'rack-test'
+RB
+
 gemfile <<-RB
   gem 'rack', '~>1.6.0'
   gem 'rack-test'

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

@@ -0,0 +1,12 @@
+# 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 bit ugly, but Puma::Rack::Bundler isn't required by puma unless it's
+# running as a webserver. This terrible hack is to install our instrumentation
+# for these tests since our requests aren't served by an actual Puma webserver.
+if NewRelic::Agent::Instrumentation::RackHelpers.puma_rack_version_supported?
+  require 'puma/rack/builder' unless defined? Puma::Rack::Builder
+  require 'puma/rack/urlmap' unless defined? Puma::Rack::URLMap
+  DependencyDetection.detect!
+end

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

@@ -2,13 +2,13 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
+
 require File.join(File.dirname(__FILE__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
 require 'new_relic/rack/error_collector'
 
-if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
-
 class HttpResponseCodeTest < Minitest::Test
   include MultiverseHelpers
 

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

@@ -0,0 +1,81 @@
+# 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.
+
+if NewRelic::Agent::Instrumentation::RackHelpers.puma_rack_version_supported?
+
+class PumaRackBuilderTest < Minitest::Test
+  include MultiverseHelpers
+
+  class ExampleApp
+    def call env
+      [200, {'Content-Type' => 'text/html'}, ['Hello!']]
+    end
+  end
+
+  class MiddlewareOne
+    def initialize app
+      @app = app
+    end
+
+    def call env
+      env['MiddlewareOne'] = true
+      @app.call env
+    end
+  end
+
+  class MiddlewareTwo
+    def initialize app
+      @app = app
+    end
+
+    def call env
+      env['MiddlewareTwo'] = true
+      @app.call env
+    end
+  end
+
+  def setup
+    @app = build_app
+    @env = {}
+  end
+
+  def teardown
+    NewRelic::Agent.drop_buffered_data
+  end
+
+  def build_app
+    Puma::Rack::Builder.app do
+      use MiddlewareOne
+      use MiddlewareTwo
+      run ExampleApp.new
+    end
+  end
+
+
+  def test_middlewares_are_visited_with_puma_rack
+    @app.call @env
+    assert @env['MiddlewareOne'], 'Expected MiddlewareOne to be present and true in env'
+    assert @env['MiddlewareTwo'], 'Expected MiddlewareTwo to be present and true in env'
+  end
+
+  def test_puma_rack_builder_is_auto_instrumented
+    @app.call @env
+
+    assert_metrics_recorded_exclusive [
+      "Apdex",
+      "ApdexAll",
+      "HttpDispatcher",
+      "Middleware/all",
+      "Apdex/Rack/PumaRackBuilderTest::ExampleApp/call",
+      "Controller/Rack/PumaRackBuilderTest::ExampleApp/call",
+      "Middleware/Rack/PumaRackBuilderTest::MiddlewareOne/call",
+      "Middleware/Rack/PumaRackBuilderTest::MiddlewareTwo/call",
+      "Nested/Controller/Rack/PumaRackBuilderTest::ExampleApp/call",
+      ["Middleware/Rack/PumaRackBuilderTest::MiddlewareOne/call", "Controller/Rack/PumaRackBuilderTest::ExampleApp/call"],
+      ["Middleware/Rack/PumaRackBuilderTest::MiddlewareTwo/call", "Controller/Rack/PumaRackBuilderTest::ExampleApp/call"],
+      ["Nested/Controller/Rack/PumaRackBuilderTest::ExampleApp/call", "Controller/Rack/PumaRackBuilderTest::ExampleApp/call"]
+    ]
+  end
+end
+end

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

@@ -2,13 +2,13 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+if NewRelic::Agent::Instrumentation::RackHelpers.version_supported? && defined? Rack
+
 require File.join(File.dirname(__FILE__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
 require 'new_relic/rack/error_collector'
 
-if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
-
 class RackAutoInstrumentationTest < Minitest::Test
   include MultiverseHelpers
 
@@ -16,8 +16,16 @@ class RackAutoInstrumentationTest < Minitest::Test
 
   include Rack::Test::Methods
 
+  def builder_class
+    if defined? Puma::Rack::Builder
+      Puma::Rack::Builder
+    else
+      Rack::Builder
+    end
+  end
+
   def app
-    Rack::Builder.app do
+    builder_class.app do
       use MiddlewareOne
       use MiddlewareTwo, 'the correct tag' do |headers|
         headers['MiddlewareTwoBlockTag'] = 'the block tag'
@@ -113,6 +121,7 @@ class RackAutoInstrumentationTest < Minitest::Test
 
   def test_middleware_that_returns_early_records_middleware_rollup_metric
     get '/?return-early=true'
+
     assert_metrics_recorded_exclusive([
       "Apdex",
       "ApdexAll",