newrelic_rpm 3.16.2.321 → 3.16.3.323

data/test/new_relic/cli/commands/deployments_test.rb

@@ -6,15 +6,16 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_h
 require 'new_relic/cli/command'
 require 'new_relic/cli/commands/deployments'
 
+NewRelic::Cli::Deployments.class_eval do
+  attr_accessor :messages, :exit_status, :errors, :revision, :license_key
+  def err(message); @errors = "#{@errors ||= nil}#{message}"; end
+  def info(message); @messages = "#{@messages ||=nil}#{message}"; end
+  def just_exit(status=0); @exit_status ||= status; end
+end
+
 class NewRelic::Cli::DeploymentsTest < Minitest::Test
 
   def setup
-    NewRelic::Cli::Deployments.class_eval do
-      attr_accessor :messages, :exit_status, :errors, :revision, :license_key
-      def err(message); @errors = @errors ? @errors + message : message; end
-      def info(message); @messages = @messages ? @messages + message : message; end
-      def just_exit(status=0); @exit_status ||= status; end
-    end
     @config = { :license_key => 'a' * 40,
                 :config_path => 'test/config/newrelic.yml' }
     NewRelic::Agent.config.add_config_for_testing(@config)
@@ -37,12 +38,14 @@ class NewRelic::Cli::DeploymentsTest < Minitest::Test
     rescue NewRelic::Cli::Command::CommandFailure => c
       assert_match(/^Usage/, c.message)
     end
+    @deployment = nil
   end
 
   def test_bad_command
     assert_raises NewRelic::Cli::Command::CommandFailure do
       NewRelic::Cli::Deployments.new ["-foo", "bar"]
     end
+    @deployment = nil
   end
 
   def test_interactive
@@ -81,6 +84,7 @@ class NewRelic::Cli::DeploymentsTest < Minitest::Test
         deployment.run
       end
     end
+    @deployment = nil
   end
 
   def test_error_if_failed_yaml
@@ -90,6 +94,7 @@ class NewRelic::Cli::DeploymentsTest < Minitest::Test
       deployment = NewRelic::Cli::Deployments.new(%w[-a APP -r 3838 --user=Bill] << "Some lengthy description")
       deployment.run
     end
+    @deployment = nil
   end
 
   def test_with_specified_license_key

data/test/new_relic/control/class_methods_test.rb

@@ -8,6 +8,10 @@ require 'new_relic/control/class_methods'
 class BaseClassMethods
   # stub class to enable testing of the module
   include NewRelic::Control::ClassMethods
+
+  def initialize
+    @instance = nil
+  end
 end
 
 class NewRelic::Control::ClassMethodsTest < Minitest::Test
@@ -17,7 +21,7 @@ class NewRelic::Control::ClassMethodsTest < Minitest::Test
   end
 
   def test_instance
-    assert_equal(nil, @base.instance_variable_get('@instance'), 'instance should start out nil')
+    assert_equal(nil, @base.instance_variable_get(:@instance), 'instance should start out nil')
     @base.expects(:new_instance).returns('a new instance')
     assert_equal('a new instance', @base.instance, "should return the result from the #new_instance call")
   end

data/test/performance/lib/performance/instrumentation/gc_stats.rb

@@ -5,7 +5,7 @@
 module Performance
   module Instrumentation
     class MRIGCStats < Instrumentor
-      platforms :mri_193, :mri_20, :mri_21, :mri_22
+      platforms :mri_193, :mri_20, :mri_21, :mri_22, :mri_23
       on_by_default
 
       def before(*)

data/test/performance/lib/performance/instrumentation/stackprof.rb

@@ -5,7 +5,7 @@
 module Performance
   module Instrumentation
     class StackProfProfile < Instrumentor
-      platforms :mri_21, :mri_22
+      platforms :mri_21, :mri_22, :mri_23
 
       def self.setup
         require 'tmpdir'
@@ -31,7 +31,7 @@ module Performance
         output_dot_path = artifact_path(test, test_name, "dot")
         report = StackProf::Report.new(results)
         File.open(output_dot_path, "w") do |f|
-          report.print_graphviz(nil, f)
+          report.print_graphviz({}, f)
         end
         @artifacts << output_dot_path
       end

data/test/performance/lib/performance/platform.rb

