newrelic_rpm 7.0.0 → 8.1.0

data/test/agent_helper.rb

@@ -594,6 +594,31 @@ def advance_time seconds
   Time.__frozen_now = Time.now + seconds
 end
 
+unless Process.respond_to?(:__original_clock_gettime)
+  Process.instance_eval do
+    class << self
+      attr_accessor :__frozen_clock_gettime
+      alias_method :__original_clock_gettime, :clock_gettime
+
+      def clock_gettime(clock_id, unit = :float_second)
+        __frozen_clock_gettime || __original_clock_gettime(clock_id, unit)
+      end
+    end
+  end
+end
+
+def advance_process_time(seconds, clock_id=Process::CLOCK_REALTIME)
+  Process.__frozen_clock_gettime = Process.clock_gettime(clock_id) + seconds
+end
+
+def nr_freeze_process_time(now=Process.clock_gettime(Process::CLOCK_REALTIME))
+  Process.__frozen_clock_gettime = now
+end
+
+def nr_unfreeze_process_time
+  Process.__frozen_clock_gettime = nil
+end
+
 def with_constant_defined constant_symbol, implementation=Module.new
   const_path = constant_path(constant_symbol.to_s)
 
@@ -668,7 +693,7 @@ def wait_for_backtrace_service_poll opts={}
     :iterations => 1
   }
   opts = defaults.merge(opts)
-  deadline = Time.now + opts[:timeout]
+  deadline = Process.clock_gettime(Process::CLOCK_REALTIME) + opts[:timeout]
 
   service = opts[:service]
   worker_loop = service.worker_loop
@@ -676,7 +701,7 @@ def wait_for_backtrace_service_poll opts={}
 
   until worker_loop.iterations > opts[:iterations]
     sleep(0.01)
