newrelic_rpm 3.9.7.266 → 3.9.8.273

data/test/new_relic/agent/pipe_service_test.rb

@@ -77,6 +77,13 @@ class PipeServiceTest < Minitest::Test
       assert_equal ['events'], received_data[:analytic_event_data]
     end
 
+    def test_custom_event_data
+      received_data = data_from_forked_process do
+        @service.custom_event_data(['events'])
+      end
+      assert_equal ['events'], received_data[:custom_event_data]
+    end
+
     def test_transaction_sample_data_with_newlines
       payload_with_newline = "foo\n\nbar"
       received_data = data_from_forked_process do

data/test/new_relic/agent/synthetics_event_buffer_test.rb

@@ -0,0 +1,54 @@
+# 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 'test/new_relic/agent/event_buffer_test_cases'
+require 'new_relic/agent/synthetics_event_buffer'
+
+module NewRelic::Agent
+  class SyntheticsEventBufferTest < Minitest::Test
+    include EventBufferTestCases
+
+    def buffer_class
+      SyntheticsEventBuffer
+    end
+
+    def create_event(timestamp)
+      [{"timestamp" => timestamp}, {}]
+    end
+
+    def test_append_with_reject_returns_rejected_item
+      buffer = buffer_class.new(5)
+
+      5.times do |i|
+        result, reject = buffer.append_with_reject(create_event(i))
+        refute_nil(result)
+        assert_nil(reject)
+      end
+
+      event = create_event(10)
+      result, reject = buffer.append_with_reject(event)
+
+      assert_nil result
+      assert_equal event, reject
+    end
+
+    def test_append_with_reject_bases_removal_on_timestamp
+      buffer = buffer_class.new(5)
+
+      last_event = nil
+      5.times do |i|
+        last_event = create_event(i + 10)
+        result = buffer.append(last_event)
+        assert(result)
+      end
+
+      event = create_event(1)
+      result, reject = buffer.append_with_reject(event)
+
+      assert_equal event, result
+      assert_equal last_event, reject
+    end
+  end
+end

data/test/new_relic/agent/synthetics_monitor_test.rb

@@ -37,9 +37,6 @@ module NewRelic::Agent
 
     def test_doesnt_record_synthetics_state_without_header
       in_transaction do
-        # Make sure we're not just erroring in the event notification handler
-        expects_no_logging(:debug)
-
         @events.notify(:before_call, {})
         assert_no_synthetics_payload
       end

data/test/new_relic/agent/system_info_test.rb

@@ -41,20 +41,20 @@ class NewRelic::Agent::SystemInfoTest < Minitest::Test
     end
   end
 
-  docker_id_test_dir   = File.join(cross_agent_tests_dir, 'docker_container_id')
-  docker_id_test_cases = load_cross_agent_test(File.join('docker_container_id', 'cases'))
+  container_id_test_dir   = File.join(cross_agent_tests_dir, 'docker_container_id')
+  container_id_test_cases = load_cross_agent_test(File.join('docker_container_id', 'cases'))
 
-  docker_id_test_cases.each do |test_case|
+  container_id_test_cases.each do |test_case|
     filename = test_case['filename']
     basename = File.basename(filename, '.txt')
-    test_name = "test_docker_container_id_#{basename}"
+    test_name = "test_container_id_#{basename}"
 
     define_method(test_name) do
-      input = File.read(File.join(docker_id_test_dir, filename))
+      input = File.read(File.join(container_id_test_dir, filename))
       container_id = @sysinfo.parse_docker_container_id(input)
 
       message = "Parsed incorrect Docker container ID from #{filename}"
-      assert_equal(test_case['dockerContainerId'], container_id, message)
+      assert_equal(test_case['containerId'], container_id, message)
     end
   end
 end

data/test/new_relic/agent/transaction_event_aggregator_test.rb

@@ -244,15 +244,55 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
   end
 
   def test_synthetics_aggregation_limits
+    with_sampler_config(:'synthetics.events_limit' => 10,
+                        :'analytics_events.max_samples_stored' => 0) do
+      20.times do
+        generate_request('synthetic', :synthetics_resource_id => 100)
+      end
+
+      assert_equal 10, @sampler.samples.size
+    end
+  end
+
+  def test_synthetics_events_overflow_to_transaction_buffer
     with_sampler_config(:'synthetics.events_limit' => 10) do
       20.times do
         generate_request('synthetic', :synthetics_resource_id => 100)
       end
 
+      assert_equal 20, @sampler.samples.size
+    end
+  end
+
+  def test_synthetics_events_kept_by_timestamp
+    with_sampler_config(:'synthetics.events_limit' => 10,
+                        :'analytics_events.max_samples_stored' => 0) do
+      10.times do |i|
+        generate_request('synthetic', :timestamp => i + 10, :synthetics_resource_id => 100)
+      end
+
+      generate_request('synthetic', :timestamp => 1, :synthetics_resource_id => 100)
+
       assert_equal 10, @sampler.samples.size
