newrelic_rpm 4.8.0.341 → 6.13.1

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

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'base64'
 require 'json'

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

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'json'
 require 'new_relic/agent/new_relic_service/marshaller'
@@ -39,7 +39,6 @@ module NewRelic
 
         def load(data)
           if data.nil? || data.empty?
-            ::NewRelic::Agent.logger.error "Empty JSON response from collector: '#{data.inspect}'"
             return nil
           end
 

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

@@ -1,29 +1,11 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent
     class NewRelicService
       class Marshaller
-        def parsed_error(error)
-          error_type    = error['error_type']
-          error_message = error['message']
-
-          exception = case error_type
-          when 'NewRelic::Agent::LicenseException'
-            LicenseException.new(error_message)
-          when 'NewRelic::Agent::ForceRestartException'
-            ForceRestartException.new(error_message)
-          when 'NewRelic::Agent::ForceDisconnectException'
-            ForceDisconnectException.new(error_message)
-          else
-            CollectorError.new("#{error['error_type']}: #{error['message']}")
-          end
-
-          exception
-        end
-
         def prepare(data, options={})
           encoder = options[:encoder] || default_encoder
           if data.respond_to?(:to_collector_array)
@@ -46,15 +28,12 @@ module NewRelic
         protected
 
         def return_value(data)
-          if data.respond_to?(:has_key?)
-            if data.has_key?('exception')
-              raise parsed_error(data['exception'])
-            elsif data.has_key?('return_value')
-              return data['return_value']
-            end
+          if data.respond_to?(:has_key?) && data.has_key?('return_value')
+            data['return_value']
+          else
+            ::NewRelic::Agent.logger.debug("Unexpected response from collector: #{data}")
+            nil
           end
-          ::NewRelic::Agent.logger.debug("Unexpected response from collector: #{data}")
-          nil
         end
       end
     end

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

@@ -0,0 +1,61 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+
+module NewRelic
+  module Agent
+    class NewRelicService
+      module SecurityPolicySettings
+        EXPECTED_SECURITY_POLICIES = %w(
+          record_sql
+          attributes_include
+          allow_raw_exception_messages
+          custom_events
+          custom_parameters
+          custom_instrumentation_editor
+          message_parameters
+          job_arguments).map(&:freeze)
+
+        def self.preliminary_settings(security_policies)
+          enabled_key = 'enabled'.freeze
+          settings = EXPECTED_SECURITY_POLICIES.inject({}) do |memo, policy_name|
+            memo[policy_name] =  {enabled_key => security_policies[policy_name][enabled_key]}
+            memo
+          end
+          {'security_policies' => settings}
+        end
+
+        class Validator
+          def initialize(preconnect_response)
+            @preconnect_policies = preconnect_response['security_policies'] || {}
+          end
+
+          def validate_matching_agent_config!
+            agent_keys = EXPECTED_SECURITY_POLICIES
+            all_server_keys = @preconnect_policies.keys
+            required = 'required'
+            required_server_keys = @preconnect_policies.keys.select do |key|
+              key if @preconnect_policies[key][required]
+            end
+
+            missing_from_agent = required_server_keys - agent_keys
+            unless missing_from_agent.empty?
+              message = "The agent received one or more required security policies \
+that it does not recognize and will shut down: #{missing_from_agent.join(',')}. \
+Please check if a newer agent version supports these policies or contact support."
+              raise NewRelic::Agent::UnrecoverableAgentException.new(message)
+            end
+
+            missing_from_server = agent_keys - all_server_keys
+            unless missing_from_server.empty?
+              message = "The agent did not receive one or more security policies \
+that it expected and will shut down: #{missing_from_server.join(',')}. Please \
+contact support."
+              raise NewRelic::Agent::UnrecoverableAgentException.new(message)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/noticible_error.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+module NewRelic
+  module Agent
+
+    # This class is used for instrumentations that have exceptions or error classes
+    # not derived from Ruby's usual Exception or StandardError or in situations
+    # where we do not have such Exception object to work with.
+    class NoticibleError
+      attr_reader :class_name, :message
+
+      def initialize class_name, message
+        @class_name = class_name
+        @message = message
+      end
+    end
+
+  end
+end

data/lib/new_relic/agent/null_logger.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 # A stub object that we can use in place of a real Logger instance when
 # the agent is disabled.

data/lib/new_relic/agent/obfuscator.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 #require 'base64'
 

data/lib/new_relic/agent/parameter_filtering.rb

@@ -1,22 +1,35 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent
     module ParameterFiltering
       extend self
 
