newrelic_rpm 3.16.2.321 → 3.16.3.323

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5fbd063ff6696e5f6ca06468d904efd894895f0
-  data.tar.gz: ce04df3458e79da8fd0dcb30d5b5c5b9163013ca
+  metadata.gz: a8454965d0e8d1a99e35caacd91984db198aa5d7
+  data.tar.gz: 830bcd499e25cf38ee804c656788b29201510b6e
 SHA512:
-  metadata.gz: 728c1d9a90c3dacd41feb973c580fe65ac6be12a6373601fcd016ffe80deeb42c35ef48ebeda9db851a1e6016295ee86dfce599a2c79ef3eb7b4157a107ec88c
-  data.tar.gz: 7d16bb5da40a84b1ba4def5d9b7cafc82d65c0afe66b48d9b7ef6e37c1b1742c839e2b385d3ef7985ab72172c8ebb6966263837b0a29b37899a4b787ac8b78fe
+  metadata.gz: 4c62be289b6de4579c011a88fce9777cbd97f1fb3a4c14a0d6accfc9ef377d58520fd8fb3b256298f3d3615e19cc361f92af7e3d730d3b9de30938ffa019dc5f
+  data.tar.gz: 989d62082b606f370a55e9a898ae4b28ae1ddec04ad1c75ecff2a2ab77afde56da330523c5f2be566ae080a7eb5e7c091a41b26f881b95dadd99e72bee51cb41

data/.travis.yml

@@ -5,7 +5,7 @@ services:
 
 language: ruby
 
-sudo: false
+sudo: required
 
 script: ./test/script/ci.sh
 
@@ -13,7 +13,8 @@ before_install:
   - 'mkdir -p /home/travis/gemfiles && touch /home/travis/gemfiles/IGNORE.txt && cp -R /home/travis/gemfiles/* .'
   - 'if [[ `ruby --version` =~ ^ruby\ 1\. ]]; then gem update --system 1.8.25; fi'
   - gem --version
-  - gem install bundler
+  # currently there's an incompatibility between Bundler 1.13 with JRuby 1.7, see Bundler issue #4975
+  - 'if [[ `ruby --version` =~ ^jruby\ 1\. ]]; then rvm use @global && gem uninstall -x bundler && gem install bundler -v 1.12.5; else gem install bundler; fi'
   - bundle --version
 
 install: bundle install --local --path=/home/travis/bundle || bundle --path=/home/travis/bundle
@@ -44,10 +45,10 @@ notifications:
 rvm:
   # Run slowest builds first to try and optimize overall cycle time.
   - jruby-1.7.23
-  - jruby-9.0.4.0
+  - jruby-9.1.2.0
   - 2.3.1
   - 2.2.5
-  - 2.1.8
+  - 2.1.10
   - 2.0.0-p648
   - 1.9.3
   - 1.9.2
@@ -115,13 +116,13 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails23
 
     # 2.1
-    - rvm: 2.1.8
+    - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: 2.1.8
+    - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: 2.1.8
+    - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: 2.1.8
+    - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails50
 
     # 2.0
@@ -181,17 +182,17 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50
 
     # jruby 9.0
-    - rvm: jruby-9.0.4.0
+    - rvm: jruby-9.1.2.0
       env: TYPE=UNIT ENVIRONMENT=rails21
-    - rvm: jruby-9.0.4.0
+    - rvm: jruby-9.1.2.0
       env: TYPE=UNIT ENVIRONMENT=rails22
-    - rvm: jruby-9.0.4.0
+    - rvm: jruby-9.1.2.0
       env: TYPE=UNIT ENVIRONMENT=rails23
-    - rvm: jruby-9.0.4.0
+    - rvm: jruby-9.1.2.0
       env: TYPE=UNIT ENVIRONMENT=rails30
-    - rvm: jruby-9.0.4.0
+    - rvm: jruby-9.1.2.0
       env: TYPE=UNIT ENVIRONMENT=rails31
-    - rvm: jruby-9.0.4.0
+    - rvm: jruby-9.1.2.0
       env: TYPE=UNIT ENVIRONMENT=rails32
 
     # rbx

