newrelic_rpm 3.16.2.321 → 3.16.3.323

data/test/multiverse/lib/multiverse/runner.rb

@@ -87,7 +87,7 @@ module Multiverse
       "api"           => ["grape"],
       "background"    => ["delayed_job", "rake", "resque", "sidekiq"],
       "database"      => ["datamapper", "mongo", "redis", "sequel"],
-      "httpclients"   => ["curb", "excon", "httpclient", "typhoeus", "net_http"],
+      "httpclients"   => ["curb", "excon", "httpclient", "typhoeus", "net_http", "httprb"],
       "rails"         => ["active_record", "rails"],
       "serialization" => ["json", "marshalling", "yajl"],
       "sinatra"       => ["sinatra", "padrino"],

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

@@ -73,7 +73,7 @@ class LabelsTest < Minitest::Test
         ENV['NEW_RELIC_LABELS'] = nil
       end
     end
-  end
+  end unless RUBY_VERSION < '1.9'
 
   def assert_connect_had_labels(expected)
     result = $collector.calls_for('connect').last['labels']

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

@@ -10,6 +10,11 @@ class StartUpTest < Minitest::Test
   JRUBY_9000_NOISE = [
     /uri\:classloader\:\/jruby\/kernel\/kernel\.rb\:\d*\: warning: unsupported exec option: close_others/, # https://github.com/jruby/jruby/issues/1913
     /.*\/lib\/ruby\/stdlib\/jar_dependencies.rb:\d*: warning: shadowing outer local variable - (group_id|artifact_id)/, #https://github.com/mkristian/jar-dependencies/commit/65c71261b1522f7b10fcb95de42ea4799de3a83a
+    /.*warning\: too many arguments for format string/ # Fixed in 9.1.3.0, see https://github.com/jruby/jruby/issues/3934
+  ]
+  BUNDLER_NOISE = [
+    %r{.*gems/bundler-1.12.5/lib/bundler/rubygems_integration.rb:468: warning: method redefined; discarding old find_spec_for_exe},
+    %r{.*lib/ruby/site_ruby/2.3.0/rubygems.rb:261: warning: previous definition of find_spec_for_exe was here}
   ]
 
   include MultiverseHelpers
@@ -73,6 +78,7 @@ class StartUpTest < Minitest::Test
         expected_noise = [GIT_NOISE]
 
         expected_noise << JRUBY_9000_NOISE if jruby_9000
+        expected_noise << BUNDLER_NOISE if bundler_rubygem_conflicts?
 
         expected_noise.flatten.each {|noise| output.gsub!(noise, "")}
         output.strip!
@@ -93,4 +99,9 @@ class StartUpTest < Minitest::Test
   def jruby_9000
     defined?(JRUBY_VERSION) && NewRelic::VersionNumber.new(JRUBY_VERSION) >= "9.0.0"
   end
+
+  def bundler_rubygem_conflicts?
+    NewRelic::VersionNumber.new(Gem::VERSION) == "2.6.6" and
+      NewRelic::VersionNumber.new(Bundler::VERSION) == "1.12.5"
+  end
 end

data/test/multiverse/suites/httprb/Envfile

@@ -0,0 +1,19 @@
+suite_condition("http.rb is only supported for versions >= 2.0.0") do
+  RUBY_VERSION >= '2.0.0'
+end
+
+httprb_versions = %w(2.0.3
+                     2.0.2
+                     2.0.1
+                     2.0.0
+                     1.0.4
+                     0.9.9
+                     0.8.14
+                     0.7.4)
+
+httprb_versions.each do |httprb_version|
+  gemfile <<-RB
+    gem 'http', '~> #{httprb_version}'
+    gem 'rack'
+  RB
+end

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

@@ -0,0 +1,18 @@
+---
+development:
+  error_collector:
+    enabled: true
+  apdex_t: 0.5
+  ssl: false
+  monitor_mode: true
+  license_key: bootstrap_newrelic_admin_license_key_000
+  developer_mode: false
+  app_name: test
+  host: 127.0.0.1
+  api_host: 127.0.0.1
+  transaction_tracer:
+    record_sql: obfuscated
+    enabled: true
+    stack_trace_threshold: 0.5
+    transaction_threshold: 1.0
+  capture_params: false

data/test/multiverse/suites/httprb/httprb_test.rb

