newrelic_rpm 6.6.0.358 → 6.11.0

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -1,6 +1,7 @@
 # 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
 
 # This module was introduced and largely extracted from the transaction event aggregator
 # when the synthetics container was extracted from it. Its purpose is to create the data
@@ -8,7 +9,7 @@
 # the transaction event aggregator and the synthetics container.
 
 require 'new_relic/agent/payload_metric_mapping'
-require 'new_relic/agent/distributed_trace_payload'
+require 'new_relic/agent/distributed_tracing/distributed_trace_intrinsics'
 
 module NewRelic
   module Agent
@@ -16,30 +17,28 @@ module NewRelic
       include NewRelic::Coerce
       extend self
 
+      COMMA = ','
+
       # The type field of the sample
-      SAMPLE_TYPE              = 'Transaction'.freeze
+      SAMPLE_TYPE              = 'Transaction'
 
       # Strings for static keys of the sample structure
-      TYPE_KEY                       = 'type'.freeze
-      TIMESTAMP_KEY                  = 'timestamp'.freeze
-      NAME_KEY                       = 'name'.freeze
-      DURATION_KEY                   = 'duration'.freeze
-      ERROR_KEY                      = 'error'.freeze
-      SAMPLED_KEY                    = 'sampled'.freeze
-      PRIORITY_KEY                   = 'priority'.freeze
-      GUID_KEY                       = 'nr.guid'.freeze
-      REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
-      CAT_PATH_HASH_KEY              = 'nr.pathHash'.freeze
-      CAT_REFERRING_PATH_HASH_KEY    = 'nr.referringPathHash'.freeze
-      CAT_ALTERNATE_PATH_HASHES_KEY  = 'nr.alternatePathHashes'.freeze
-      APDEX_PERF_ZONE_KEY            = 'nr.apdexPerfZone'.freeze
-      SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId".freeze
-      SYNTHETICS_JOB_ID_KEY          = "nr.syntheticsJobId".freeze
-      SYNTHETICS_MONITOR_ID_KEY      = "nr.syntheticsMonitorId".freeze
-
-
-      # To avoid allocations when we have empty custom or agent attributes
-      EMPTY_HASH = {}.freeze
+      TYPE_KEY                       = 'type'
+      TIMESTAMP_KEY                  = 'timestamp'
+      NAME_KEY                       = 'name'
+      DURATION_KEY                   = 'duration'
+      ERROR_KEY                      = 'error'
+      SAMPLED_KEY                    = 'sampled'
+      PRIORITY_KEY                   = 'priority'
+      GUID_KEY                       = 'nr.guid'
+      REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
+      CAT_PATH_HASH_KEY              = 'nr.pathHash'
+      CAT_REFERRING_PATH_HASH_KEY    = 'nr.referringPathHash'
+      CAT_ALTERNATE_PATH_HASHES_KEY  = 'nr.alternatePathHashes'
+      APDEX_PERF_ZONE_KEY            = 'nr.apdexPerfZone'
+      SYNTHETICS_RESOURCE_ID_KEY     = "nr.syntheticsResourceId"
+      SYNTHETICS_JOB_ID_KEY          = "nr.syntheticsJobId"
+      SYNTHETICS_MONITOR_ID_KEY      = "nr.syntheticsMonitorId"
 
       def create(payload)
         intrinsics = {
@@ -51,11 +50,11 @@ module NewRelic
         PRIORITY_KEY  => payload[:priority]
         }
 
-        intrinsics[SAMPLED_KEY] = payload[:'sampled'] if Agent.config[:'distributed_tracing.enabled']
+        intrinsics[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
 
-        NewRelic::Agent::PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
+        PayloadMetricMapping.append_mapped_metrics(payload[:metrics], intrinsics)
         append_optional_attributes(intrinsics, payload)
-        append_distributed_trace_intrinsics(intrinsics, payload)
+        DistributedTraceIntrinsics.copy_to_hash payload, intrinsics
 
         attributes = payload[:attributes]
 
@@ -76,22 +75,12 @@ module NewRelic
         append_cat_alternate_path_hashes(sample, payload)
       end
 
-      COMMA = ','.freeze
-
       def append_cat_alternate_path_hashes(sample, payload)
         if payload.include?(:cat_alternate_path_hashes)
           sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
         end
       end
 
-      def append_distributed_trace_intrinsics(sample, payload)
-        return unless Agent.config[:'distributed_tracing.enabled']
-        DistributedTracePayload::INTRINSIC_KEYS.each do |key|
-          value = payload[key]
-          sample[key] = value unless value.nil?
-        end
-      end
-
       def optionally_append(sample_key, payload_key, sample, payload)
         if payload.include?(payload_key)
           sample[sample_key] = string(payload[payload_key])
@@ -100,19 +89,19 @@ module NewRelic
 
       def custom_attributes attributes
         if attributes
-          result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS)
+          result = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
           result.freeze
         else
