newrelic_rpm 6.9.0.363 → 6.10.0.364

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb269d5c36e6139c7b617d3083418a8c8acf85e94c4f1005b1241aafc9471dd
-  data.tar.gz: da6387b811e5402cd2a0da7b80acc5b88338768cf36e01b1c86d7576c2592f3d
+  metadata.gz: 7e5ab7fd3bb77356673eb2437785714e3935f9bbc9a763254425166753470f79
+  data.tar.gz: a0a8b207924ef308a1105783cfa373ca77ca91deeb046cdea632d48afe9e9906
 SHA512:
-  metadata.gz: 077d136a9c8e3771f506ee67422983ae4782e23b9118e9cb070f35fdf3af7b8a9d9ed125725db34945d8195529c0c22bbde0a7ab313d1fae9488485e40f7398d
-  data.tar.gz: c577d7a04fac1e22f043156635d4d2eeb3674707a2f50f7b11756855f4b4ae7e3479a6783d45decdc1a4950ce2b69e8d1d691bad6ebe67b504b098838fa6c86f
+  metadata.gz: cf2e4fc7fb9c35dd2d1392a9b47e3dea5c908230d59b616eb51d8f544560e736e9ac7256419c51751ee24627d1bf291f190f1bb8a3bf75436152ebba340b21ba
+  data.tar.gz: 1a29679d374d033b649cfa5966aad2127374de42f0527bbdc4091ff8c73f061a0df0b6049561eec2c4fe4af752329a139a9e2764e910943d315b5137d2cd93ea

data/.travis.yml

@@ -4,6 +4,10 @@ services:
   - memcached
   - rabbitmq
 
+notifications:
+  slack:
+    secure: Ziq6vzXmc1S+SZnJF7DyjprRgzZKvVK5TXtnNJAoH4EFchziCqko+75hMxDZ/6Y2kShcijgbzZSkIIVSiuYyx0Jgxdsmwed7yrs91uv2WsUw2/l+taOTBIAMa/m9PZppsRqmkywxWeeTPL6cf65Vg3PYRuqzj83nczUFJo4UNrA=
+
 language: ruby
 
 dist: precise
@@ -78,6 +82,7 @@ env:
     - TYPE=UNIT ENVIRONMENT=rails42
     - TYPE=UNIT ENVIRONMENT=rails50
     - TYPE=UNIT ENVIRONMENT=rails51
+    - TYPE=UNIT ENVIRONMENT=rails52
     - TYPE=UNIT ENVIRONMENT=rails60
     - TYPE=UNIT ENVIRONMENT=norails
     - TYPE=FUNCTIONAL GROUP=agent
@@ -117,6 +122,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50  # rails (= 5.0.0) depends on bundler (< 2.0, >= 1.3.0)
     - rvm: 2.7.0
       env: TYPE=UNIT ENVIRONMENT=rails51  # rails (= 5.1.0) depends on bundler (< 2.0, >= 1.3.0)
+    - rvm: 2.7.0
+      env: TYPE=UNIT ENVIRONMENT=rails52  # rails (= 5.2.0) depends on bundler (< 2.0, >= 1.3.0)
     - rvm: 2.7.0
       env: TYPE=FUNCTIONAL GROUP=api      # blocked: https://github.com/solnic/coercible/issues/27
     - rvm: 2.7.0
@@ -128,6 +135,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50  # rails (= 5.0.0) depends on bundler (< 2.0, >= 1.3.0)
     - rvm: 2.7.0
       env: TYPE=UNIT ENVIRONMENT=rails51  # rails (= 5.1.0) depends on bundler (< 2.0, >= 1.3.0)
+    - rvm: 2.7.0
+      env: TYPE=UNIT ENVIRONMENT=rails52  # rails (= 5.2.0) depends on bundler (< 2.0, >= 1.3.0)
     - rvm: 2.7.0
       env: TYPE=FUNCTIONAL GROUP=api      # blocked: https://github.com/solnic/coercible/issues/27
     - rvm: 2.7.0
@@ -184,6 +193,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50
     - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails51
+    - rvm: 2.1.10
+      env: TYPE=UNIT ENVIRONMENT=rails52
     - rvm: 2.1.10
       env: TYPE=UNIT ENVIRONMENT=rails60
 