data/CHANGELOG

@@ -1,5 +1,25 @@
 # New Relic Ruby Agent Release Notes #
 
+## v3.16.3 ##
+
+  * Add `:trace_only` option to `notice_error` API
+
+  Previously, calling `notice_error` would record the trace, increment the
+  error count, and consider the transaction failing for Apdex purposes. This
+  method now accepts a `:trace_only` boolean option which, if true, will only
+  record the trace and not affect the error count or transaction.
+
+  * HTTP.rb support
+
+  The agent has been updated to add instrumentation support for the HTTP gem,
+  including Cross Application Tracing. Thanks Tiago Sousa for the contribution!
+
+  * Prevent redundant Delayed::Job instrumentation installation
+
+  This change was to handle situations where multiple Delayed::Worker instances
+  are being created but Delayed::Job has already been instrumented. Thanks Tony
+  Brown for the contribution!
+
 ## v3.16.2 ##
 
   * Fix for "Unexpected frame in traced method stack" errors
@@ -43,7 +63,7 @@
   adapter name, and Postmodern expanded our coverage. Thanks for the
   contribution!
 
-## v3.16.0
+## v3.16.0 ##
 
   * Official Rails 5.0 support
 

data/lib/new_relic/agent.rb

@@ -210,16 +210,31 @@ module NewRelic
       end
     end
 
-    # Notice the error with the given available options:
-    #
-    # * <tt>:uri</tt> => Request path, minus request params or query string
-    # * <tt>:metric</tt> => The metric name associated with the transaction
-    # * <tt>:custom_params</tt> => Custom parameters
-    #
-    # Previous versions of the agent allowed passing :request_params but
-    # those are now ignored. Associate the request with the enclosing
-    # transaction, or record additional information as custom attributes.
-    # Anything left over is treated as custom params.
+    # Send an error to New Relic.
+    #
+    # @param [Exception] exception Error you wish to send
+    # @param [Hash]      options Modify how New Relic processes the error
+    # @option options [Hash]    :custom_params Custom parameters to attach to the trace
+    # @option options [Boolean] :trace_only Only record the error trace
+    #                           (do not affect error rate or Apdex status)
+    # @option options [String]  :uri Request path, minus request params or query string
+    #                           (usually not needed)
+    # @option options [String]  :metric Metric name associated with the transaction
+    #                           (usually not needed)
+    #
+    # Any option keys other than the ones listed here are treated as
+    # <code>:custom_params</code>.
+    #
+    # *Note:* Previous versions of the agent allowed passing
+    # <code>:request_params</code>, but those are now ignored.  If you
+    # need to record the request parameters, call this method inside a
+    # transaction or pass the information in
+    # <code>:custom_params</code>.
+    #
+    # Most of the time, you do not need to specify the
+    # <code>:uri</code> or <code>:metric</code> options; only pass
+    # them if you are calling <code>notice_error</code> outside a
+    # transaction.
     #
     # @api public
     #

data/lib/new_relic/agent/agent.rb

@@ -71,6 +71,8 @@ module NewRelic
         @connect_state      = :pending
         @connect_attempts   = 0
         @environment_report = nil
+        @waited_on_connect  = nil
+        @connected_pid      = nil
 
         @wait_on_connect_reader, @wait_on_connect_writer = IO.pipe
 
@@ -472,7 +474,7 @@ module NewRelic
           end
 
           def in_resque_child_process?
-            @service.is_a?(NewRelic::Agent::PipeService)
+            defined?(@service) && @service.is_a?(NewRelic::Agent::PipeService)
           end
 
           # Sanity-check the agent configuration and start the agent,

data/lib/new_relic/agent/audit_logger.rb

@@ -13,6 +13,7 @@ module NewRelic
         @enabled = NewRelic::Agent.config[:'audit_log.enabled']
         @endpoints = NewRelic::Agent.config[:'audit_log.endpoints']
         @encoder = NewRelic::Agent::NewRelicService::Encoders::Identity
+        @log = nil
       end
 
       attr_writer :enabled