@@ -27,6 +27,7 @@ module Performance
       when :mri_20  then !jruby? && RUBY_VERSION =~ /^2\.0\./
       when :mri_21  then !jruby? && RUBY_VERSION =~ /^2\.1\./
       when :mri_22  then !jruby? && RUBY_VERSION =~ /^2\.2\./
+      when :mri_23  then !jruby? && RUBY_VERSION =~ /^2\.3\./
       end
     end
 

data/test/performance/suites/active_record_subscriber.rb

@@ -0,0 +1,100 @@
+# 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/instrumentation/active_record_subscriber'
+
+# Note: This test was cobbled together from the AR Subscriber Unit Test and
+# by cut & paste of ActiveSupport::Notifcations::Event from Rails source.
+# This test is here because it's useful, not because it's well written.
+# If you have a desire to improve this test, do it!
+
+unless defined?(ActiveSupport::Notifications::Event)
+  module ActiveSupport
+    module Notifications
+      class Event
+        attr_reader :name, :time, :transaction_id, :payload, :children
+        attr_accessor :end
+
+        def initialize(name, start, ending, transaction_id, payload)
+          @name           = name
+          @payload        = payload.dup
+          @time           = start
+          @transaction_id = transaction_id
+          @end            = ending
+          @children       = []
+          @duration       = nil
+        end
+
+        # Returns the difference in milliseconds between when the execution of the
+        # event started and when it ended.
+        #
+        #   ActiveSupport::Notifications.subscribe('wait') do |*args|
+        #     @event = ActiveSupport::Notifications::Event.new(*args)
+        #   end
+        #
+        #   ActiveSupport::Notifications.instrument('wait') do
+        #     sleep 1
+        #   end
+        #
+        #   @event.duration # => 1000.138
+        def duration
+          @duration ||= 1000.0 * (self.end - time)
+        end
+
+        def <<(event)
+          @children << event
+        end
+
+        def parent_of?(event)
+          @children.include? event
+        end
+      end
+    end
+  end
+end
+
+class ActiveRecordSubscriberTest < Performance::TestCase
+  def setup
+    @config = { :adapter => 'mysql', :host => 'server' }
+    @connection = Object.new
+    @connection.instance_variable_set(:@config, @config)
+
+
+    @params = {
+      :name => 'NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order Load',
+      :sql => 'SELECT * FROM sandwiches',
+      :connection_id => @connection.object_id
+    }
+
+    @subscriber = NewRelic::Agent::Instrumentation::ActiveRecordSubscriber.new
+    if @subscriber.respond_to? :active_record_config_for_event
+      @subscriber.class.send(:remove_method, :active_record_config_for_event)
+      @subscriber.class.send(:define_method, :active_record_config_for_event) do |args|
+        @config
+      end
+    else
+      @subscriber.class.send(:remove_method, :active_record_config)
+      @subscriber.class.send(:define_method, :active_record_config) do |args|
+        @config
+      end
+    end
+  end
+
+
+  def test_subscriber_in_txn
+    measure do
+      in_transaction do
+        simulate_query
+      end
+    end
+  end
+
+  EVENT_NAME = 'sql.active_record'.freeze
+
+  def simulate_query(duration=nil)
+    @subscriber.start(EVENT_NAME, :id, @params)
+    advance_time(duration) if duration
+    @subscriber.finish(EVENT_NAME, :id, @params)
+  end
+end

data/ui/helpers/developer_mode_helper.rb

@@ -17,7 +17,8 @@ module NewRelic::DeveloperModeHelper
   end
 
   def trace_row_display_limit_reached
-   (!@detail_node_count.nil? && @detail_node_count > trace_row_display_limit) || sql_segments(@sample).length > trace_row_display_limit
+    (defined?(@detail_node_count) && !@detail_node_count.nil? && (@detail_node_count > trace_row_display_limit)) ||
+      sql_segments(@sample).length > trace_row_display_limit
   end
 
   # return the highest level in the call stack for the trace that is not rails or

data/ui/helpers/google_pie_chart.rb

@@ -11,6 +11,7 @@ class GooglePieChart
   def initialize
     # an array of [label, value]
     @data = []
+    @max = nil
     self.width = 300
     self.height = 200
   end

data/ui/views/newrelic/explain_sql.rhtml

@@ -15,7 +15,7 @@
 	</tr>
 <% end %>
 