-    if Time.now > deadline
+    if Process.clock_gettime(Process::CLOCK_REALTIME) > deadline
       raise "Timed out waiting #{opts[:timeout]} s for backtrace service poll\n" +
             "Worker loop ran for #{opts[:service].worker_loop.iterations} iterations\n\n" +
             Thread.list.map { |t|

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Aaron Huntsman
 - Tanna McClure
-- Michael Lang
+- Kayla Reopelle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -261,7 +261,6 @@ files:
 - lib/new_relic/agent/datastores/mongo/event_formatter.rb
 - lib/new_relic/agent/datastores/mongo/metric_translator.rb
 - lib/new_relic/agent/datastores/mongo/obfuscator.rb
-- lib/new_relic/agent/datastores/mongo/statement_formatter.rb
 - lib/new_relic/agent/datastores/redis.rb
 - lib/new_relic/agent/deprecator.rb
 - lib/new_relic/agent/distributed_tracing.rb
@@ -276,6 +275,7 @@ files:
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/error_event_aggregator.rb
+- lib/new_relic/agent/error_filter.rb
 - lib/new_relic/agent/error_trace_aggregator.rb
 - lib/new_relic/agent/event_aggregator.rb
 - lib/new_relic/agent/event_buffer.rb
@@ -324,7 +324,6 @@ files:
 - lib/new_relic/agent/instrumentation/delayed_job/prepend.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
 - lib/new_relic/agent/instrumentation/excon.rb
-- 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/grape/chain.rb
@@ -339,14 +338,16 @@ files:
 - lib/new_relic/agent/instrumentation/httprb/instrumentation.rb
 - lib/new_relic/agent/instrumentation/httprb/prepend.rb
 - lib/new_relic/agent/instrumentation/ignore_actions.rb
+- lib/new_relic/agent/instrumentation/logger.rb
+- lib/new_relic/agent/instrumentation/logger/chain.rb
+- lib/new_relic/agent/instrumentation/logger/instrumentation.rb
+- lib/new_relic/agent/instrumentation/logger/prepend.rb
 - lib/new_relic/agent/instrumentation/memcache.rb
 - lib/new_relic/agent/instrumentation/memcache/chain.rb
 - lib/new_relic/agent/instrumentation/memcache/dalli.rb
 - lib/new_relic/agent/instrumentation/memcache/helper.rb
 - lib/new_relic/agent/instrumentation/memcache/instrumentation.rb
 - lib/new_relic/agent/instrumentation/memcache/prepend.rb
-- lib/new_relic/agent/instrumentation/merb/controller.rb
-- lib/new_relic/agent/instrumentation/merb/errors.rb
 - lib/new_relic/agent/instrumentation/middleware_proxy.rb
 - lib/new_relic/agent/instrumentation/middleware_tracing.rb
 - lib/new_relic/agent/instrumentation/mongo.rb
@@ -385,6 +386,7 @@ files:
 - lib/new_relic/agent/instrumentation/redis/prepend.rb
 - lib/new_relic/agent/instrumentation/resque.rb
 - lib/new_relic/agent/instrumentation/resque/chain.rb
+- lib/new_relic/agent/instrumentation/resque/helper.rb
 - lib/new_relic/agent/instrumentation/resque/instrumentation.rb
 - lib/new_relic/agent/instrumentation/resque/prepend.rb
 - lib/new_relic/agent/instrumentation/sequel.rb
@@ -446,7 +448,6 @@ files:
 - lib/new_relic/agent/stats_engine.rb
 - lib/new_relic/agent/stats_engine/gc_profiler.rb
 - lib/new_relic/agent/stats_engine/stats_hash.rb
-- lib/new_relic/agent/supported_versions.rb
 - lib/new_relic/agent/synthetics_event_aggregator.rb
 - lib/new_relic/agent/system_info.rb
 - lib/new_relic/agent/threading/agent_thread.rb
@@ -501,7 +502,6 @@ files:
 - lib/new_relic/control/class_methods.rb
 - lib/new_relic/control/frameworks.rb
 - lib/new_relic/control/frameworks/external.rb
-- lib/new_relic/control/frameworks/merb.rb
 - lib/new_relic/control/frameworks/rails.rb
 - lib/new_relic/control/frameworks/rails3.rb
 - lib/new_relic/control/frameworks/rails4.rb

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

@@ -1,53 +0,0 @@
-# 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/datastores/mongo/obfuscator'
-
-module NewRelic
-  module Agent
-    module Datastores
-      module Mongo
-        module StatementFormatter
-
-          PLAINTEXT_KEYS = [
-            :database,
-            :collection,
-            :operation,
-            :fields,
-            :skip,
-            :limit,
-            :order
-          ]
-
-          OBFUSCATE_KEYS = [
-            :selector
-          ]
-
-          def self.format(statement, operation)
-            return nil unless NewRelic::Agent.config[:'mongo.capture_queries']
-
-            result = { :operation => operation }
-
-            PLAINTEXT_KEYS.each do |key|
-              result[key] = statement[key] if statement.key?(key)
-            end
-
-            OBFUSCATE_KEYS.each do |key|
-              if statement.key?(key) && statement[key]
-                obfuscated = obfuscate(statement[key])
-                result[key] = obfuscated if obfuscated
-              end
-            end
-            result
-          end
-
-          def self.obfuscate(statement)
-            statement = Obfuscator.obfuscate_statement(statement) if NewRelic::Agent.config[:'mongo.obfuscate_queries']
-            statement
-          end
-        end
-      end
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/excon/connection.rb

@@ -1,49 +0,0 @@
-# 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 ::Excon
-  class Connection
-    # @connection is deprecated in newer excon versions and replaced with @data
-    def newrelic_connection_params
-      (@data || @connection)
-    end
-
-    def newrelic_resolved_request_params(request_params)
-      resolved = newrelic_connection_params.merge(request_params)
-      resolved[:headers] = resolved[:headers].merge(request_params[:headers] || {})
-      resolved
-    end
-
-    def request_with_newrelic_trace(params, &block)
-      resolved_params = newrelic_resolved_request_params(params)
-      wrapped_request = ::NewRelic::Agent::HTTPClients::ExconHTTPRequest.new(resolved_params)
-      segment = NewRelic::Agent::Tracer.start_external_request_segment(
-        library: wrapped_request.type,
-        uri: wrapped_request.uri,
-        procedure: wrapped_request.method
-      )
-
-      begin
-        response = nil
-        segment.add_request_headers wrapped_request
-
-        response = NewRelic::Agent::Tracer.capture_segment_error segment do
-          request_without_newrelic_trace(resolved_params, &block)
-        end
-
-        wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(response)
-        segment.process_response_headers wrapped_response
-
-        response
-      ensure
-        segment.finish if segment
-      end
-    end
-
-    def self.install_newrelic_instrumentation
-      alias request_without_newrelic_trace request
-      alias request request_with_newrelic_trace
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/merb/controller.rb

@@ -1,44 +0,0 @@
-# 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 'set'
-
-DependencyDetection.defer do
-  @name = :merb_controller
-
-  depends_on do
-    defined?(Merb) && defined?(Merb::Controller)
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Merb Controller instrumentation'
-  end
-
-  executes do
-    require 'merb-core/controller/merb_controller'
-
-    Merb::Controller.class_eval do
-      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-
-      # determine the path that is used in the metric name for
-      # the called controller action
-      def newrelic_metric_path
-        "#{controller_name}/#{action_name}"
-      end
-
-      protected
-
-      def _dispatch_with_newrelic_trace(*args)
-        options = {}
-        options[:params] = params
-        perform_action_with_newrelic_trace(options) do
-          _dispatch_without_newrelic_trace(*args)
-        end
-      end
-
-      alias_method :_dispatch_without_newrelic_trace, :_dispatch
-      alias_method :_dispatch, :_dispatch_with_newrelic_trace
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/merb/errors.rb

@@ -1,33 +0,0 @@
-# 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.
-
-DependencyDetection.defer do
-  @name = :merb_error
-
-  depends_on do
-    defined?(Merb) && defined?(Merb::Dispatcher) && defined?(Merb::Dispatcher::DefaultException)
-  end
-
-  depends_on do
-    Merb::Dispatcher::DefaultException.respond_to?(:before)
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Merb Errors instrumentation'
-  end
-
-  executes do
-
-    # Hook in the notification to merb
-    error_notifier = Proc.new {
-      if request.exceptions #check that there's actually an exception
-        # Note, this assumes we have already captured the other information such as uri and params in the Transaction.
-        NewRelic::Agent::Transaction.notice_error(request.exceptions.first)
-      end
-    }
-    Merb::Dispatcher::DefaultException.before error_notifier
-    Exceptions.before error_notifier
-
-  end
-end

data/lib/new_relic/agent/supported_versions.rb

@@ -1,275 +0,0 @@
-# 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
-    SUPPORTED_VERSIONS =
-    {
-      # Rubies
-      :mri =>
-      {
-        :type        => :ruby,
-        :name        => "MRI",
-        :supported   => ["2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0", "~>2.4.0", "~>2.5.0", "~>2.6.0", "~>2.7.0"],
-        :deprecated  => ["1.8.6", "1.8.7", "1.9.2", "1.9.3"],
-        :url         => "https://www.ruby-lang.org",
-        :feed        => "https://www.ruby-lang.org/en/feeds/news.rss",
-        :notes       => ["Last supported agent for 1.8.7, 1.9.2, and 1.9.3 was 3.18.1.330.",
-                         "Last supported agent on 1.8.6 was 3.6.8.168."]
-      },
-      :jruby =>
-      {
-        :type        => :ruby,
-        :name        => "JRuby",
-        :supported   => ["~>9.0", "~>9.1"],
-        :deprecated  => ["~>1.7.0"],
-        :url         => "http://jruby.org",
-        :feed        => "http://jruby.org/atom.xml",
-        :notes       => ["Last supported agent for ~>1.7.0 was 3.18.1.330."]
-      },
-
-      # App servers
-      :passenger =>
-      {
-        :type        => :app_server,
-        :supported   => ["~>2.2", "~>3.0", "~>4.0"],
-        :url         => "http://www.phusionpassenger.com/",
-        :feed        => "http://rubygems.org/gems/passenger/versions.atom"
-      },
-      :thin =>
-      {
-        :type        => :app_server,
-        :supported   => ["~>1.0"],
-        :url         => "http://code.macournoyer.com/thin/",
-        :feed        => "http://rubygems.org/gems/thin/versions.atom"
-      },
-      :unicorn =>
-      {
-        :type        => :app_server,
-        :supported   => ["~>4.0"],
-        :deprecated  => ["~>1.0", "~>2.0", "~>3.0"],
-        :url         => "http://unicorn.bogomips.org/",
-        :feed        => "http://rubygems.org/gems/unicorn/versions.atom"
-      },
-      :puma =>
-      {
-        :type        => :app_server,
-        :supported   => ["~>2.0"],
-        :deprecated  => ["~>1.0"],
-        :url         => "http://puma.io/",
-        :feed        => "http://rubygems.org/gems/puma/versions.atom"
-      },
-      :rainbows =>
-      {
-        :type        => :app_server,
-        :name        => "rainbows!",
-        :experimental=> ["4.5.0"],
-        :url         => "http://rainbows.rubyforge.org/",
-        :feed        => "http://rubygems.org/gems/rainbows/versions.atom"
-      },
-      :webrick =>
-      {
-        :type        => :app_server,
-        :notes       => [ "Supported for all agent-supported versions of Ruby" ]
-      },
-
-      # Web frameworks
-      :rails =>
-      {
-        :type        => :web,
-        :supported   => ["~3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~>5.0.0", "~>5.1.0"],
-        :deprecated  => ["~>2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0"],
-        :url         => "https://rubygems.org/gems/rails",
-        :feed        => "https://rubygems.org/gems/rails/versions.atom",
-        :notes       => ["Last supported agent for ~>2.1.0, ~>2.2.0, and ~>2.3.0 was 3.18.1.330.",
-                         "Last supported agent for 2.0.x was 3.6.8.168."]
-      },
-      :sinatra =>
-      {
-        :type        => :web,
-        :supported   => ["~>1.2.0", "~>1.3.0", "~>1.4.0", "~>2.0.0"],
-        :url         => "https://rubygems.org/gems/sinatra",
-        :feed        => "https://rubygems.org/gems/sinatra/versions.atom"
-      },
-      :padrino =>
-      {
-        :type        => :web,
-        :supported   => ["~>0.10"],
-        :url         => "https://rubygems.org/gems/padrino",
-        :feed        => "https://rubygems.org/gems/padrino/versions.atom"
-      },
-      :rack =>
-      {
-        :type        => :web,
-        :supported   => [">= 1.1.0"],
-        :deprecated  => ["~>1.0.0"],
-        :url         => "https://rubygems.org/gems/rack",
-        :feed        => "https://rubygems.org/gems/rack/versions.atom"
-      },
-      :grape =>
-      {
-        :type        => :web,
-        :supported   => [">= 0.2.0"],
-        :url         => "https://rubygems.org/gems/grape",
-        :feed        => "https://rubygems.org/gems/grape/versions.atom"
-      },
-
-      # Database
-      :activerecord =>
-      {
-        :type        => :database,
-        :supported   => ["~>3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0", "~>5.0.0", "~>5.1.0", "~>6.0.0"],
-        :deprecated  => ["~>2.0.0", "~>2.1.0", "~>2.2.0", "~>2.3.0",],
-        :url         => "https://rubygems.org/gems/activerecord",
-        :feed        => "https://rubygems.org/gems/activerecord/versions.atom",
-        :notes       => ["Last supported agent for ~>2.1.0, ~>2.2.0, and ~>2.3.0 was 3.18.1.330.",
-                         "Last supported agent for 2.0.x was 3.6.8.168."]
-      },
-      :datamapper =>
-      {
-        :type        => :database,
-        :supported   => ["~>1.0"],
-        :url         => "https://rubygems.org/gems/datamapper",
-        :feed        => "https://rubygems.org/gems/datamapper/versions.atom"
-      },
-      :sequel =>
-      {
-        :type        => :database,
-        :supported   => ["~>3.37", "~>4.0"],
-        :url         => "https://rubygems.org/gems/sequel",
-        :feed        => "https://rubygems.org/gems/sequel/versions.atom"
-      },
-      :mongo =>
-      {
-        :type        => :database,
-        :supported   => ["~>1.8", "~>2.1"],
-        :url         => "https://rubygems.org/gems/mongo",
-        :feed        => "https://rubygems.org/gems/mongo/versions.atom"
-      },
-      :redis =>
-      {
-        :type        => :database,
-        :supported   => ["~>3.0"],
-        :url         => "https://rubygems.org/gems/redis",
-        :feed        => "https://rubygems.org/gems/redis/versions.atom"
-      },
-
-      # Background Jobs
-      :rake =>
-      {
-        :type        => :background,
-        :supported   => ["~>10.0"],
-        :url         => "https://rubygems.org/gems/rake",
-        :feed        => "https://rubygems.org/gems/rake/versions.atom"
-      },
-      :resque =>
-      {
-        :type        => :background,
-        :supported   => ["~>1.23.0"],
-        :deprecated  => ["~>1.22.0"],
-        :experimental=> [">= 2.0"],
-        :url         => "https://rubygems.org/gems/resque",
-        :feed        => "https://rubygems.org/gems/resque/versions.atom"
-      },
-      :sidekiq =>
-      {
-        :type        => :background,
-        :supported   => ["~>2.8", "~>3.4.2", "~>4.0"],
-        :url         => "https://rubygems.org/gems/sidekiq",
-        :feed        => "https://rubygems.org/gems/sidekiq/versions.atom"
-      },
-      :delayed_job =>
-      {
-        :type        => :background,
-        :supported   => ["~>2.0", "~>3.0", "~>4.0"],
-        :url         => "https://rubygems.org/gems/delayed_job",
-        :feed        => "https://rubygems.org/gems/delayed_job/versions.atom"
-      },
-
-      # HTTP Clients
-      :curb =>
-      {
-        :type        => :http,
-        :supported   => [ ">= 0.8.1" ],
-        :url         => "https://rubygems.org/gems/curb",
-        :feed        => "https://rubygems.org/gems/curb/versions.atom"
-      },
-      :excon =>
-      {
-        :type        => :http,
-        :supported   => [ ">= 0.10.1" ],
-        :url         => "https://rubygems.org/gems/excon",
-        :feed        => "https://rubygems.org/gems/excon/versions.atom"
-      },
-      :httpclient =>
-      {
-        :type        => :http,
-        :supported   => [ ">= 2.2.0"],
-        :url         => "https://rubygems.org/gems/httpclient",
-        :feed        => "https://rubygems.org/gems/httpclient/versions.atom"
-      },
-      :typhoeus =>
-      {
-        :type        => :http,
-        :supported   => [ ">= 0.5.3"],
-        :url         => "https://rubygems.org/gems/typhoeus",
-        :feed        => "https://rubygems.org/gems/typhoeus/versions.atom"
-      },
-      :net_http =>
-      {
-        :type        => :http,
-        :name        => "Net::HTTP",
-        :notes       => [
-          "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 =>
-      {
-        :type        => :other,
-        :url         => "https://rubygems.org/gems/sunspot",
-        :feed        => "https://rubygems.org/gems/sunspot/versions.atom"
-      },
-      :acts_as_solr =>
-      {
-        :type        => :other,
-        :url         => "https://rubygems.org/gems/acts_as_solr",
-        :feed        => "https://rubygems.org/gems/acts_as_solr/versions.atom"
-      },
-      :dalli =>
-      {
-        :type        => :other,
-        :url         => "https://rubygems.org/gems/dalli",
-        :feed        => "https://rubygems.org/gems/dalli/versions.atom"
-      },
-      :'memcache-client' =>
-      {
-        :type        => :other,
-        :url         => "https://rubygems.org/gems/memcache-client",
-        :feed        => "https://rubygems.org/gems/memcache-client/versions.atom"
-      },
-      :authlogic =>
-      {
-        :type        => :other,
-        :url         => "https://rubygems.org/gems/authlogic",
-        :feed        => "https://rubygems.org/gems/authlogic/versions.atom"
-      },
-      :activemerchant =>
-      {
-        :type        => :other,
-        :supported   => [ ">= 1.25.0"],
-        :url         => "https://rubygems.org/gems/activemerchant",
-        :feed        => "https://rubygems.org/gems/activemerchant/versions.atom"
-      },
-    }
-  end
-end

data/lib/new_relic/control/frameworks/merb.rb

@@ -1,29 +0,0 @@
-# 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
-  class Control
-    module Frameworks
-      # Includes limited support for Merb
-      class Merb < NewRelic::Control
-
-        def env
-          @env ||= ::Merb.env
-        end
-        def root
-          ::Merb.root
-        end
-
-        def init_config options={}
-          ::Merb::Plugins.add_rakefiles File.join(newrelic_root,"lib/tasks/all.rb")
-
-          # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
-          ::Merb::Plugins.config[:newrelic] = {
-            :config => self
-          }
-        end
-      end
-    end
-  end
-end