@@ -192,6 +203,8 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails50
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails51
+    - rvm: 2.0.0-p648
+      env: TYPE=UNIT ENVIRONMENT=rails52
     - rvm: 2.0.0-p648
       env: TYPE=UNIT ENVIRONMENT=rails60
 
@@ -208,3 +221,5 @@ matrix:
       env: TYPE=UNIT ENVIRONMENT=rails41
     - rvm: jruby-9.2.6.0
       env: TYPE=UNIT ENVIRONMENT=rails60
+    - rvm: jruby-9.2.6.0
+      env: TYPE=UNIT ENVIRONMENT=rails52

data/CHANGELOG.md

@@ -1,5 +1,59 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v6.10.0
+
+  * **Error attributes now added to each span that exits with an error or exception**
+
+    Error attributes `error.class` and `error.message` are now included on the span event in which an error
+    or exception was noticed, and, in the case of unhandled exceptions, on any ancestor spans that also exit with an error.
+    The public API method `notice_error` now attaches these error attributes to the currently executing span.
+
+    <a href="https://docs.newrelic.com/docs/apm/distributed-tracing/ui-data/understand-use-distributed-tracing-data#rules-limits">Spans with error details are now highlighted red in the Distributed Tracing UI</a>, and error details will expose the associated
+    `error.class` and `error.message`.  It is also now possible to see when an exception leaves the boundary of the span,
+    and if it is caught in an ancestor span without reaching the entry span. NOTE: This “bubbling up” of exceptions will impact
+    the error count when compared to prior behavior for the same trace. It is possible to have a trace that now has span errors
+    without the trace level showing an error.
+
+    If multiple errors occur on the same span, only the most recent error information is added to the attributes. Prior errors on the same span are overwritten.
+
+    These span event attributes conform to <a href="https://docs.newrelic.com/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected#ignore">ignored errors</a> and <a href="https://docs.newrelic.com/docs/agents/manage-apm-agents/agent-data/manage-errors-apm-collect-ignore-or-mark-expected#expected">expected errors</a>.
+
+  * **Added tests for latest Grape / Rack combination**
+
+    For a short period of time, the latest versions of Grape and Rack had compatibility issues.
+    Generally, Rack 2.1.0 should be avoided in all cases due to breaking changes in many gems
+    reliant on Rack. We recommend using either Rack <= 2.0.9, or using latest Rack when using Grape
+    (2.2.2 at the time of this writing).
+
+  * **Bugfix: Calculate Content-Length in bytes**
+
+    Previously, the Content-Length HTTP header would be incorrect after injecting the Browser Monitoring
+    JS when the response contained Unicode characters because the value was not calculated in bytes.
+    The Content-Length is now correctly updated.
+
+    Thanks to thaim for the contribution!
+
+  * **Bugfix: Fix Content-Length calculation when response is nil**
+
+    Previously, calculating the Content-Length HTTP header would result in a `NoMethodError` in the case of
+    a nil response. These errors will no longer occur in such a case.
+
+    Thanks to Johan Van Ryseghem for the contribution!
+
+  * **Bugfix: DecoratingFormatter now logs timestamps as millisecond Integers**
+
+    Previously the agent sent timestamps as a Float with milliseconds as part of the
+    fractional value.  Logs in Context was changed to only accept Integer values and this
+    release changes DecoratingFormatter to match.
+
+  * **Added --force option to `newrelic install` cli command to allow overwriting newrelic.yml**
+
+  * **Bugfix: The fully qualified hostname now works correctly for BSD and Solaris**
+
+    Previously, when running on systems such as BSD and Solaris, the agent was unable to determine the fully
+    qualified domain name, which is used to help link Ruby agent data with data from New Relic Infrastructure.
+    This information is now successfully collected on various BSD distros and Solaris.
+
   ## v6.9.0
 
   * **Added support for W3C Trace Context, with easy upgrade from New Relic trace context**
@@ -34,7 +88,7 @@
 
     Known Issues and Workarounds
 
