newrelic_rpm 3.14.1.311 → 3.14.2.312

data/test/new_relic/agent/transaction_event_primitive_test.rb

@@ -0,0 +1,195 @@
+# 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.
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'new_relic/agent/attribute_filter'
+require 'new_relic/agent/transaction/attributes'
+require 'new_relic/agent/transaction_event_primitive'
+
+module NewRelic
+  module Agent
+    class TransactionEventPrimitiveTest < Minitest::Test
+      def setup
+        freeze_time
+      end
+
+      def test_creates_intrinsics
+        intrinsics, *_ = TransactionEventPrimitive.create generate_payload
+
+        assert_equal "Transaction", intrinsics['type']
+        assert_in_delta Time.now.to_f, intrinsics['timestamp'], 0.001
+        assert_equal "Controller/whatever", intrinsics['name']
+        assert_equal false, intrinsics['error']
+        assert_equal 0.1, intrinsics['duration']
+      end
+
+      def test_event_includes_synthetics
+        payload = generate_payload 'whatever',  {
+          :synthetics_resource_id=>3,
+          :synthetics_job_id=>4,
+          :synthetics_monitor_id=>5
+        }
+
+        intrinsics, *_ = TransactionEventPrimitive.create payload
+
+        assert_equal '3', intrinsics['nr.syntheticsResourceId']
+        assert_equal '4', intrinsics['nr.syntheticsJobId']
+        assert_equal '5', intrinsics['nr.syntheticsMonitorId']
+      end
+
+      def test_custom_attributes_in_event_are_normalized_to_string_keys
+        attributes.merge_custom_attributes(:bing => 2, 1 => 3)
+        _, custom_attributes, _ = TransactionEventPrimitive.create generate_payload('whatever')
+
+        assert_equal 2, custom_attributes['bing']
+        assert_equal 3, custom_attributes['1']
+      end
+
+      def test_agent_attributes_in_event_are_normalized_to_string_keys
+        attributes.add_agent_attribute(:yahoo, 7, NewRelic::Agent::AttributeFilter::DST_ALL)
+        attributes.add_agent_attribute(4, 2, NewRelic::Agent::AttributeFilter::DST_ALL)
+        _, _, agent_attrs = TransactionEventPrimitive.create generate_payload('puce')
+
+        assert_equal 7, agent_attrs[:yahoo]
+        assert_equal 2, agent_attrs[4]
+      end
+
+      def test_error_is_included_in_event_data
+        event_data, *_ = TransactionEventPrimitive.create generate_payload('whatever', :error => true)
+
+        assert event_data['error']
+      end
+
+      def test_includes_custom_attributes_in_event
+        attributes.merge_custom_attributes('bing' => 2)
+        _, custom_attrs, _ = TransactionEventPrimitive.create generate_payload
+        assert_equal 2, custom_attrs['bing']
+      end
+
+      def test_includes_agent_attributes_in_event
+        attributes.add_agent_attribute('bing', 2, NewRelic::Agent::AttributeFilter::DST_ALL)
+
+        _, _, agent_attrs = TransactionEventPrimitive.create generate_payload
+        assert_equal 2, agent_attrs['bing']
+      end
+
+      def test_doesnt_include_custom_attributes_in_event_when_configured_not_to
+        with_config('transaction_events.attributes.enabled' => false) do
+          attributes.merge_custom_attributes('bing' => 2)
+          _, custom_attrs, _ = TransactionEventPrimitive.create generate_payload
+          assert_empty custom_attrs
+        end
+      end
+
+      def test_doesnt_include_agent_attributes_in_event_when_configured_not_to
+        with_config('transaction_events.attributes.enabled' => false) do
+          attributes.add_agent_attribute('bing', 2, NewRelic::Agent::AttributeFilter::DST_ALL)
+
+          _, _, agent_attrs = TransactionEventPrimitive.create generate_payload
+          assert_empty agent_attrs
+        end
+      end
+
+      def test_doesnt_include_custom_attributes_in_event_when_configured_not_to_with_legacy_setting
+        with_config('analytics_events.capture_attributes' => false) do
+          attributes.merge_custom_attributes('bing' => 2)
+
+          _, custom_attrs, _ = TransactionEventPrimitive.create generate_payload
+          assert_empty custom_attrs
+        end
+      end
+
+      def test_doesnt_include_agent_attributes_in_event_when_configured_not_to_with_legacy_setting
+        with_config('analytics_events.capture_attributes' => false) do
+          attributes.add_agent_attribute('bing', 2, NewRelic::Agent::AttributeFilter::DST_ALL)
+
+          _, _, agent_attrs = TransactionEventPrimitive.create generate_payload
+          assert_empty agent_attrs
+        end
+      end
+
+      def test_custom_attributes_in_event_cant_override_reserved_attributes
+        metrics = NewRelic::Agent::TransactionMetrics.new()
+        metrics.record_unscoped('HttpDispatcher', 0.01)
+
+        attributes.merge_custom_attributes('type' => 'giraffe', 'duration' => 'hippo')
+        event, custom_attrs, _ = TransactionEventPrimitive.create generate_payload('whatever', :metrics => metrics)
+
+        assert_equal 'Transaction', event['type']
+        assert_equal 0.1, event['duration']
+
+        assert_equal 'giraffe', custom_attrs['type']
+        assert_equal 'hippo', custom_attrs['duration']
+      end
+
+      def test_samples_on_transaction_finished_event_includes_expected_web_metrics
+        txn_metrics = NewRelic::Agent::TransactionMetrics.new
+        txn_metrics.record_unscoped('WebFrontend/QueueTime', 13)
+        txn_metrics.record_unscoped('External/allWeb',       14)
+        txn_metrics.record_unscoped('Datastore/all',         15)
+        txn_metrics.record_unscoped("GC/Transaction/all",    16)
+
+        event_data, *_ = TransactionEventPrimitive.create generate_payload('name', :metrics => txn_metrics)
+        assert_equal 13, event_data["queueDuration"]
+        assert_equal 14, event_data["externalDuration"]
+        assert_equal 15, event_data["databaseDuration"]
+        assert_equal 16, event_data["gcCumulative"]
+
+        assert_equal 1, event_data["externalCallCount"]
+        assert_equal 1, event_data["databaseCallCount"]
+      end
+
+      def test_samples_on_transaction_finished_includes_expected_background_metrics
+        txn_metrics = NewRelic::Agent::TransactionMetrics.new
+        txn_metrics.record_unscoped('External/allOther',  12)
+        txn_metrics.record_unscoped('Datastore/all',      13)
+        txn_metrics.record_unscoped("GC/Transaction/all", 14)
+
+        event_data, *_ = TransactionEventPrimitive.create generate_payload('name', :metrics => txn_metrics)
+
+        assert_equal 12, event_data["externalDuration"]
+        assert_equal 13, event_data["databaseDuration"]
+        assert_equal 14, event_data["gcCumulative"]
+
+        assert_equal 1, event_data["databaseCallCount"]
+        assert_equal 1, event_data["externalCallCount"]
+      end
+
+      def test_samples_on_transaction_finished_event_include_apdex_perf_zone
+        event_data, *_ = TransactionEventPrimitive.create generate_payload('name', :apdex_perf_zone => 'S')
+
+        assert_equal 'S', event_data['nr.apdexPerfZone']
+      end
+
+      def test_samples_on_transaction_finished_event_includes_guid
+        event_data, *_ = TransactionEventPrimitive.create generate_payload('name', :guid => "GUID")
+        assert_equal "GUID", event_data["nr.guid"]
+      end
+
+      def test_samples_on_transaction_finished_event_includes_referring_transaction_guid
+        event_data, *_ = TransactionEventPrimitive.create generate_payload('name', :referring_transaction_guid=> "REFER")
+        assert_equal "REFER", event_data["nr.referringTransactionGuid"]
+      end
+
+      def generate_payload name = 'whatever', options = {}
+        {
+          :name => "Controller/#{name}",
+          :type => :controller,
+          :start_timestamp => options[:timestamp] || Time.now.to_f,
+          :duration => 0.1,
+          :attributes => attributes,
+          :error => false
+        }.merge(options)
+      end
+
+      def attributes
+        @attributes ||= begin
+          filter = NewRelic::Agent::AttributeFilter.new(NewRelic::Agent.config)
+          NewRelic::Agent::Transaction::Attributes.new(filter)
+        end
+      end
+
+    end
+  end
+end

