newrelic_rpm 3.13.2.302 → 3.14.0.305

data/test/new_relic/marshalling_test_cases.rb

@@ -65,6 +65,7 @@ module MarshallingTestCases
         "timestamp" => t0.to_f,
         "name"      => "TestTransaction/do_it",
         "duration"  => 0.0,
+        "error"     => false
       },
       {},
       {}

data/test/new_relic/noticed_error_test.rb

@@ -126,6 +126,14 @@ class NewRelic::Agent::NoticedErrorTest < Minitest::Test
     end
   end
 
+  def test_long_message
+    #yes, times 500. it's a 5000 byte string. Assuming strings are
+    #still 1 byte / char.
+    err = create_error(StandardError.new("1234567890" * 500))
+    assert_equal 4096, err.message.length
+    assert_equal ('1234567890' * 500)[0..4095], err.message
+  end
+
   def test_permits_messages_from_whitelisted_exceptions_in_high_security_mode
     with_config(:'strip_exception_messages.whitelist' => 'NewRelic::TestHelpers::Exceptions::TestError') do
       e = TestError.new('whitelisted test exception')
@@ -185,6 +193,57 @@ class NewRelic::Agent::NoticedErrorTest < Minitest::Test
     end
   end
 
+  def test_custom_attributes_sent_when_enabled
+    with_config :'error_collector.attributes.enabled' => true do
+      attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
+      custom_attrs = {"name" => "Ron Burgundy", "channel" => 4}
+      attributes.merge_custom_attributes(custom_attrs)
+
+      error = NewRelic::NoticedError.new(@path, Exception.new("O_o"))
+      error.attributes = attributes
+
+      assert_equal custom_attrs, error.custom_attributes
+    end
+  end
+
+  def test_custom_attributes_not_sent_when_disabled
+    with_config :'error_collector.attributes.enabled' => false do
+      attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
+      custom_attrs = {"name" => "Ron Burgundy", "channel" => 4}
+      attributes.merge_custom_attributes(custom_attrs)
+
+      error = NewRelic::NoticedError.new(@path, Exception.new("O_o"))
+      error.attributes = attributes
+
+      assert_equal({}, error.custom_attributes)
+    end
+  end
+
+  def test_agent_attributes_sent_when_enabled
+    with_config :'error_collector.attributes.enabled' => true do
+      attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
+      attributes.add_agent_attribute :"request.headers.referer", "http://blog.site/home", NewRelic::Agent::AttributeFilter::DST_ALL
+
+      error = NewRelic::NoticedError.new(@path, Exception.new("O_o"))
+      error.attributes = attributes
+
+      expected = {:"request.headers.referer" => "http://blog.site/home"}
+      assert_equal expected, error.agent_attributes
+    end
+  end
+
+  def test_agent_attributes_not_sent_when_disabled
+    with_config :'error_collector.attributes.enabled' => false do
+      attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
+      attributes.add_agent_attribute :"request.headers.referer", "http://blog.site/home", NewRelic::Agent::AttributeFilter::DST_ALL
+
+      error = NewRelic::NoticedError.new(@path, Exception.new("O_o"))
+      error.attributes = attributes
+
+      assert_equal({}, error.agent_attributes)
+    end
+  end
+
   def create_error(exception = StandardError.new)
     noticed_error = NewRelic::NoticedError.new(@path, exception, @time)
     noticed_error.attributes = @attributes

data/test/new_relic/rack/agent_hooks_test.rb

@@ -23,7 +23,7 @@ class AgentHooksTest < Minitest::Test
   end
 
   def test_after_call
-    result = [stub, stub, stub]
+    result = [stub, {}, stub]
     @app.stubs(:call).returns(result)
 
     NewRelic::Agent.instance.events.expects(:notify).with(:start_transaction)

data/test/new_relic/rack/error_collector_test.rb

@@ -24,7 +24,7 @@ module NewRelic::Rack
     def setup
       NewRelic::Agent.reset_config
       NewRelic::Agent.manual_start
-      NewRelic::Agent.instance.error_collector.reset!
+      NewRelic::Agent.instance.error_collector.drop_buffered_data
 
       # sanity checks
       assert NewRelic::Agent.instance.error_collector.enabled?
@@ -49,7 +49,8 @@ module NewRelic::Rack
         end
       end
 