-          EMPTY_HASH
+          NewRelic::EMPTY_HASH
         end
       end
 
       def agent_attributes attributes
         if attributes
-          result = attributes.agent_attributes_for(NewRelic::Agent::AttributeFilter::DST_TRANSACTION_EVENTS)
+          result = attributes.agent_attributes_for(AttributeFilter::DST_TRANSACTION_EVENTS)
           result.freeze
         else
-          EMPTY_HASH
+          NewRelic::EMPTY_HASH
         end
       end
     end

data/lib/new_relic/cli/commands/deployments.rb

@@ -39,7 +39,7 @@ class NewRelic::Cli::Deployments < NewRelic::Cli::Command
     control.env = @environment if @environment
 
     load_yaml_from_env(control.env)
-    @appname ||= NewRelic::Agent.config.app_names[0] || control.env || 'development'
+    @appname ||= NewRelic::Agent.config[:app_name][0] || control.env || 'development'
     @license_key ||= NewRelic::Agent.config[:license_key]
 
     setup_logging(control.env)

data/lib/new_relic/cli/commands/install.rb

@@ -40,8 +40,8 @@ class NewRelic::Cli::Install < NewRelic::Cli::Command
 
   def run
     dest_file = File.expand_path(@dest_dir + "/newrelic.yml")
-    if File.exist?(dest_file)
-      raise NewRelic::Cli::Command::CommandFailure, "newrelic.yml file already exists.  Move it out of the way."
+    if File.exist?(dest_file) && !@force
+      raise NewRelic::Cli::Command::CommandFailure, "newrelic.yml file already exists.  Use --force flag to overwrite."
     end
     File.open(dest_file, 'w') { | out | out.puts(content) }
 
@@ -73,6 +73,7 @@ Visit support.newrelic.com if you are experiencing installation issues.
 
   def options
     OptionParser.new "Usage: #{$0} #{self.class.command} [ OPTIONS] 'application name'", 40 do |o|