data/test/new_relic/agent/transaction_event_recorder_test.rb

@@ -0,0 +1,80 @@
+# 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.
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
+require 'new_relic/agent/transaction_event_recorder'
+
+module NewRelic
+  module Agent
+    class TransactionEventRecorderTest < Minitest::Test
+
+      def setup
+        @recorder = TransactionEventRecorder.new
+        @attributes = nil
+      end
+
+      def test_synthetics_events_overflow_to_transaction_buffer
+        with_config :'synthetics.events_limit' => 10 do
+          20.times do
+            generate_request
+          end
+
+          _, txn_events = harvest_transaction_events!
+          _, syn_events = harvest_synthetics_events!
+
+          assert_equal 10, txn_events.size
+          assert_equal 10, syn_events.size
+        end
+      end
+
+      def test_synthetics_events_timestamp_bumps_go_to_main_buffer
+        with_config :'synthetics.events_limit' => 10 do
+          10.times do |i|
+            generate_request("syn_#{i}", :timestamp => i + 10)
+          end
+
+          generate_request("syn_10", :timestamp => 1)
+
+          _, txn_events = harvest_transaction_events!
+          _, syn_events = harvest_synthetics_events!
+
+          assert_equal 10, syn_events.size
+          assert_equal 10.0, syn_events[0][0]["timestamp"]
+          assert_equal 1, txn_events.size
+        end
+      end
+
+      def generate_request name='whatever', options={}
+        payload = {
+          :name => "Controller/#{name}",
+          :type => :controller,
+          :start_timestamp => options[:timestamp] || Time.now.to_f,
+          :duration => 0.1,
+          :synthetics_resource_id => 100,
+          :attributes => attributes,
+          :error => false
+        }.merge(options)
+
+        @recorder.record payload
+      end
+
+      def attributes
+        if @attributes.nil?
+          filter = NewRelic::Agent::AttributeFilter.new(NewRelic::Agent.config)
+          @attributes = NewRelic::Agent::Transaction::Attributes.new(filter)
+        end
+
+        @attributes
+      end
+
+      def harvest_transaction_events!
+        @recorder.transaction_event_aggregator.harvest!
+      end
+
+      def harvest_synthetics_events!
+        @recorder.synthetics_event_aggregator.harvest!
+      end
+    end
+  end
+end