-    * If a .NET agent is initiating traces as the root service, do not upgrade your 
+    * If a .NET agent is initiating traces as the root service, do not upgrade your
       downstream Ruby New Relic agents to this agent release.
 
   * **Official Ruby 2.7 support**
@@ -43,10 +97,10 @@
 
   * **Reduced allocations when tracing transactions using API calls**
 
-    Default empty hashes for `options` parameter were not frozen, leading to 
+    Default empty hashes for `options` parameter were not frozen, leading to
     excessive and unnecessary allocations when calling APIs for tracing transactions.
 
-    Thanks to Joel Turkel (jturkel) for the contribution! 
+    Thanks to Joel Turkel (jturkel) for the contribution!
 
   * **Bugfix for Resque worker thread race conditions**
 
@@ -56,10 +110,10 @@
     Thanks to Bertrand Paquet (bpaquet) for the contribution!
 
   * **Bugfix for Content-Length when injecting Browser Monitoring JS**
-    
+
     The Content-Length HTTP header would be incorrect after injecting the Browser Monitoring
     JS into the HEAD tag of the HTML source with Content-Length and lead to the HTML BODY content
-    being truncated in some cases.  The Content-Length is now correctly updated after injecting the 
+    being truncated in some cases.  The Content-Length is now correctly updated after injecting the
     Browser Monitoring JS script.
 
     Thanks to Slava Kardakov (ojab) for the contribution!

data/lib/new_relic/agent.rb

@@ -30,6 +30,7 @@ module NewRelic
     require 'new_relic/metric_spec'
     require 'new_relic/metric_data'
     require 'new_relic/noticed_error'
+    require 'new_relic/agent/noticible_error'
     require 'new_relic/supportability_helper'
 
     require 'new_relic/agent/encoding_normalizer'
@@ -671,8 +672,8 @@ module NewRelic
     # @param [String] method the name of the finder method or other method to
     # identify the operation with.
     #
-    def with_database_metric_name(model, method = nil, product = nil, &block) #THREAD_LOCAL_ACCESS
-      if txn = Transaction.tl_current
+    def with_database_metric_name(model, method = nil, product = nil, &block)
+      if txn = Tracer.current_transaction
         txn.with_database_metric_name(model, method, product, &block)
       else
         yield

data/lib/new_relic/agent/agent.rb

@@ -134,7 +134,7 @@ module NewRelic
         # and request before/after from Rack.
         attr_reader :events
 
-        # listens and responds to events that need to process headers 
+        # listens and responds to events that need to process headers
         # for synthetics and distributed tracing
         attr_reader :monitors
         # Transaction and metric renaming rules as provided by the
@@ -249,7 +249,7 @@ module NewRelic
           # Wait the end of the event loop thread.
           if @worker_thread
             unless @worker_thread.join(3)
-              ::NewRelic::Agent.logger.error "Event loop thread did not stop within 3 seconds"
+              ::NewRelic::Agent.logger.debug "Event loop thread did not stop within 3 seconds"
             end
           end
         end

data/lib/new_relic/agent/datastores/mongo.rb

@@ -12,7 +12,7 @@ module NewRelic
         end
 
         def self.is_monitoring_enabled?
-          defined?(::Mongo::Monitoring)
+          defined?(::Mongo::Monitoring) # @since 2.1.0
         end
 
         def self.is_unsupported_2x?

data/lib/new_relic/agent/distributed_tracing/trace_context_payload.rb

@@ -117,7 +117,7 @@ module NewRelic
         result << DELIMITER << (id || NewRelic::EMPTY_STR)
         result << DELIMITER << (transaction_id || NewRelic::EMPTY_STR)
         result << DELIMITER << (sampled ? TRUE_CHAR : FALSE_CHAR)
-        result << DELIMITER << priority.to_s
+        result << DELIMITER << sprintf("%.6f", priority)
         result << DELIMITER << timestamp.to_s
         result
       end

data/lib/new_relic/agent/error_collector.rb

@@ -32,7 +32,6 @@ module NewRelic
         end
       end
 
-
       def initialize_ignored_errors(ignore_errors)
         @ignore.clear
         ignore_errors = ignore_errors.split(",") if ignore_errors.is_a? String