+      timestamps = @sampler.samples.map do |(main, _)|
+        main["timestamp"]
+      end.sort
+
+      assert_equal ([1] + (10..18).to_a), timestamps
     end
   end
 
+  def test_synthetics_events_timestamp_bumps_go_to_main_buffer
+    with_sampler_config(:'synthetics.events_limit' => 10) do
+      10.times do |i|
+        generate_request('synthetic', :timestamp => i + 10, :synthetics_resource_id => 100)
+      end
+
+      generate_request('synthetic', :timestamp => 1, :synthetics_resource_id => 100)
+
+      assert_equal 11, @sampler.samples.size
+    end
+  end
 
   def test_merging_synthetics_still_applies_limit
     samples = with_sampler_config(:'synthetics.events_limit' => 20) do
@@ -262,7 +302,8 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
       @sampler.harvest!
     end
 
-    with_sampler_config(:'synthetics.events_limit' => 10) do
+    with_sampler_config(:'synthetics.events_limit' => 10,
+                        :'analytics_events.max_samples_stored' => 0) do
       @sampler.merge!(samples)
       assert_equal 10, @sampler.samples.size
     end
@@ -302,7 +343,7 @@ class NewRelic::Agent::TransactionEventAggregatorTest < Minitest::Test
     payload = {
       :name => "Controller/#{name}",
       :type => :controller,
-      :start_timestamp => Time.now.to_f,
+      :start_timestamp => options[:timestamp] || Time.now.to_f,
       :duration => 0.1,
       :custom_params => {}
     }.merge(options)

data/test/new_relic/agent/utilization_data_test.rb

@@ -0,0 +1,18 @@
+# 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 File.expand_path(File.join(File.dirname(__FILE__),'..','data_container_tests'))
+
+module NewRelic::Agent
+  class UtilizationDataTest < Minitest::Test
+    # We don't behave like a normal container, but we need to match the
+    # interface at least!
+    include NewRelic::BasicDataContainerMethodTests
+
+    def create_container
+      UtilizationData.new
+    end
+  end
+end

data/test/new_relic/collection_helper_test.rb

@@ -4,7 +4,6 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 require 'ostruct'
-require 'active_record_fixtures' if defined?(::ActiveRecord)
 
 require 'new_relic/collection_helper'
 class NewRelic::CollectionHelperTest < Minitest::Test

data/test/new_relic/data_container_tests.rb

@@ -13,7 +13,18 @@
 # populated with for the purposes of testing.
 
 module NewRelic
+  module BasicDataContainerMethodTests
+    def test_should_respond_to_required_methods
+      c = create_container
+      assert c.respond_to?(:harvest!)
+      assert c.respond_to?(:reset!)
+      assert c.respond_to?(:merge!)
+    end
+  end
+
   module BasicDataContainerTests
+    include BasicDataContainerMethodTests
+
     def num_data_items
       self.respond_to?(:max_data_items) ? max_data_items : 5
     end
@@ -42,13 +53,6 @@ module NewRelic
       populate_container(c, num_data_items)
       assert_equal(num_data_items, c.harvest!.size)
     end
-
-    def test_should_respond_to_required_methods
-      c = create_container
-      assert c.respond_to?(:harvest!)
-      assert c.respond_to?(:reset!)
-      assert c.respond_to?(:merge!)
-    end
   end
 
   module DataContainerTests

data/test/new_relic/fake_collector.rb

@@ -53,6 +53,7 @@ module NewRelic
     end
 
     attr_accessor :agent_data, :mock
+    attr_reader :last_socket
 
     def initialize
       super(DEFAULT_PORT)
@@ -69,6 +70,8 @@ module NewRelic
         'profile_data'            => Response.new(200, {'return_value' => nil}),
         'shutdown'                => Response.new(200, {'return_value' => nil}),
         'analytic_event_data'     => Response.new(200, {'return_value' => nil}),
+        'custom_event_data'       => Response.new(200, {'return_value' => nil}),
+        'utilization_data'        => Response.new(200, {'return_value' => nil}),
       }
       reset
     end
@@ -98,6 +101,8 @@ module NewRelic
     end
 
     def call(env)
+      @last_socket = Thread.current[:WEBrickSocket]
+
       req = ::Rack::Request.new(env)
       res = ::Rack::Response.new
       uri = URI.parse(req.url)
@@ -198,8 +203,12 @@ module NewRelic
           TransactionSampleDataPost.new(opts)
         when 'analytic_event_data'
           AnalyticEventDataPost.new(opts)
+        when 'custom_event_data'
+          AnalyticEventDataPost.new(opts)
         when 'error_data'
           ErrorDataPost.new(opts)
+        when 'utilization_data'
+          UtilizationDataPost.new(opts)
         else
           new(opts)
         end
@@ -339,6 +348,20 @@ module NewRelic
       end
     end
 
+    class UtilizationDataPost < AgentPost
+
+      attr_reader :hostname, :container_id, :cpu_count, :instance_type
+
+      def initialize(opts={})
+        super
+        @hostname, @container_id, @cpu_count, @instance_type = body
+      end
+
+      def ==(other)
+        @body == other.body
+      end
+    end
+
     class SubmittedError
 
       attr_reader :timestamp, :path, :message, :exception_class_name, :params