data/test/new_relic/agent/transaction_metrics_test.rb

@@ -10,8 +10,8 @@ class TransactionMetricsTest < Minitest::Test
     @metrics = NewRelic::Agent::TransactionMetrics.new
   end
 
-  def test_record_scoped_should_record_a_scoped_metric
-    @metrics.record_scoped('foo', 42, 12)
+  def test_record_scoped_and_unscoped_should_record_a_scoped_metric
+    @metrics.record_scoped_and_unscoped('foo', 42, 12)
     assert_scoped_metrics(@metrics, ['foo'], {
       :call_count           => 1,
       :total_call_time      => 42,
@@ -20,8 +20,8 @@ class TransactionMetricsTest < Minitest::Test
     assert_unscoped_metrics(@metrics, [])
   end
 
-  def test_record_scoped_should_take_multiple_metrics
-    @metrics.record_scoped(['foo', 'bar'], 42, 12)
+  def test_record_scoped_and_unscoped_should_take_multiple_metrics
+    @metrics.record_scoped_and_unscoped(['foo', 'bar'], 42, 12)
     assert_scoped_metrics(@metrics, ['foo', 'bar'], {
       :call_count           => 1,
       :total_call_time      => 42,
@@ -30,8 +30,8 @@ class TransactionMetricsTest < Minitest::Test
     assert_unscoped_metrics(@metrics, [])
   end
 
-  def test_record_scoped_should_take_a_block
-    @metrics.record_scoped('foo') do |stats|
+  def test_record_scoped_and_unscoped_should_take_a_block
+    @metrics.record_scoped_and_unscoped('foo') do |stats|
       stats.call_count           = 3
       stats.total_call_time      = 2
       stats.total_exclusive_time = 1
@@ -80,7 +80,7 @@ class TransactionMetricsTest < Minitest::Test
 
   def test_square_brackets_look_up_unscoped_metrics
     @metrics.record_unscoped('foo', 42, 12)
-    @metrics.record_scoped('foo', 2, 1)
+    @metrics.record_scoped_and_unscoped('foo', 2, 1)
     assert_equal(42, @metrics['foo'].total_call_time)
   end
 

data/test/new_relic/agent/transaction_test.rb

@@ -1441,7 +1441,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     txn = in_transaction do
     end
 
-    refute txn.error_recorded?, "Did not expected error to be recorded"
+    refute txn.payload[:error], "Did not expected error to be recorded"
   end
 
   def test_error_recorded_predicate_true_when_error_recorded
@@ -1449,7 +1449,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
       t.notice_error StandardError.new "Sorry!"
     end
 
-    assert txn.error_recorded?, "Expected error to be recorded"
+    assert txn.payload[:error], "Expected error to be recorded"
   end
 
   def test_error_recorded_predicate_abides_by_ignore_filter
@@ -1462,7 +1462,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
         t.notice_error StandardError.new "Sorry!"
       end
 
-      refute txn.error_recorded?, "Expected error to be apologetic"
+      refute txn.payload[:error], "Expected error to be apologetic"
     end
   end
 
@@ -1478,7 +1478,7 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
         t.notice_error StandardError.new "Sorry!"
       end
 
-      assert txn.error_recorded?, "Expected error to be recorded"
+      assert txn.payload[:error], "Expected error to be recorded"
     end
   end
 end

data/test/new_relic/agent/utilization_data_test.rb

@@ -21,14 +21,12 @@ module NewRelic::Agent
       utilization_data = UtilizationData.new
 
       expected = {
-        :aws => {
-          :id => "i-e7e85ce1",
-          :type => "m3.medium",
-          :zone => "us-west-2b"
-        }
+        :id => "i-e7e85ce1",
+        :type => "m3.medium",
+        :zone => "us-west-2b"
       }
 
-      assert_equal expected, utilization_data.to_collector_hash[:vendors]
+      assert_equal expected, utilization_data.to_collector_hash[:vendors][:aws]
     end
 
     def test_aws_information_is_omitted_when_available_but_disabled_by_config
@@ -38,7 +36,7 @@ module NewRelic::Agent
         :availability_zone => "us-west-2b"
       )
 
-      with_config(:'utilization.detect_aws' => false) do
+      with_config(:'utilization.detect_aws' => false, :'utilization.detect_docker' => false) do
         utilization_data = UtilizationData.new
         assert_nil utilization_data.to_collector_hash[:vendors]
       end
@@ -103,6 +101,8 @@ module NewRelic::Agent
     end
 
     def test_vendor_information_is_omitted_if_unavailable
+      NewRelic::Agent::SystemInfo.stubs(:docker_container_id).returns(nil)
+
       utilization_data = UtilizationData.new
 
       assert_nil utilization_data.to_collector_hash[:vendors]

data/test/new_relic/fake_collector.rb

@@ -192,7 +192,7 @@ module NewRelic
         when 'analytic_event_data'
           AnalyticEventDataPost.new(opts)
         when 'custom_event_data'
-          AnalyticEventDataPost.new(opts)
+          CustomEventDataPost.new(opts)
         when 'error_data'
           ErrorDataPost.new(opts)
         when 'error_event_data'
@@ -338,17 +338,20 @@ module NewRelic
       end
     end
 
-    class AnalyticEventDataPost < AgentPost
-
-      attr_reader :events
+    class ReservoirSampledContainerPost < AgentPost
+      attr_reader :reservoir_metadata, :events
 
-      def initialize(opts={})
+      def initialize opts={}
         super
-
-        @events = @body[1]
+        @reservoir_metadata = body[1]
+        @events = body[2]
       end
     end
 
+    class AnalyticEventDataPost < ReservoirSampledContainerPost; end
+    class CustomEventDataPost < ReservoirSampledContainerPost; end
+    class ErrorEventDataPost < ReservoirSampledContainerPost; end
+
     class ErrorDataPost < AgentPost
 
       attr_reader :errors
@@ -383,15 +386,5 @@ module NewRelic
         @params["intrinsics"]
       end
     end
-
-    class ErrorEventDataPost < AgentPost
-      attr_reader :reservoir_metadata, :error_events
-
-      def initialize opts={}
-        super
-        @reservoir_metadata = body[1]
-        @error_events = body[2]
-      end
-    end
   end
 end

data/test/new_relic/license_test.rb

@@ -70,6 +70,8 @@ class LicenseTest < Minitest::Test
       File.expand_path(__FILE__) == path ||
       # skip rpm_test_app and other stuff that ends up in tmp
       path.include?(gem_root + '/tmp/') ||
+      # skip vendor/bundle
+      path.include?(gem_root + '/vendor/bundle') ||
       # skip the auto-generated build.rb file
       path =~ %r{lib/new_relic/build\.rb} ||
       # skip tags file