+      ACTION_DISPATCH_PARAMETER_FILTER = "action_dispatch.parameter_filter".freeze
+
+      RAILS_FILTER_CLASS = if defined?(ActiveSupport::ParameterFilter)
+         ActiveSupport::ParameterFilter
+      elsif defined?(ActionDispatch::Http::ParameterFilter)
+        ActionDispatch::Http::ParameterFilter
+      else
+        nil
+      end
+
       def apply_filters(env, params)
-        params = filter_using_rails(env, params)
+        if filters = env[ACTION_DISPATCH_PARAMETER_FILTER]
+          params = filter_using_rails(params, filters) 
+        end
         params = filter_rack_file_data(env, params)
         params
       end
 
-      def filter_using_rails(env, params)
-        return params unless defined?(ActionDispatch::Http::ParameterFilter) && env.key?("action_dispatch.parameter_filter")
-        filters = env["action_dispatch.parameter_filter"]
-        ActionDispatch::Http::ParameterFilter.new(filters).filter(params)
+      def filter_using_rails(params, filters)
+        return params if RAILS_FILTER_CLASS.nil?
+
+        pre_filtered_params = filter_rails_request_parameters(params)
+        RAILS_FILTER_CLASS.new(filters).filter(pre_filtered_params)
       end
 
       def filter_rack_file_data(env, params)

data/lib/new_relic/agent/payload_metric_mapping.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/pipe_channel_manager.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'base64'
 

data/lib/new_relic/agent/pipe_service.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent
@@ -53,6 +53,10 @@ module NewRelic
         write_to_pipe(:error_event_data, events) if events
       end
 
+      def span_event_data(events)
+        write_to_pipe(:span_event_data, events) if events
+      end
+
       def sql_trace_data(sql)
         write_to_pipe(:sql_trace_data, sql) if sql
       end

data/lib/new_relic/agent/prepend_supportability.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/priority_sampled_buffer.rb

@@ -0,0 +1,95 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+
+require 'new_relic/agent/heap'
+require 'new_relic/agent/event_buffer'
+
+module NewRelic
+  module Agent
+    class PrioritySampledBuffer < EventBuffer
+      PRIORITY_KEY = "priority".freeze
+
+      attr_reader :seen_lifetime, :captured_lifetime
+
+      def initialize(capacity)
+        super
+        @captured_lifetime = 0
+        @seen_lifetime     = 0
+      end
+
+      def heapify_items_array
+        if @items.is_a?(Array)
+          @items = Heap.new(@items) { |x| priority_for(x) } 
+        end
+      end
+
+      # expects priority and a block, or an event as a hash with a `priority` key.
+      def append(priority: nil, event: nil, &blk)
+        increment_seen
+
+        return if @capacity == 0
+
+        if full?
+          priority ||= priority_for(event)
+          if priority_for(@items[0]) < priority
+            heapify_items_array
+            incoming = event || blk.call
+            @items[0] = incoming
+            @items.fix(0)
+            incoming
+          else
+            nil
+          end
+        else
+          @items << (event || blk.call)
+          @captured_lifetime += 1
+          @items[-1]
+        end
+      end
+
+      alias_method :append_event, :append
+
+      def capacity=(new_capacity)
+        @capacity = new_capacity
+        old_items = @items.to_a
+        old_seen  = @seen
+        reset!
+        old_items.each { |i| append(event: i) }
+        @seen     = old_seen
+      end
+
+      def to_a
+        @items.to_a.dup
+      end
+
+      def decrement_lifetime_counts_by n
+        @captured_lifetime -= n
+        @seen_lifetime -= n
+      end
+
+      def sample_rate_lifetime
+        @captured_lifetime > 0 ? (@captured_lifetime.to_f / @seen_lifetime) : 0.0
+      end
+
+      def metadata
+        super.merge!(
+          :captured_lifetime => @captured_lifetime,
+          :seen_lifetime => @seen_lifetime
+        )
+      end
+
+      private
+
+      def increment_seen
+        @seen += 1
+        @seen_lifetime += 1
+      end
+
+      def priority_for(event)
+        event[0][PRIORITY_KEY]
+      end
+    end
+  end
+end
+

data/lib/new_relic/agent/range_extensions.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/rules_engine.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/rules_engine/replacement_rule'
 require 'new_relic/agent/rules_engine/segment_terms_rule'

data/lib/new_relic/agent/rules_engine/replacement_rule.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/rules_engine/segment_terms_rule.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

data/lib/new_relic/agent/sampler.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 #
 # A Sampler is used to capture meaningful metrics in a background thread
 # periodically.  They will be invoked about once a minute, each time the agent

data/lib/new_relic/agent/sampler_collection.rb

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic
   module Agent

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

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/sampler'
 

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

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/sampler'
 require 'new_relic/delayed_job_injection'

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

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/sampler'
 

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

@@ -1,6 +1,6 @@
 # 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.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/sampler'