@@ -0,0 +1,78 @@
+# 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 "http"
+require "newrelic_rpm"
+require "http_client_test_cases"
+
+class HTTPTest < Minitest::Test
+  include HttpClientTestCases
+
+  def client_name
+    "http.rb"
+  end
+
+  def is_unsupported_1x?
+    defined?(::HTTP::VERSION) && HTTP::VERSION < '1.0.0'
+  end
+
+  def get_response(url=nil, headers=nil)
+    HTTP.get(url || default_url, :headers => headers)
+  end
+
+  def head_response
+    HTTP.head(default_url)
+  end
+
+  def post_response
+    HTTP.post(default_url, :body => "")
+  end
+
+  def put_response
+    HTTP.put(default_url, :body => "")
+  end
+
+  def delete_response
+    HTTP.delete(default_url, :body => "")
+  end
+
+  def body(res)
+    res.body.to_s
+  end
+
+  def request_instance
+    options = {
+      verb: :get,
+      uri: 'http://newrelic.com'
+    }
+
+    httprb_req =
+      if is_unsupported_1x?
+        HTTP::Request.new(*options.values)
+      else
+        HTTP::Request.new(options)
+      end
+
+    ::NewRelic::Agent::HTTPClients::HTTPRequest.new(httprb_req)
+  end
+
+  def response_instance(headers = {})
+    options = {
+      status: 200,
+      version: '1.1',
+      headers: headers,
+      body: ''
+    }
+
+    httprb_resp =
+      if is_unsupported_1x?
+        HTTP::Response.new(*options.values)
+      else
+        HTTP::Response.new(options)
+      end
+
+    ::NewRelic::Agent::HTTPClients::HTTPResponse.new(httprb_resp)
+  end
+
+end

data/test/multiverse/suites/rails/error_tracing_test.rb

@@ -70,6 +70,11 @@ class ErrorController < ApplicationController
     raise 'bad things'
   end
 
+  def noticed_error_with_trace_only
+    NewRelic::Agent.notice_error("Raise the gates!", :trace_only => true)
+    render :text => 'Runner 5'
+  end
+
   if Rails::VERSION::MAJOR == 2
     filter_parameter_logging(:secret)
   end
@@ -285,6 +290,20 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
     end
   end
 
+  def test_should_not_increment_metrics_on_trace_only_errors
+    get '/error/noticed_error_with_trace_only'
+
+    assert_equal(1, errors.size,
+                 'Error with :trace_only should have been recorded')
+
+    assert_metrics_not_recorded([
+      'Errors/all',
+      'Errors/Controller/error/noticed_error_with_trace_only'
+    ])
+
+    assert_metrics_recorded("Apdex" => { :apdex_s => 1 })
+  end
+
   protected
 
   def errors

data/test/new_relic/agent/agent_logger_test.rb

@@ -6,20 +6,6 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 require 'new_relic/agent/agent_logger'
 require 'new_relic/agent/null_logger'
 
-class ArrayLogDevice
-  def initialize( array=[] )
-    @array = array
-  end
-  attr_reader :array
-
-  def write( message )
-    @array << message
-  end
-
-  def close; end
-end
-
-
 class AgentLoggerTest < Minitest::Test
 
   LEVELS = [:fatal, :error, :warn, :info, :debug]

data/test/new_relic/agent/commands/thread_profiler_session_test.rb

@@ -20,6 +20,7 @@ module ThreadProfilerSessionTestHelpers
     "only_request_threads" => false,
     "profile_agent_code" => false,
   }
+
   STOP = {
     "profile_id" => 42,
     "report_data" => true,

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

@@ -298,8 +298,9 @@ module NewRelic::Agent::Configuration
 
         assert_warning if testcase["warning"]
         assert_equal(testcase["expected"].sort_by { |h| h["label_type"] },
-                     @manager.parse_labels_from_string.sort_by { |h| h["label_type"] })
-      end
+                     @manager.parse_labels_from_string.sort_by { |h| h["label_type"] },
+                     "failed on #{testcase["name"]}")
+      end unless RUBY_VERSION < '1.9'
     end
 
     def test_parse_labels_from_dictionary_with_hard_failure

data/test/new_relic/agent/error_collector_test.rb

@@ -129,7 +129,7 @@ class NewRelic::Agent::ErrorCollectorTest < Minitest::Test
     end
   end
 