-<% if @obfuscated_sql %>
+<% if defined?(@obfuscated_sql) && @obfuscated_sql %>
 	<tr>
 		<th align=right valign=top>
 		Obfuscated Query

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/action_mailer.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class ActionMailer < NewRelic::MetricParser::MetricParser
 

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/active_merchant.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class ActiveMerchant < NewRelic::MetricParser::MetricParser
 

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/active_record.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class ActiveRecord < NewRelic::MetricParser::MetricParser
       def is_active_record? ; true; end

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/apdex.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class Apdex < NewRelic::MetricParser::MetricParser
 

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class Controller < NewRelic::MetricParser::MetricParser
 

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/controller_cpu.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class ControllerCPU < NewRelic::MetricParser::MetricParser
 

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/errors.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class Errors < NewRelic::MetricParser::MetricParser
       def is_error?; true; end

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/external.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class External < NewRelic::MetricParser::MetricParser
 

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/mem_cache.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class MemCache < NewRelic::MetricParser::MetricParser
       def is_memcache?; true; end
@@ -13,9 +13,6 @@ module NewRelic
       def short_name
         'Memcache'
       end
-      def developer_name
-        "Memcache #{segments[1..-1].join '/'}"
-      end
 
       def all?
         segments[1].index('all') == 0

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/middleware.rb

@@ -2,9 +2,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/metric_parser'
-
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class Middleware < MetricParser
       ALL  = 'Middleware/all'.freeze

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/nested.rb

@@ -2,9 +2,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/metric_parser'
-
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class Nested < Controller
       def initialize(name)

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/other_transaction.rb

@@ -2,10 +2,10 @@
 # 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/metric_parser'
 # OtherTransaction metrics must have at least three segments: /OtherTransaction/<task>/*
 # Task is "Background", "Resque", "DelayedJob" etc.
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class OtherTransaction < NewRelic::MetricParser::MetricParser
 

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class View < NewRelic::MetricParser::MetricParser
       def is_view?; true; end

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_frontend.rb

@@ -2,9 +2,9 @@
 # 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/metric_parser'
 # The metric where the mongrel queue time is stored
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class WebFrontend < NewRelic::MetricParser::MetricParser
       def short_name

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_service.rb

@@ -2,8 +2,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/metric_parser'
 module NewRelic
+  autoload :MetricParser, 'new_relic/metric_parser'
   module MetricParser
     class WebService < NewRelic::MetricParser::MetricParser
       def is_web_service?

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.16.2.321
+  version: 3.16.3.323
 platform: ruby
 authors:
 - Tim Krajcar
 - Matthew Wear
 - Katherine Wu
-- Caito Scherr
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -238,6 +237,7 @@ files:
 - lib/new_relic/agent/hostname.rb
 - lib/new_relic/agent/http_clients/curb_wrappers.rb
 - lib/new_relic/agent/http_clients/excon_wrappers.rb
+- lib/new_relic/agent/http_clients/http_rb_wrappers.rb
 - lib/new_relic/agent/http_clients/httpclient_wrappers.rb
 - lib/new_relic/agent/http_clients/net_http_wrappers.rb
 - lib/new_relic/agent/http_clients/typhoeus_wrappers.rb
@@ -264,6 +264,7 @@ files:
 - lib/new_relic/agent/instrumentation/excon/connection.rb
 - lib/new_relic/agent/instrumentation/excon/middleware.rb
 - lib/new_relic/agent/instrumentation/grape.rb
+- lib/new_relic/agent/instrumentation/http.rb
 - lib/new_relic/agent/instrumentation/httpclient.rb
 - lib/new_relic/agent/instrumentation/ignore_actions.rb
 - lib/new_relic/agent/instrumentation/memcache.rb
@@ -824,6 +825,9 @@ files:
 - test/multiverse/suites/httpclient/Envfile
 - test/multiverse/suites/httpclient/config/newrelic.yml
 - test/multiverse/suites/httpclient/httpclient_test.rb
+- test/multiverse/suites/httprb/Envfile
+- test/multiverse/suites/httprb/config/newrelic.yml
+- test/multiverse/suites/httprb/httprb_test.rb
 - test/multiverse/suites/json/Envfile
 - test/multiverse/suites/json/config/newrelic.yml
 - test/multiverse/suites/json/json_test.rb
@@ -1185,6 +1189,7 @@ files:
 - test/performance/script/mega-runner
 - test/performance/script/runner
 - test/performance/suites/active_record.rb
+- test/performance/suites/active_record_subscriber.rb
 - test/performance/suites/agent_attributes.rb
 - test/performance/suites/config.rb
 - test/performance/suites/datastores.rb