data/test/new_relic/fake_instance_metadata_service.rb

@@ -0,0 +1,45 @@
+# 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 'rack'
+require 'rack/request'
+require 'fake_server'
+
+module NewRelic
+  class FakeInstanceMetadataService < FakeServer
+    def initialize(*_)
+      super
+      reset
+    end
+
+    def set_response_for_path(path, response)
+      @responses[path] = response
+    end
+
+    def response_for_path(path)
+      @responses[path]
+    end
+
+    def call(env)
+      req  = ::Rack::Request.new(env)
+      path = req.path
+      rsp  = response_for_path(path)
+
+      case rsp
+      when ::Rack::Response
+        rsp.to_a
+      when String
+        [200, {}, [rsp]]
+      end
+    end
+
+    def reset
+      @responses = {}
+    end
+
+    def app
+      self
+    end
+  end
+end

data/test/new_relic/license_test.rb

@@ -74,6 +74,8 @@ class LicenseTest < Minitest::Test
       path =~ %r{/tags$}i ||
       # skip multiverse auto-generated gemfiles
       path =~ %r{/test/multiverse/suites/.*/Gemfile\.\d+(\.lock)?$} ||
+      # skip multiverse auto-generated db/schema
+      path =~ %r{/test/multiverse/suites/.*/db/schema.rb$} ||
       # skip the artifacts directory
       path =~ %r{/artifacts/}
     )

data/test/new_relic/marshalling_test_cases.rb

@@ -7,7 +7,9 @@
 module MarshallingTestCases
 
   def test_sends_metrics
-    NewRelic::Agent.record_metric('Boo', 42)
+    with_around_hook do
+      NewRelic::Agent.record_metric('Boo', 42)
+    end
 
     transmit_data
 
@@ -17,7 +19,9 @@ module MarshallingTestCases
   end
 
   def test_sends_errors
-    NewRelic::Agent.notice_error(StandardError.new("Boom"))
+    with_around_hook do
+      NewRelic::Agent.notice_error(StandardError.new("Boom"))
+    end
 
     transmit_data
 
@@ -29,26 +33,107 @@ module MarshallingTestCases
 
   def test_sends_transaction_traces
     with_config(:'transaction_tracer.transaction_threshold' => -1.0) do
-      Transactioner.new.do_it
+      with_around_hook do
+        Transactioner.new.do_it
+      end
     end
 
     transmit_data
 
     result = $collector.calls_for('transaction_sample_data')
     assert_equal 1, result.length
-    assert_equal "Controller/MarshallingTestCases::Transactioner/do_it", result.first.metric_name
+    assert_equal "TestTransaction/do_it", result.first.metric_name
+  end
+
+  def test_sends_transaction_events
+    t0 = freeze_time(Time.at(Time.now.to_i))
+
+    with_around_hook do
+      Transactioner.new.do_it
+    end
+
+    transmit_event_data
+
+    result = $collector.calls_for('analytic_event_data')
+    assert_equal 1, result.length
+    events = result.first.events
+    assert_equal 1, events.length
+
+    expected_event = [
+      {
+        "type"      => "Transaction",
+        "timestamp" => t0.to_f,
+        "name"      => "TestTransaction/do_it",
+        "duration"  => 0.0,
+      },
+      {}
+    ]
+
+    event = events.first
+    # this is only present on REE, and we don't really care - the point of this
+    # test is just to validate basic marshalling
+    event[0].delete("gcCumulative")
+
+    assert_equal(expected_event, event)
+  end
+
+  def test_sends_custom_events
+    t0 = freeze_time
+
+    with_around_hook do
+      NewRelic::Agent.record_custom_event("CustomEventType", :foo => 'bar', :baz => 'qux')
+    end
+
+    transmit_event_data
+
+    result = $collector.calls_for('custom_event_data')
+    assert_equal 1, result.length
+    events = result.first.events
+    assert_equal 1, events.length
+
+    expected_event = [
+      {
+        "type"      => "CustomEventType",
+        "timestamp" => t0.to_i
+      },
+      {
+        "foo" => "bar",
+        "baz" => "qux"
+      }
+    ]
+
+    assert_equal(expected_event, events.first)
   end
 
   class Transactioner
     include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
     def do_it
+      NewRelic::Agent.set_transaction_name("do_it", :category => "TestTransaction")
     end
 
     add_transaction_tracer :do_it
   end
 
+  def with_around_hook(&blk)
+    if respond_to?(:around_each)
+      around_each do
+        blk.call
+      end
+    else
+      blk.call
+    end
+
+    if respond_to?(:after_each)
+      after_each
+    end
+  end
+
   def transmit_data
     NewRelic::Agent.instance.send(:transmit_data)
   end
+
+  def transmit_event_data
+    NewRelic::Agent.instance.send(:transmit_event_data)
+  end
 end