+      o.on("-f", "--force", "Overwrite newrelic.yml if it exists") { | e | @force = true }
       o.on("-l", "--license_key=NAME", String,
              "Use the given license key") { | e | @license_key = e }
       o.on("-d", "--destdir=name", String,

data/lib/new_relic/coerce.rb

@@ -1,17 +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
 
 module NewRelic
-  # We really don't want to send bad values to the collector, and it doesn't
-  # accept types like Rational that have occasionally slipped into our data.
-  #
-  # These methods are intended to safely coerce things into the form we want,
-  # to provide documentation of expected types on to_collector_array methods,
-  # and to log failures if totally invalid data gets into outgoing data
   module Coerce
+
     module_function
 
+    # We really don't want to send bad values to the collector, and it doesn't
+    # accept types like Rational that have occasionally slipped into our data.
+    #
+    # These non-bang methods are intended to safely coerce things into the form we want,
+    # to provide documentation of expected types on to_collector_array methods,
+    # and to log failures if totally invalid data gets into outgoing data
+
     def int(value, context=nil)
       Integer(value)
     rescue => error
@@ -61,6 +64,28 @@ module NewRelic
       end
     end
 
+    def int! value
+      return nil unless value_or_nil(value)
+      Integer(value)
+    end
+
+    # Use when you plan to perform a boolean check using the integer 1
+    # for true and the integer 0 for false
+    # String values will be converted to 0
+    def boolean_int! value
+      value.to_i
+    end
+
+    def float! value, precision=NewRelic::PRIORITY_PRECISION
+      return nil unless value_or_nil(value)
+      value.to_f.round(precision)
+    end
+
+    def value_or_nil value
+      return nil if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+      value
+    end
+
     def log_failure(value, type, context, error)
       msg = "Unable to convert '#{value}' to #{type}"
       msg += " in context '#{context}'" if context

data/lib/new_relic/constants.rb

@@ -0,0 +1,34 @@
+# 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
+  PRIORITY_PRECISION = 6
+
+  EMPTY_ARRAY = [].freeze
+  EMPTY_HASH = {}.freeze
+  EMPTY_STR = ""
+
+  HTTP = "HTTP"
+  HTTPS = "HTTPS"
+  UNKNOWN = "Unknown"
+
+  FORMAT_NON_RACK = 0
+  FORMAT_RACK = 1
+
+  NEWRELIC_KEY = "newrelic"
+  CANDIDATE_NEWRELIC_KEYS = [
+    NEWRELIC_KEY,
+    'NEWRELIC',
+    'NewRelic',
+    'Newrelic'
+  ].freeze
+
+  TRACEPARENT_KEY = "traceparent"
+  TRACESTATE_KEY = "tracestate"
+
+  HTTP_TRACEPARENT_KEY = "HTTP_#{TRACEPARENT_KEY.upcase}"
+  HTTP_TRACESTATE_KEY = "HTTP_#{TRACESTATE_KEY.upcase}"
+  HTTP_NEWRELIC_KEY = "HTTP_#{NEWRELIC_KEY.upcase}"
+end

data/lib/new_relic/control/instance_methods.rb

@@ -101,7 +101,13 @@ module NewRelic
         Agent.config.replace_or_add_config(manual)
 
         config_file_path = @config_file_override || Agent.config[:config_path]
-        Agent.config.replace_or_add_config(Agent::Configuration::YamlSource.new(config_file_path, env))
+        yaml_source = Agent::Configuration::YamlSource.new(config_file_path, env)
+        if yaml_source.failed?
+          yaml_source.failures.each do |msg|
+            stdout.puts Agent::AgentLogger.format_fatal_error(msg)
+          end
+        end
+        Agent.config.replace_or_add_config(yaml_source)
 
         if security_settings_valid? && Agent.config[:high_security]
           Agent.logger.info("Installing high security configuration based on local configuration")
@@ -172,6 +178,9 @@ module NewRelic
         '.'
       end
 
+      def stdout
+        STDOUT
+      end
     end
     include InstanceMethods
   end

data/lib/new_relic/dependency_detection.rb

@@ -93,8 +93,8 @@ module DependencyDetection
       end
     end
 
-    def depends_on
-      @dependencies << Proc.new
+    def depends_on &block
+      @dependencies << block if block_given?
     end
 
     def allowed_by_config?
@@ -114,8 +114,8 @@ module DependencyDetection
       self.name = new_name
     end
 
-    def executes
-      @executes << Proc.new
+    def executes &block
+      @executes << block if block_given?
     end
   end
 end

data/lib/new_relic/noticed_error.rb

@@ -1,6 +1,7 @@
 # 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/helper'
 require 'new_relic/agent/attribute_filter'
@@ -17,9 +18,20 @@ class NewRelic::NoticedError
 
   attr_reader   :exception_id, :is_internal
 
-  STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting".freeze
-  UNKNOWN_ERROR_CLASS_NAME = 'Error'.freeze
-  NIL_ERROR_MESSAGE = '<no message>'.freeze
+  STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE = "Message removed by New Relic 'strip_exception_messages' setting"
+  UNKNOWN_ERROR_CLASS_NAME = 'Error'
+  NIL_ERROR_MESSAGE = '<no message>'
+
+  USER_ATTRIBUTES = "userAttributes"
+  AGENT_ATTRIBUTES = "agentAttributes"
+  INTRINSIC_ATTRIBUTES = "intrinsics"
+
+  DESTINATION = NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
+
+  ERROR_PREFIX_KEY   = 'error'
+  ERROR_MESSAGE_KEY  = "#{ERROR_PREFIX_KEY}.message"
+  ERROR_CLASS_KEY    = "#{ERROR_PREFIX_KEY}.class"
+  ERROR_EXPECTED_KEY = "#{ERROR_PREFIX_KEY}.expected"
 
   def initialize(path, exception, timestamp = Time.now)
     @exception_id = exception.object_id
@@ -39,7 +51,7 @@ class NewRelic::NoticedError
 
     # replace error message if enabled
     if NewRelic::Agent.config[:'strip_exception_messages.enabled'] &&
-       !self.class.passes_message_whitelist(exception.class)
+       !self.class.passes_message_allowlist(exception.class)
       @message = STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE
     end
 
@@ -57,8 +69,12 @@ class NewRelic::NoticedError
     end
   end
 
-  def self.passes_message_whitelist(exception_class)
-    NewRelic::Agent.config[:'strip_exception_messages.whitelist'].any? do |klass|
+  def self.passes_message_allowlist(exception_class)
+    # For backwards compatibility until we remove :'strip_exception_messages.whitelist' config option
+
+    allowed = NewRelic::Agent.config[:'strip_exception_messages.allowed_classes'].concat(NewRelic::Agent.config[:'strip_exception_messages.whitelist'])
+
+    allowed.any? do |klass|
       exception_class <= klass
     end
   end
@@ -73,21 +89,13 @@ class NewRelic::NoticedError
       processed_attributes ]
   end
 