-  def test_increment_error_count_record_summary_and_txn_metric
+  def test_increment_error_count_record_summary_and_web_txn_metric
     in_web_transaction('Controller/class/method') do
       @error_collector.increment_error_count!(NewRelic::Agent::TransactionState.tl_get, StandardError.new('Boo'))
     end
@@ -139,7 +139,7 @@ class NewRelic::Agent::ErrorCollectorTest < Minitest::Test
                              'Errors/Controller/class/method'])
   end
 
-  def test_increment_error_count_record_summary_and_txn_metric
+  def test_increment_error_count_record_summary_and_other_txn_metric
     in_background_transaction('OtherTransaction/AnotherFramework/Job/perform') do
       @error_collector.increment_error_count!(NewRelic::Agent::TransactionState.tl_get, StandardError.new('Boo'))
     end
@@ -383,6 +383,31 @@ class NewRelic::Agent::ErrorCollectorTest < Minitest::Test
     end
   end
 
+  def test_trace_only_does_not_increment_metrics
+    @error_collector.notice_error(StandardError.new, :trace_only => true)
+    traces = harvest_error_traces
+    events = harvest_error_events
+
+    assert_equal 1, traces.length
+    assert_equal 1, events.length
+    assert_metrics_not_recorded ['Errors/all']
+  end
+
+  def test_trace_only_not_recorded_as_custom_attribute
+    @error_collector.notice_error(StandardError.new, :trace_only => true)
+    traces = harvest_error_traces
+    events = harvest_error_events
+
+    assert_equal 1, traces.length
+    assert_equal 1, events.length
+
+    event_attrs = events[0][1]
+    refute event_attrs.key?("trace_only"), "Unexpected attribute trace_only found in custom attributes"
+
+    trace_attrs = traces[0].attributes_from_notice_error
+    refute trace_attrs.key?(:trace_only), "Unexpected attribute trace_only found in custom attributes"
+  end
+
   private
 
   def expects_error_count_increase(increase)

data/test/new_relic/agent/instrumentation/middleware_proxy_test.rb

@@ -208,7 +208,6 @@ class NewRelic::Agent::Instrumentation::MiddlewareProxyTest < Minitest::Test
   def test_should_emit_events_once
     app = Proc.new { |env| [200, {}, ["nothing"]]}
     middleware = Proc.new { |env| app.call(env) }
-    wrapped_app = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
     wrapped_middleware = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(middleware, true)
 
     before_call_count = 0
@@ -217,7 +216,7 @@ class NewRelic::Agent::Instrumentation::MiddlewareProxyTest < Minitest::Test
     NewRelic::Agent.instance.events.subscribe(:before_call) { before_call_count += 1 }
     NewRelic::Agent.instance.events.subscribe(:after_call) { after_call_count += 1 }
 
-    result = wrapped_middleware.call({})
+    wrapped_middleware.call({})
     assert_equal 1, before_call_count
     assert_equal 1, after_call_count
   end
@@ -235,7 +234,7 @@ class NewRelic::Agent::Instrumentation::MiddlewareProxyTest < Minitest::Test
     assert_same original_env, env_from_before_call
   end
 
-  def test_before_call_should_receive_rack_env_hash
+  def test_after_call_should_receive_rack_env_hash
     app = Proc.new { |env| [200, {}, ["nothing"]] }
     wrapped_app = NewRelic::Agent::Instrumentation::MiddlewareProxy.wrap(app, true)
 

data/test/new_relic/agent/instrumentation/net_instrumentation_test.rb

@@ -16,6 +16,8 @@ class NewRelic::Agent::Instrumentation::NetInstrumentationTest < Minitest::Test
       :encoding_key                       => 'gringletoes'
     )
 
+    @response ||= nil
+
     @socket = fixture_tcp_socket( @response )
 
     NewRelic::Agent.instance.stats_engine.clear_stats

data/test/new_relic/agent/method_tracer_test.rb

@@ -79,6 +79,7 @@ class NewRelic::Agent::MethodTracerTest < Minitest::Test
     @scope_listener = NewRelic::Agent::MockScopeListener.new
     @old_sampler = NewRelic::Agent.instance.transaction_sampler
     NewRelic::Agent.instance.stubs(:transaction_sampler).returns(@scope_listener)
+    @metric_name ||= nil
 
     freeze_time
 

data/test/new_relic/agent/sampler_test.rb