data/lib/new_relic/agent/commands/thread_profiler_session.rb

@@ -16,6 +16,7 @@ module NewRelic
           @backtrace_service = backtrace_service
           @started_at = nil
           @finished_profile = nil
+          @profile = nil
         end
 
         def handle_start_command(agent_command)

data/lib/new_relic/agent/configuration/default_source.rb

@@ -1326,6 +1326,14 @@ module NewRelic
           :allowed_from_server => false,
           :description  => 'If <code>true</code>, the agent won\'t install instrumentation for the typhoeus gem.'
         },
+        :disable_httprb => {
+          :default      => false,
+          :public       => true,
+          :type         => Boolean,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description  => 'If <code>true</code>, the agent won\'t install instrumentation for the http.rb gem.'
+        },
         :disable_middleware_instrumentation => {
           :default      => false,
           :public       => true,

data/lib/new_relic/agent/configuration/manager.rb

@@ -245,7 +245,7 @@ module NewRelic
         end
 
         def break_label_string_into_pairs(labels)
-          stripped_labels = labels.strip
+          stripped_labels = labels.strip.sub(/^;*/,'').sub(/;*$/,'')
           stripped_labels.split(';').map do |pair|
             pair.split(':').map(&:strip)
           end

data/lib/new_relic/agent/error_collector.rb

@@ -196,7 +196,11 @@ module NewRelic
         tag_exception(exception)
 
         state = ::NewRelic::Agent::TransactionState.tl_get
-        increment_error_count!(state, exception, options)
+
+        unless options.delete(:trace_only)
+          increment_error_count!(state, exception, options)
+        end
+
         noticed_error = create_noticed_error(exception, options)
         error_trace_aggregator.add_to_error_queue(noticed_error)
         payload = state.current_transaction ? state.current_transaction.payload : nil

data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb

@@ -0,0 +1,59 @@
+# 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.
+
+module NewRelic
+  module Agent
+    module HTTPClients
+      class HTTPResponse
+        attr_reader :response
+
+        def initialize(response)
+          @response = response
+        end
+
+        def [](key)
+          _, value = response.headers.find { |k,_| key.downcase == k.downcase }
+          value unless value.nil?
+        end
+
+        def to_hash
+          response.headers
+        end
+      end
+
+      class HTTPRequest
+        attr_reader :request, :uri
+
+        def initialize(request)
+          @request = request
+          @uri = request.uri
+        end
+
+        def type
+          "http.rb"
+        end
+
+        def host
+          if hostname = self['host']
+            hostname.split(':').first
+          else
+            request.host
+          end
+        end
+
+        def method
+          request.verb.upcase
+        end
+
+        def [](key)
+          request.headers[key]
+        end
+
+        def []=(key, value)
+          request.headers[key] = value
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/controller_instrumentation.rb

@@ -99,7 +99,7 @@ module NewRelic
           end
 
           def newrelic_read_attr(attr_name) # :nodoc:
-            instance_variable_get(attr_name)
+            instance_variable_get(attr_name) if instance_variable_defined?(attr_name)
           end
 
           # Add transaction tracing to the given method.  This will treat

data/lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb

@@ -97,7 +97,9 @@ DependencyDetection.defer do
                       end
         NewRelic::DelayedJobInjection.worker_name = worker_name
 
-        if defined?(::Delayed::Job) && ::Delayed::Job.method_defined?(:invoke_job)
+        if defined?(::Delayed::Job) && ::Delayed::Job.method_defined?(:invoke_job) &&
+          !(::Delayed::Job.method_defined?(:invoke_job_without_new_relic) )
+
           ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation [part 2/2]'
           install_newrelic_job_tracer
           NewRelic::Control.instance.init_plugin :dispatcher => :delayed_job

data/lib/new_relic/agent/instrumentation/http.rb

@@ -0,0 +1,36 @@
+# 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.
+
+DependencyDetection.defer do
+  named :httprb
+
+  depends_on do
+    defined?(HTTP) && defined?(HTTP::Client)
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing http.rb instrumentation'
+    require 'new_relic/agent/cross_app_tracing'
+    require 'new_relic/agent/http_clients/http_rb_wrappers'
+  end
+
+  executes do
+    class HTTP::Client
+      def perform_with_newrelic_trace(request, options)
+        wrapped_request = ::NewRelic::Agent::HTTPClients::HTTPRequest.new(request)
+
+        response = nil
+        ::NewRelic::Agent::CrossAppTracing.tl_trace_http_request(wrapped_request) do
+          response = perform_without_newrelic_trace(request, options)
+          ::NewRelic::Agent::HTTPClients::HTTPResponse.new(response)
+        end
+
+        response
+      end
+
+      alias perform_without_newrelic_trace perform
+      alias perform perform_with_newrelic_trace
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/rack.rb

@@ -79,7 +79,7 @@ module NewRelic
         end
 
         def self.check_for_late_instrumentation(app)
-          return if @checked_for_late_instrumentation
+          return if defined?(@checked_for_late_instrumentation) && @checked_for_late_instrumentation
           @checked_for_late_instrumentation = true
           if middleware_instrumentation_enabled?
             if ::NewRelic::Agent::Instrumentation::MiddlewareProxy.needs_wrapping?(app)

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

@@ -31,6 +31,7 @@ module NewRelic
               output.set_encoding BINARY
               gz = Zlib::GzipWriter.new(output, Zlib::DEFAULT_COMPRESSION, Zlib::DEFAULT_STRATEGY)
               gz.write(data)
+              gz.close
               output.rewind
               output.string
             end

data/lib/new_relic/agent/pipe_channel_manager.rb

@@ -139,6 +139,7 @@ module NewRelic
         attr_accessor :pipes, :timeout, :select_timeout
 
         def initialize
+          @started = nil
           @pipes = {}
           @pipes_lock = Mutex.new
 

data/lib/new_relic/agent/sampler.rb

@@ -19,12 +19,12 @@ module NewRelic
       attr_reader :id
       @sampler_classes = []
 
-      def self.named(new_name)
-        @name = new_name
+      class << self
+        attr_reader :shorthand_name
       end
 
-      def self.name
-        @name
+      def self.named(new_name)
+        @shorthand_name = new_name
       end
 
       def self.inherited(subclass)
@@ -37,8 +37,8 @@ module NewRelic
       end
 
       def self.enabled?
-        if @name
-          config_key = "disable_#{@name}_sampler"
+        if shorthand_name
+          config_key = "disable_#{shorthand_name}_sampler"
           !(Agent.config[config_key])
         else
           true
@@ -53,7 +53,7 @@ module NewRelic
       # we have clients who are defining their own subclasses of this class, and
       # expecting to be able to call super with an ID.
       def initialize(id=nil)
-        @id = id || self.class.name
+        @id = id || self.class.shorthand_name
       end
 
       def poll

data/lib/new_relic/agent/samplers/memory_sampler.rb

@@ -14,6 +14,8 @@ module NewRelic
         attr_accessor :sampler
 
         def initialize
+          @sampler = nil
+
           # macos, linux, solaris
           if defined? JRuby
             @sampler = JavaHeapSampler.new

data/lib/new_relic/agent/supported_versions.rb

@@ -23,7 +23,7 @@ module NewRelic
       {
         :type        => :ruby,
         :name        => "JRuby",
-        :supported   => ["~> 1.6.0", "~> 1.7.0", "~> 9.0"],
+        :supported   => ["~> 1.7.0", "~> 9.0", "~> 9.1"],
         :url         => "http://jruby.org",
         :feed        => "http://jruby.org/atom.xml"
       },
@@ -229,6 +229,13 @@ module NewRelic
           "Supported for all agent-supported versions of Ruby.",
           "For more information on supported HTTP clients see http://docs.newrelic.com/docs/ruby/ruby-http-clients."]
       },
+      :httprb =>
+      {
+        :type        => :http,
+        :supported   => [ ">= 0.9.9"],
+        :url         => "https://rubygems.org/gems/http",
+        :feed        => "https://rubygems.org/gems/http/versions.atom"
+      },
 
       # Other
       :sunspot =>