-      assert(NewRelic::Agent.instance.error_collector.errors.empty?,
+      errors = harvest_error_traces!
+      assert(errors.empty?,
              'noticed an error that should have been ignored')
     end
 
@@ -63,14 +64,15 @@ module NewRelic::Rack
         assert_raises RuntimeError do
           get '/foo/bar?q=12'
         end
+        error = last_error
 
-        assert_equal('unhandled error', last_error.message)
-        assert_equal('/foo/bar', last_error.request_uri)
+        assert_equal('unhandled error', error.message)
+        assert_equal('/foo/bar', error.request_uri)
       end
     end
 
     def last_error
-      NewRelic::Agent.instance.error_collector.errors[0]
+      harvest_error_traces!.last
     end
   end
 end

data/test/performance/suites/error_collector.rb

@@ -0,0 +1,28 @@
+# 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.
+
+class ErrorCollectorTests < Performance::TestCase
+  def setup
+    @txn_name = "Controller/blogs/index".freeze
+    @err_msg = "Sorry!".freeze
+  end
+
+  def test_notice_error
+    measure do
+      in_transaction :name => @txn_name do
+        NewRelic::Agent.notice_error StandardError.new @err_msg
+      end
+    end
+  end
+
+  def test_notice_error_with_custom_attributes
+    opts = {:custom_params => {:name => "Wes Mantooth", :channel => 9}}
+
+    measure do
+      in_transaction :name => @txn_name do
+        NewRelic::Agent.notice_error StandardError.new(@err_msg), opts
+      end
+    end
+  end
+end

data/test/performance/suites/marshalling.rb

@@ -56,14 +56,6 @@ class Marshalling < Performance::TestCase
     end
   end
 
-  def test_basic_marshalling_pruby
-    marshaller = NewRelic::Agent::NewRelicService::PrubyMarshaller.new
-    measure do
-      marshaller.dump(@payload)
-      marshaller.dump(@tt_payload)
-    end
-  end
-
   # Skips Strings used as Hash keys, since they are frozen
   def each_string(object, &blk)
     case object

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.13.2.302
+  version: 3.14.0.305
 platform: ruby
 authors:
 - Tim Krajcar
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -267,6 +267,7 @@ files:
 - lib/new_relic/agent/deprecator.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
+- lib/new_relic/agent/error_event_aggregator.rb
 - lib/new_relic/agent/error_trace_aggregator.rb
 - lib/new_relic/agent/event_buffer.rb
 - lib/new_relic/agent/event_listener.rb
@@ -348,10 +349,10 @@ files:
 - lib/new_relic/agent/new_relic_service/encoders.rb
 - lib/new_relic/agent/new_relic_service/json_marshaller.rb
 - lib/new_relic/agent/new_relic_service/marshaller.rb
-- lib/new_relic/agent/new_relic_service/pruby_marshaller.rb
 - lib/new_relic/agent/null_logger.rb
 - lib/new_relic/agent/obfuscator.rb
 - lib/new_relic/agent/parameter_filtering.rb
+- lib/new_relic/agent/payload_metric_mapping.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
 - lib/new_relic/agent/pipe_service.rb
 - lib/new_relic/agent/rules_engine.rb
@@ -385,6 +386,7 @@ files:
 - lib/new_relic/agent/transaction.rb
 - lib/new_relic/agent/transaction/attributes.rb
 - lib/new_relic/agent/transaction/developer_mode_sample_buffer.rb
+- lib/new_relic/agent/transaction/request_attributes.rb
 - lib/new_relic/agent/transaction/slowest_sample_buffer.rb
 - lib/new_relic/agent/transaction/synthetics_sample_buffer.rb
 - lib/new_relic/agent/transaction/trace.rb
@@ -757,6 +759,7 @@ files:
 - test/multiverse/suites/agent_only/custom_analytics_events_test.rb
 - test/multiverse/suites/agent_only/custom_queue_time_test.rb
 - test/multiverse/suites/agent_only/encoding_handling_test.rb
+- test/multiverse/suites/agent_only/error_events_test.rb
 - test/multiverse/suites/agent_only/exclusive_time_test.rb
 - test/multiverse/suites/agent_only/harvest_timestamps_test.rb
 - test/multiverse/suites/agent_only/http_response_code_test.rb
@@ -853,6 +856,9 @@ files:
 - test/multiverse/suites/net_http/Envfile
 - test/multiverse/suites/net_http/config/newrelic.yml
 - test/multiverse/suites/net_http/net_http_test.rb
+- test/multiverse/suites/no_json/Envfile
+- test/multiverse/suites/no_json/config/newrelic.yml
+- test/multiverse/suites/no_json/marshal_config_test.rb
 - test/multiverse/suites/padrino/Envfile
 - test/multiverse/suites/padrino/config/newrelic.yml
 - test/multiverse/suites/padrino/padrino_test.rb
@@ -866,6 +872,7 @@ files:
 - test/multiverse/suites/rack/rack_env_mutation_test.rb
 - test/multiverse/suites/rack/rack_parameter_filtering_test.rb
 - test/multiverse/suites/rack/rack_unsupported_version_test.rb
+- test/multiverse/suites/rack/response_content_type_test.rb
 - test/multiverse/suites/rack/url_map_test.rb
 - test/multiverse/suites/rails/Envfile
 - test/multiverse/suites/rails/action_controller_live_rum_test.rb
@@ -1005,6 +1012,7 @@ files:
 - test/new_relic/agent/deprecator_test.rb
 - test/new_relic/agent/encoding_normalizer_test.rb
 - test/new_relic/agent/error_collector_test.rb
+- test/new_relic/agent/error_event_aggregator_test.rb
 - test/new_relic/agent/error_trace_aggregator_test.rb
 - test/new_relic/agent/event_buffer_test_cases.rb
 - test/new_relic/agent/event_listener_test.rb
@@ -1043,6 +1051,7 @@ files:
 - test/new_relic/agent/new_relic_service_test.rb
 - test/new_relic/agent/obfuscator_test.rb
 - test/new_relic/agent/parameter_filtering_test.rb
+- test/new_relic/agent/payload_metric_mapping_test.rb
 - test/new_relic/agent/pipe_channel_manager_test.rb
 - test/new_relic/agent/pipe_service_test.rb
 - test/new_relic/agent/rpm_agent_test.rb
@@ -1072,6 +1081,7 @@ files:
 - test/new_relic/agent/traced_method_stack_test.rb
 - test/new_relic/agent/transaction/attributes_test.rb
 - test/new_relic/agent/transaction/developer_mode_sample_buffer_test.rb
+- test/new_relic/agent/transaction/request_attributes_test.rb
 - test/new_relic/agent/transaction/slowest_sample_buffer_test.rb
 - test/new_relic/agent/transaction/synthetics_sample_buffer_test.rb
 - test/new_relic/agent/transaction/trace_node_test.rb
@@ -1165,6 +1175,7 @@ files:
 - test/performance/suites/active_record.rb
 - test/performance/suites/agent_attributes.rb
 - test/performance/suites/config.rb
+- test/performance/suites/error_collector.rb
 - test/performance/suites/marshalling.rb
 - test/performance/suites/queue_time.rb
 - test/performance/suites/rack_middleware.rb

data/lib/new_relic/agent/new_relic_service/pruby_marshaller.rb

@@ -1,56 +0,0 @@
-# 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 'new_relic/agent/new_relic_service/marshaller'
-
-module NewRelic
-  module Agent
-    class NewRelicService
-      # Primitive Ruby Object Notation which complies JSON format data strutures
-      class PrubyMarshaller < Marshaller
-        def initialize
-          ::NewRelic::Agent.logger.debug 'Using Pruby marshaller'
-          warn_for_pruby_deprecation
-        end
-
-        def warn_for_pruby_deprecation
-          if RUBY_VERSION < "1.9" && !defined?(::JSON)
-            NewRelic::Agent.logger.warn("Upcoming versions of the Ruby agent running on Ruby 1.8.7 will require the 'json' gem. To avoid interuption in reporting, please update your Gemfile. See http://docs.newrelic.com/docs/ruby/ruby-1.8.7-support for more information.")
-          end
-        end
-
-        def dump(ruby, opts={})
-          NewRelic::LanguageSupport.with_cautious_gc do
-            Marshal.dump(prepare(ruby, opts))
-          end
-        rescue => e
-          ::NewRelic::Agent.logger.debug("#{e.class.name} : #{e.message} when marshalling #{ruby.inspect}")
-          raise
-        end
-
-        def load(data)
-          if data.nil? || data.empty?
-            ::NewRelic::Agent.logger.error "Empty pruby response from collector: '#{data.inspect}'"
-            return nil
-          end
-
-          NewRelic::LanguageSupport.with_cautious_gc do
-            return_value(Marshal.load(data))
-          end
-        rescue
-          ::NewRelic::Agent.logger.debug "Error encountered loading collector response: #{data}"
-          raise
-        end
-
-        def format
-          'pruby'
-        end
-
-        def self.is_supported?
-          true
-        end
-      end
-    end
-  end
-end