@@ -18,8 +18,8 @@ class NewRelic::Agent::SamplerTest < Minitest::Test
 
   def test_inherited_should_append_subclasses_to_sampler_classes
     test_class = Class.new(NewRelic::Agent::Sampler)
-    sampler_classes = NewRelic::Agent::Sampler.instance_eval { @sampler_classes }
-    assert(sampler_classes.include?(test_class), "Sampler classes (#{@sampler_classes.inspect}) does not include #{test_class.inspect}")
+    sampler_classes = NewRelic::Agent::Sampler.instance_variable_get :@sampler_classes
+    assert(sampler_classes.include?(test_class), "Sampler classes (#{sampler_classes.inspect}) does not include #{test_class.inspect}")
     # cleanup the sampler created above
     NewRelic::Agent::Sampler.instance_eval { @sampler_classes.delete(test_class) }
   end

data/test/new_relic/agent/synthetics_event_aggregator_test.rb

@@ -12,6 +12,7 @@ module NewRelic
     class SyntheticsEventAggregatorTest < Minitest::Test
       def setup
         freeze_time
+        @attributes = nil
         @synthetics_event_aggregator = SyntheticsEventAggregator.new
       end
 

data/test/new_relic/agent/threading/backtrace_service_test.rb

@@ -487,6 +487,14 @@ if NewRelic::Agent::Threading::BacktraceService.is_supported?
       end
 
       def fake_last_poll_took(last_poll_length)
+        # avoid method redefinition warnings
+        class << @service
+          begin
+            remove_method :adjust_polling_time
+          rescue NameError
+          end
+        end
+
         # We need to adjust Time.now during the midst of poll
         # Slip in before the adjust_polling_time call to advance the clock
         @service.define_singleton_method(:adjust_polling_time) do |end_time, *args|

data/test/new_relic/agent/transaction/trace_node_test.rb

@@ -232,7 +232,7 @@ class NewRelic::Agent::Transaction::TraceNodeTest < Minitest::Test
     s = NewRelic::Agent::Transaction::TraceNode.new(Time.now, 'Custom/test/metric')
 
     # should have a default value
-    assert_equal(nil, s.instance_eval { @params })
+    assert_equal({}, s.instance_variable_get(:@params))
     assert_equal({}, s.params)
 
     # should otherwise take the value from the @params var
@@ -329,12 +329,12 @@ class NewRelic::Agent::Transaction::TraceNodeTest < Minitest::Test
 
   def test_params_equal
     s = NewRelic::Agent::Transaction::TraceNode.new(Time.now, 'Custom/test/metric')
-    assert_equal(nil, s.instance_eval { @params })
+    assert_equal({}, s.instance_variable_get(:@params))
 
     params = {:foo => 'correct'}
 
     s.params = params
-    assert_equal(params, s.instance_eval { @params })
+    assert_equal(params, s.instance_variable_get(:@params))
   end
 
   def test_obfuscated_sql
@@ -353,7 +353,7 @@ class NewRelic::Agent::Transaction::TraceNodeTest < Minitest::Test
 
   def test_parent_node_equals
     s = NewRelic::Agent::Transaction::TraceNode.new(Time.now, 'Custom/test/metric')
-    assert_equal(nil, s.instance_eval { @parent_node })
+    assert_equal(nil, s.parent_node)
     fake_node = mock('node')
     s.send(:parent_node=, fake_node)
     assert_equal(fake_node, s.parent_node)

data/test/new_relic/agent_test.rb

@@ -434,6 +434,37 @@ module NewRelic
       NewRelic::Agent.set_user_attributes(:is => "bunk")
     end
 
+    def test_modules_and_classes_return_name_properly
+      valid = [Module, Class]
+      stack = [NewRelic]
+
+      loop do
+        a = stack.pop
+
+        if a.respond_to? :name
+          b = if RUBY_VERSION < '2.0.0'
+                a.name.split('::').reduce(nil) { |c,n| (c || Kernel).const_get n }
+              else
+                Kernel.const_get a.name
+              end
+          assert_equal a, b
+        end
+
+        if a.respond_to? :constants
+          stack.concat a.constants.map { |c| a.const_get c }.select do |c|
+            if valid.include?(c.class) && !c.ancestors.include?(Minitest::Test)
+              assert_instance_of String, c.name
+              c.name.start_with?(a.name)
+            else
+              false
+            end
+          end
+        end
+
+        break if stack.empty?
+      end
+    end
+
     private
 
     def with_unstarted_agent