-  USER_ATTRIBUTES = "userAttributes".freeze
-  AGENT_ATTRIBUTES = "agentAttributes".freeze
-  INTRINSIC_ATTRIBUTES = "intrinsics".freeze
-
-  EMPTY_HASH = {}.freeze
-
-  DESTINATION = NewRelic::Agent::AttributeFilter::DST_ERROR_COLLECTOR
-
   # Note that we process attributes lazily and store the result. This is because
   # there is a possibility that a noticed error will be discarded and not sent back
   # as a traced error or TransactionError.
   def processed_attributes
     @processed_attributes ||= begin
       attributes = base_parameters
-      merged_attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)
+      merged_attributes = NewRelic::Agent::Attributes.new(NewRelic::Agent.instance.attribute_filter)
       append_attributes(attributes, USER_ATTRIBUTES, merged_custom_attributes(merged_attributes))
       append_attributes(attributes, AGENT_ATTRIBUTES, build_agent_attributes(merged_attributes))
       append_attributes(attributes, INTRINSIC_ATTRIBUTES, build_intrinsic_attributes)
@@ -129,11 +137,21 @@ class NewRelic::NoticedError
     end
   end
 
+  def build_error_attributes
+    @attributes_from_notice_error ||= {}
+    @attributes_from_notice_error.merge!({
+      ERROR_MESSAGE_KEY => string(message),
+      ERROR_CLASS_KEY => string(exception_class_name)
+    })
+    
+    @attributes_from_notice_error[ERROR_EXPECTED_KEY] = true if expected
+  end
+
   def build_agent_attributes(merged_attributes)
     agent_attributes = if @attributes
       @attributes.agent_attributes_for(DESTINATION)
     else
-      EMPTY_HASH
+      NewRelic::EMPTY_HASH
     end
 
     # It's possible to override the request_uri from the transaction attributes
@@ -151,7 +169,7 @@ class NewRelic::NoticedError
     if @attributes
       @attributes.intrinsic_attributes_for(DESTINATION)
     else
-      EMPTY_HASH
+      NewRelic::EMPTY_HASH
     end
   end
 
@@ -175,6 +193,9 @@ class NewRelic::NoticedError
     if exception.nil?
       @exception_class_name = UNKNOWN_ERROR_CLASS_NAME
       @message = NIL_ERROR_MESSAGE
+    elsif exception.is_a? NewRelic::Agent::NoticibleError
+      @exception_class_name = exception.class_name
+      @message = exception.message
     else
       if defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR < 5 && exception.respond_to?(:original_exception)
         exception = exception.original_exception || exception

data/lib/new_relic/rack/browser_monitoring.rb

@@ -21,6 +21,7 @@ module NewRelic::Rack
 
     CONTENT_TYPE        = 'Content-Type'.freeze
     CONTENT_DISPOSITION = 'Content-Disposition'.freeze
+    CONTENT_LENGTH      = 'Content-Length'.freeze
     ATTACHMENT          = 'attachment'.freeze
     TEXT_HTML           = 'text/html'.freeze
 
@@ -35,6 +36,10 @@ module NewRelic::Rack
       js_to_inject = NewRelic::Agent.browser_timing_header
       if (js_to_inject != "") && should_instrument?(env, status, headers)
         response_string = autoinstrument_source(response, headers, js_to_inject)
+        if headers.key?(CONTENT_LENGTH)
+          content_length = response_string ? response_string.bytesize : 0
+          headers[CONTENT_LENGTH] = content_length.to_s
+        end
 
         env[ALREADY_INSTRUMENTED_KEY] = true
         if response_string

data/lib/new_relic/supportability_helper.rb

@@ -11,6 +11,8 @@ module NewRelic
     # transaction, just to eke out a bit less performance hit
     #
     API_SUPPORTABILITY_METRICS = [
+      :accept_distributed_trace_headers,
+      :create_distributed_trace_headers,
       :add_custom_attributes,
       :add_instrumentation,
       :add_method_tracer,
@@ -64,5 +66,17 @@ module NewRelic
         NewRelic::Agent.logger.debug "API supportability metric not found for :#{method_name}"
       end
     end
+
+    def valid_api_argument_class? arg, name, klass
+      return true if arg.is_a?(klass)
+
+      caller_location = caller_locations.first.label
+
+      message = "Bad argument passed to ##{caller_location}. " \
+        "Expected #{klass} for `#{name}` but got #{headers.class}"
+
+      NewRelic::Agent.logger.warn message
+      nil
+    end
   end
 end