@@ -117,14 +116,22 @@ module NewRelic
         NewRelic::LanguageSupport.jruby? && exception.respond_to?(:java_class)
       end
 
-      def exception_tagged?(exception)
+      def exception_tagged_with?(ivar, exception)
         return false if exception_is_java_object?(exception)
-        exception.instance_variable_defined?(EXCEPTION_TAG_IVAR)
+        exception.instance_variable_defined?(ivar)
+      end
+
+      def tag_exception_using(ivar, exception)
+        return if exception_is_java_object?(exception) || exception.frozen?
+        begin
+          exception.instance_variable_set(ivar, true)
+        rescue => e
+          NewRelic::Agent.logger.warn("Failed to tag exception: #{exception}: ", e)
+        end
       end
 
       def tag_exception(exception)
-        return if exception_is_java_object?(exception)
-        return if exception.frozen?
+        return if exception_is_java_object?(exception) || exception.frozen?
         begin
           exception.instance_variable_set(EXCEPTION_TAG_IVAR, true)
         rescue => e
@@ -169,9 +176,9 @@ module NewRelic
 
       def skip_notice_error?(exception)
         disabled? ||
-          error_is_ignored?(exception) ||
-          exception.nil? ||
-          exception_tagged?(exception)
+        error_is_ignored?(exception) ||
+        exception.nil? ||
+        exception_tagged_with?(EXCEPTION_TAG_IVAR, exception)
       end
 
       # calls a method on an object, if it responds to it - used for
@@ -191,8 +198,18 @@ module NewRelic
         sense_method(actual_exception, :backtrace) || '<no stack trace>'
       end
 
+      def notice_segment_error(segment, exception, options={})
+        return if skip_notice_error?(exception)
+
+        segment.set_noticed_error create_noticed_error(exception, options)
+        exception
+      rescue => e
+        ::NewRelic::Agent.logger.warn("Failure when capturing segment error '#{exception}':", e)
+        nil
+      end
+
       # See NewRelic::Agent.notice_error for options and commentary
-      def notice_error(exception, options={}) #THREAD_LOCAL_ACCESS
+      def notice_error(exception, options={}, span_id=nil)
         return if skip_notice_error?(exception)
 
         tag_exception(exception)
@@ -205,8 +222,10 @@ module NewRelic
 
         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
-        error_event_aggregator.record(noticed_error, payload)
+        transaction = state.current_transaction
+        payload = transaction ? transaction.payload : nil
+        span_id ||= (transaction && transaction.current_segment) ? transaction.current_segment.guid : nil
+        error_event_aggregator.record(noticed_error, payload, span_id)
         exception
       rescue => e
         ::NewRelic::Agent.logger.warn("Failure when capturing error '#{exception}':", e)

data/lib/new_relic/agent/error_event_aggregator.rb

@@ -19,14 +19,14 @@ module NewRelic
                    :'error_collector.capture_events'
       buffer_class PrioritySampledBuffer
 
-      def record noticed_error, transaction_payload = nil
+      def record noticed_error, transaction_payload = nil, span_id = nil
         return unless enabled?
 
         priority = float!((transaction_payload && transaction_payload[:priority]) || rand)
 
         @lock.synchronize do
           @buffer.append(priority: priority) do
-            create_event(noticed_error, transaction_payload)
+            create_event(noticed_error, transaction_payload, span_id)
           end
           notify_if_full
         end
@@ -34,8 +34,8 @@ module NewRelic
 
       private
 
-      def create_event noticed_error, transaction_payload
-        TransactionErrorPrimitive.create noticed_error, transaction_payload
+      def create_event noticed_error, transaction_payload, span_id
+        TransactionErrorPrimitive.create noticed_error, transaction_payload, span_id
       end
     end
   end

data/lib/new_relic/agent/hostname.rb

@@ -17,8 +17,14 @@ module NewRelic
         end
       end
 
+      # calling hostname with -f on some OS's (NetBSD, FreeBSD, Solaris)
+      # produces invalid option error, but doesn't raise exception.  Instead,
+      # we get back empty string.  So, solution here is to check for non-zero 
+      # exit status and retry the command without the -f flag.
       def self.get_fqdn
-        %x[hostname -f].chomp!
+        fqdn = %x[hostname -f].chomp!
+        fqdn = %x[hostname].chomp! unless $?.exitstatus.zero?
+        fqdn
       rescue => e
         NewRelic::Agent.logger.debug "Unable to determine fqdn #{e}"
         nil

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

@@ -0,0 +1,82 @@
+# 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.
+# frozen_string_literal: true
+
+module NewRelic
+  module Agent
+    module HTTPClients
+      MUST_IMPLEMENT_ERROR = "Subclasses of %s must implement a :%s method"
+      WHINY_NIL_ERROR = "%s cannot initialize with a nil wrapped_response object."
+
+      # This class provides a public interface for wrapping HTTP requests. This
+      # may be used to create wrappers that are compatible with New Relic's
+      # external request API.
+      #
+      # @api public
+      class AbstractRequest
+
+        def []
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def []=
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def type
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def host_from_header
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def host
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+
+        def method
+          raise NotImplementedError, MUST_IMPLEMENT_ERROR % [self.class, __method__]
+        end
+      end
+
+      # This class implements the adaptor pattern and is used internally provide 
+      # uniform access to the underlying HTTP Client's response object
+      # NOTE: response_object should be non-nil!
+      class AbstractResponse # :nodoc:
+
+        def initialize wrapped_response
+          if wrapped_response.nil? 
+            raise ArgumentError, WHINY_NIL_ERROR % self.class
+          end
+          @wrapped_response = wrapped_response
+        end
+
+        def has_status_code?
+          !!status_code
+        end
+
+        # most HTTP client libraries report the HTTP status code as an integer, so 
+        # we expect status_code to be set only if a non-zero value is present
+        def status_code
+          @status_code ||= get_status_code
+        end
+
+        private 
+
+        def get_status_code_using method_name
+          return unless @wrapped_response.respond_to?(method_name)
+          code = @wrapped_response.send(method_name).to_i
+          code == 0 ? nil : code
+        end
+
+        # Override this method to memoize a non-zero Integer representation 
+        # of HTTP status code from the response object
+        def get_status_code
+          get_status_code_using :code
+        end
+      end
+    end
+  end
+end

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

@@ -1,19 +1,20 @@
 # 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.
+# frozen_string_literal: true
 
-require 'new_relic/agent/http_clients/abstract_request'
+require_relative 'abstract'
 
 module NewRelic
   module Agent
     module HTTPClients
 
       class CurbRequest
-        CURB = 'Curb'.freeze
-        LHOST = 'host'.freeze
-        UHOST = 'Host'.freeze
+        CURB = 'Curb'
+        LHOST = 'host'
+        UHOST = 'Host'
 
-        def initialize( curlobj )
+        def initialize curlobj
           @curlobj = curlobj
         end
 
@@ -34,41 +35,45 @@ module NewRelic
         end
 
         def []( key )
-          @curlobj.headers[ key ]
+          @curlobj.headers[key]
         end
 
-        def []=( key, value )
-          @curlobj.headers[ key ] = value
+        def []=(key, value)
+          @curlobj.headers[key] = value
         end
 
         def uri
-          @uri ||= NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@curlobj.url)
+          @uri ||= URIUtil.parse_and_normalize_url(@curlobj.url)
         end
       end
 
+      class CurbResponse < AbstractResponse
 
-      class CurbResponse < AbstractRequest
-
-        def initialize(curlobj)
+        def initialize wrapped_response
+          super wrapped_response
           @headers = {}
-          @curlobj = curlobj
         end
 
         def [](key)
-          @headers[ key.downcase ]
+          @headers[key.downcase]
         end
 
         def to_hash
           @headers.dup
         end
 
-        def append_header_data( data )
-          key, value = data.split( /:\s*/, 2 )
-          @headers[ key.downcase ] = value
-          @curlobj._nr_header_str ||= ''
-          @curlobj._nr_header_str << data
+        def append_header_data data
+          key, value = data.split(/:\s*/, 2)
+          @headers[key.downcase] = value
+          @wrapped_response._nr_header_str ||= String.new
+          @wrapped_response._nr_header_str << data
         end
 
+        private
+
+        def get_status_code
+          get_status_code_using :response_code
+        end
       end
 
     end