newrelic_rpm 8.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3d77f1e8feb27c92b40dbd4d1732c5c068c786a99ab3f9cd76573ed6a201a1
-  data.tar.gz: a825501f60da5aa176ac391cc4acd91192b57736f476b477eae29efec1ca7e53
+  metadata.gz: 8fab89acaea13ee0c348b26ff7d94118b358e9ac3ea6a48c4c231a1e0821d534
+  data.tar.gz: b434c14af26d097547b16601384c045a9b7b119261b17c58b2727b36ff05cf52
 SHA512:
-  metadata.gz: 4019cf2596a500dd0b0ffb0c316d5f68bcef00ffd114a480045ad8e3cee708002211da40a3240f0db1b924be06b4656d0e2964818cbce4cc86427436684f0c22
-  data.tar.gz: 8b0849f1c3c8ff8b770e83fb67dc77d5ccf0e3f4302c7d77359764c967bec4e2ee1064207a499e0a6a8acf17f25e60a07c974133ade3b14c4866af26ea306052
+  metadata.gz: 9c568e526ec679b12cc06e3a9ed40b592665774775baf016b9be0374bea32518529c82eef199bc6369ff394c84732b0b6d7e8919f63097eb39343cde30cbca26
+  data.tar.gz: dde7b7c0d46c2b918d5b97f9e08eadbb1a0f1bccfcd52454600fb7fa17ea4de450c856f99ab87f2d030694ede1779b8224f8ff4c757f4755b9bd3213c181ee97

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v8.1.0
+
+  * **Instrumentation for Ruby standard library Logger**
+
+    The agent will now automatically instrument Logger, recording number of lines and size of logging output, with breakdown by severity.
+
+  * **Bugfix for Padrino instrumentation**
+
+    A bug was introduced to the way the agent installs padrino instrumentation in 7.0.0. This release fixes the issues with the padrino instrumentation. Thanks to @sriedel for bringing this issue to our attention.
+
+  * **Bugfix: Stop deadlocks between New Relic thread and Delayed Job sampling thread**
+
+    Running the agent's polling queries for the DelayedJobSampler within the same ActiveRecord connection decreases the frequency of deadlocks in development environments. Thanks @jdelStrother for bringing this to our attention and providing excellent sample code to speed up development!
+
+  * **Bugfix: Allow Net::HTTP request to IPv6 addresses**
+
+    The agent will no longer raise an `URI::InvalidURIError` error if an IPv6 address is passed to Net::HTTP. Thank you @tristinbarnett and @tabathadelane for crafting a solution!
+
+  * **Bugfix: Allow integers to be passed to error_collector.ignore_status_codes configuration**
+
+    Integers not wrapped in quotation marks can be passed to `error_collector.ignore_status_codes` in the `newrelic.yml` file. Our thanks goes to @elaguerta and @brammerl for resolving this issue!
+
+
   ## v8.0.0
 
   * **`add_method_tracer` refactored to use prepend over alias_method chaining**

data/README.md

@@ -23,6 +23,8 @@ Environments" section below.
 
 ## Installing and Using
 
+The latest released gem for the Ruby Agent can be found at [Rubygems.org](https://rubygems.org/gems/newrelic_rpm)
+
 ### Quick Start
 
 #### With Bundler
@@ -133,6 +135,6 @@ The New Relic Ruby agent also uses source code from third-party libraries. Full
 
 Thank you, and may your application scale to infinity plus one.
 
-Lew Cirne, Founder and CEO
+Lew Cirne, Founder
 
 New Relic, Inc.

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

@@ -354,7 +354,7 @@ module NewRelic
         :entity_guid => {
           :default => nil,
           :allow_nil => true,
-          :public => true,
+          :public => false,
           :type => String,
           :allowed_from_server => true,
           :description => 'The [Entity GUID](/attribute-dictionary/span/entityguid) for the entity running this agent.'
@@ -535,7 +535,7 @@ module NewRelic
           :type => Float,
           :allowed_from_server => true,
           :deprecated => true,
-          :description => 'Deprecated. For agent versions 3.5.0 or higher, [set your Apdex T via the New Relic UI](/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings).'
+          :description => 'For agent versions 3.5.0 or higher, [set your Apdex T via the New Relic UI](/docs/apm/new-relic-apm/apdex/changing-your-apdex-settings).'
         },
         :'strip_exception_messages.enabled' => {
           :default => value_of(:high_security),
@@ -999,6 +999,14 @@ module NewRelic
           :allowed_from_server => false,
           :description  => 'Controls auto-instrumentation of dalli gem for Memcache at start up.  May be one of [auto|prepend|chain|disabled].'
         },
+        :'instrumentation.logger' => {
+          :default => "auto",
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
         :disable_data_mapper => {
           :default => false,
           :public => true,
@@ -1152,7 +1160,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
+          :description => 'Use [`transaction_tracer.attributes.enabled`](#transaction_tracer-attributes-enabled) instead.'
         },
         :'transaction_tracer.explain_threshold' => {
           :default => 0.5,
@@ -1195,7 +1203,7 @@ module NewRelic
           :type => Boolean,
           :allowed_from_server => false,
           :deprecated => true,
-          :description => 'Deprecated; use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
+          :description => 'Use [`disable_sequel_instrumentation`](#disable_sequel_instrumentation) instead.'
         },
         :disable_mongo => {
           :default      => false,
@@ -1291,7 +1299,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
+          :description => 'Use [`error_collector.attributes.enabled`](#error_collector-attributes-enabled) instead.'
         },
         :'error_collector.ignore_errors' => {
           :default => 'ActionController::RoutingError,Sinatra::NotFound',
@@ -1299,7 +1307,7 @@ module NewRelic
           :type => String,
           :allowed_from_server => true,
           :dynamic_name => true,
-          :description => 'DEPRECATED; use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.'
+          :description => 'Use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.'
         },
         :'error_collector.ignore_classes' => {
           :default => [],
@@ -1426,7 +1434,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
+          :description => 'Use [`browser_monitoring.attributes.enabled`](#browser_monitoring-attributes-enabled) instead.'
         },
         :'browser_monitoring.loader' => {
           :default => DefaultSource.browser_monitoring_loader,
@@ -1554,7 +1562,7 @@ module NewRelic
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => 'Deprecated; use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
+          :description => 'Use [`transaction_events.attributes.enabled`](#transaction_events-attributes-enabled) instead.'
         },
         :restart_thread_in_children => {
           :default => true,

data/lib/new_relic/agent/error_filter.rb

@@ -29,7 +29,8 @@ module NewRelic
       def load_from_config(setting, value = nil)
         errors = nil
         new_value = value || fetch_agent_config(setting.to_sym)
-        return if new_value.nil? || new_value.empty?
+
+        return if new_value.nil? || (new_value.respond_to?(:empty?) && new_value.empty?)
 
         case setting.to_sym
         when :ignore_errors, :ignore_classes
@@ -50,7 +51,7 @@ module NewRelic
       end
 
       def ignore?(ex, status_code = nil)
-        @ignore_classes.include?(ex.class.name) || 
+        @ignore_classes.include?(ex.class.name) ||
           (@ignore_messages.keys.include?(ex.class.name) &&
           @ignore_messages[ex.class.name].any? { |m| ex.message.include?(m) }) ||
           @ignore_status_codes.include?(status_code.to_i)
@@ -145,7 +146,14 @@ module NewRelic
       end
 
       def parse_status_codes(codes)
-        code_list = codes.is_a?(String) ? codes.split(',') : codes
+        code_list = case codes
+          when String
+            codes.split(',')
+          when Integer
+            [codes]
+          else
+            codes
+          end
         result = []
         code_list.each do |code|
           result << code && next if code.is_a?(Integer)

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

@@ -4,6 +4,7 @@
 # frozen_string_literal: true
 
 require_relative 'abstract'
+require 'resolv'
 
 module NewRelic
   module Agent
@@ -61,9 +62,14 @@ module NewRelic
           when /^https?:\/\//
             ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(@request.path)
           else
+            connection_address = @connection.address
+            if (connection_address =~ Resolv::IPv6::Regex)
+              connection_address = "[#{connection_address}]"
+            end
+
             scheme = @connection.use_ssl? ? 'https' : 'http'
             ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url(
-              "#{scheme}://#{@connection.address}:#{@connection.port}#{@request.path}"
+              "#{scheme}://#{connection_address}:#{@connection.port}#{@request.path}"
               )
           end
         end

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

@@ -16,10 +16,11 @@ module NewRelic
                         when self.class.respond_to?(:default_name) then self.class.default_name
                         end
           NewRelic::DelayedJobInjection.worker_name = worker_name
-  
+
+          # TODO: Refactor the last line of this condition so that it can be evaluated in both prepend and chain instrumentation
           if defined?(::Delayed::Job) && ::Delayed::Job.method_defined?(:invoke_job) &&
-            !(::Delayed::Job.method_defined?(:invoke_job_without_new_relic) )
-  
+            !(::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
@@ -27,7 +28,6 @@ module NewRelic
             NewRelic::Agent.logger.warn("Did not find a Delayed::Job class responding to invoke_job, aborting DJ instrumentation")
           end
         end
-
       end
 
       module DelayedJobTracer

data/lib/new_relic/agent/instrumentation/logger/chain.rb

@@ -0,0 +1,21 @@
+# 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::Agent::Instrumentation
+  module Logger
+    def self.instrument!
+      ::Logger.class_eval do
+        include NewRelic::Agent::Instrumentation::Logger
+
+        alias_method :format_message_without_new_relic, :format_message
+
+        def format_message(severity, datetime, progname, msg)
+          format_message_with_tracing(severity, datetime, progname, msg) do
+            format_message_without_new_relic(severity, datetime, progname, msg)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+# 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
+    module Instrumentation
+      module Logger
+        def skip_instrumenting?
+          defined?(@skip_instrumenting) && @skip_instrumenting
+        end
+
+        def mark_skip_instrumenting
+          @skip_instrumenting = true
+        end
+
+        def clear_skip_instrumenting
+          @skip_instrumenting = false
+        end
+
+        LINES = "Logging/lines".freeze
+        SIZE = "Logging/size".freeze
+
+        def line_metric_name_by_severity(severity)
+          @line_metrics ||= {}
+          @line_metrics[severity] ||= "Logging/lines/#{severity}".freeze
+        end
+
+        def size_metric_name_by_severity(severity)
+          @size_metrics ||= {}
+          @size_metrics[severity] ||= "Logging/size/#{severity}".freeze
+        end
+
+
+        def format_message_with_tracing(severity, datetime, progname, msg)
+          formatted_message = yield
+          return formatted_message if skip_instrumenting?
+
+          begin
+            # It's critical we don't instrument logging from metric recording
+            # methods within NewRelic::Agent, or we'll stack overflow!!
+            mark_skip_instrumenting
+
+            NewRelic::Agent.increment_metric(LINES)
+            NewRelic::Agent.increment_metric(line_metric_name_by_severity(severity))
+
+            size = formatted_message.nil? ? 0 : formatted_message.bytesize
+            NewRelic::Agent.record_metric(SIZE, size)
+            NewRelic::Agent.record_metric(size_metric_name_by_severity(severity), size)
+
+            return formatted_message
+          ensure
+            clear_skip_instrumenting
+          end
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/logger/prepend.rb

@@ -0,0 +1,13 @@
+# 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::Agent::Instrumentation
+  module Logger::Prepend
+    include NewRelic::Agent::Instrumentation::Logger
+
+    def format_message(severity, datetime, progname, msg)
+      format_message_with_tracing(severity, datetime, progname, msg) { super }
+    end
+  end
+end

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

@@ -0,0 +1,25 @@
+# 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_relative 'logger/instrumentation'
+require_relative 'logger/chain'
+require_relative 'logger/prepend'
+
+DependencyDetection.defer do
+  named :logger
+
+  depends_on { defined?(::Logger) }
+
+  executes do
+    ::NewRelic::Agent.logger.info  "Installing Logger instrumentation"
+  end
+
+  executes do
+    if use_prepend?
+      prepend_instrument ::Logger, NewRelic::Agent::Instrumentation::Logger::Prepend
+    else
+      chain_instrument NewRelic::Agent::Instrumentation::Logger
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/padrino/chain.rb

@@ -2,30 +2,34 @@
 # 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::Agent::Instrumentation
-  module Padrino
-    module Chain
-      def self.instrument!
-        ::Padrino::Routing::InstanceMethods.module_eval do
-          include NewRelic::Agent::Instrumentation::Sinatra
+module NewRelic
+  module Agent
+    module Instrumentation
+      module PadrinoTracer
+        module Chain
+          def self.instrument!
+            ::Padrino::Routing::InstanceMethods.module_eval do
+              include NewRelic::Agent::Instrumentation::Sinatra
 
-          def dispatch_with_newrelic
-            dispatch_with_tracing { dispatch_without_newrelic }
-          end
+              def dispatch_with_newrelic
+                dispatch_with_tracing { dispatch_without_newrelic }
+              end
 
-          alias dispatch_without_newrelic dispatch!
-          alias dispatch! dispatch_with_newrelic
+              alias dispatch_without_newrelic dispatch!
+              alias dispatch! dispatch_with_newrelic
 
-          # Padrino 0.13 mustermann routing
-          if private_method_defined?(:invoke_route)
-            include NewRelic::Agent::Instrumentation::Padrino
+              # Padrino 0.13 mustermann routing
+              if private_method_defined?(:invoke_route)
+                include NewRelic::Agent::Instrumentation::Padrino
 
-            def invoke_route_with_newrelic(*args, &block)
-              invoke_route_with_tracing(*args) { invoke_route_without_newrelic(*args, &block) }
-            end
+                def invoke_route_with_newrelic(*args, &block)
+                  invoke_route_with_tracing(*args) { invoke_route_without_newrelic(*args, &block) }
+                end
 
-            alias invoke_route_without_newrelic invoke_route
-            alias invoke_route invoke_route_with_newrelic
+                alias invoke_route_without_newrelic invoke_route
+                alias invoke_route invoke_route_with_newrelic
+              end
+            end
           end
         end
       end

data/lib/new_relic/agent/instrumentation/padrino/prepend.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 module NewRelic::Agent::Instrumentation
-  module Padrino
+  module PadrinoTracer
     module Prepend
       include NewRelic::Agent::Instrumentation::Sinatra
       include NewRelic::Agent::Instrumentation::Padrino

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

@@ -24,12 +24,14 @@ DependencyDetection.defer do
   executes do
     ::NewRelic::Agent.logger.info 'Installing Padrino instrumentation'
     if use_prepend?
-      prepend_instrument ::Padrino::Routing::InstanceMethods, NewRelic::Agent::Instrumentation::Padrino::Prepend
+      prepend_instrument ::Padrino::Application, NewRelic::Agent::Instrumentation::PadrinoTracer::Prepend
     else
-      chain_instrument NewRelic::Agent::Instrumentation::Padrino::Chain
+      chain_instrument NewRelic::Agent::Instrumentation::PadrinoTracer::Chain
     end
   end
 end
 
 
 
+
+

data/lib/new_relic/agent/method_tracer.rb

@@ -320,20 +320,25 @@ module NewRelic
 
               instance_exec(&code_header) if code_header.kind_of?(Proc)
 
+              # NOTE: Calling ::NewRelic::Agent::MethodTracer.trace_execution_scoped and
+              # .trace_execution_unscoped below relies on the fact that MethodTracer is included
+              # in Module on agent startup. If/when this changes, these methods should be
+              # explicitly namespaced and extended in MethodTracer.
+
               # If tracing multiple metrics on this method, nest one unscoped trace inside the scoped trace.
               begin
                 if scoped_metric_eval
-                  self.class.trace_execution_scoped(scoped_metric_eval, metric: record_metrics, internal: true) do
+                  ::NewRelic::Agent::MethodTracer.trace_execution_scoped(scoped_metric_eval, metric: record_metrics, internal: true) do
                     if unscoped_metrics_eval.empty?
                       super(*args, &block)
                     else
-                      self.class.trace_execution_unscoped(unscoped_metrics_eval, internal: true) do
+                      ::NewRelic::Agent::MethodTracer.trace_execution_unscoped(unscoped_metrics_eval, internal: true) do
                         super(*args, &block)
                       end
                     end
                   end
                 elsif !unscoped_metrics_eval.empty?
-                  self.class.trace_execution_unscoped(unscoped_metrics_eval, internal: true) do
+                  ::NewRelic::Agent::MethodTracer.trace_execution_unscoped(unscoped_metrics_eval, internal: true) do
                     super(*args, &block)
                   end
                 end

data/lib/new_relic/agent/new_relic_service.rb

@@ -426,28 +426,21 @@ module NewRelic
         size = data.size
 
         # Preconnect needs to always use the configured collector host, not the redirect host
-        # endpoint_specific_collector = (method == :preconnect) ? @configured_collector : @collector
-
-        # This is a temporary workaround due to errors occurring on the staging collector. The prod collector does not have the same issue.
-        # The staging collector does not respond correctly when using the configured collector host for preconnect, so must use the redirect host
-        # Once this issue is resolved on the staging collector, use the original line that is commented out above.
-        endpoint_specific_collector = if method == :preconnect && (@configured_collector && @configured_collector.name != 'staging-collector.newrelic.com')
-                                        ::NewRelic::Agent.logger.debug "Using configured collector for preconnect: #{@configured_collector}"
-                                        @configured_collector
-                                      else
-                                        ::NewRelic::Agent.logger.debug "Using redirect host for collector: #{@collector}"
-                                        @collector
-                                      end
+        # We reset it here so we are always using the configured collector during our creation of the new connection
+        # and we also don't want to keep the previous redirect host around anymore
+        if method == :preconnect
+          @collector = @configured_collector
+        end
 
         uri = remote_method_uri(method)
-        full_uri = "#{endpoint_specific_collector}#{uri}"
+        full_uri = "#{@collector}#{uri}"
 
         @audit_logger.log_request(full_uri, payload, @marshaller)
         request_send_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         response = send_request(:data      => data,
                                 :uri       => uri,
                                 :encoding  => encoding,
-                                :collector => endpoint_specific_collector,
+                                :collector => @collector,
                                 :endpoint  => method)
         response_check_ts = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @marshaller.load(decompress_response(response))

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

@@ -62,9 +62,12 @@ module NewRelic
         end
 
         def poll
-          record_failed_jobs(failed_jobs)
-          record_locked_jobs(locked_jobs)
-          record_queue_length_metrics
+          # Wrapping these queries within the same connection avoids deadlocks
+          ActiveRecord::Base.connection_pool.with_connection do
+            record_failed_jobs(failed_jobs)
+            record_locked_jobs(locked_jobs)
+            record_queue_length_metrics
+          end
         end
 
         private
@@ -97,11 +100,11 @@ module NewRelic
           # here that's valid on 2.x through 4.1, so split it up.
           result = if ::ActiveRecord::VERSION::MAJOR.to_i < 4
             ::Delayed::Job.count(:group => column_name,
-                                 :conditions => [QUEUE_QUERY_CONDITION, now])
+              :conditions => [QUEUE_QUERY_CONDITION, now])
           else
             ::Delayed::Job.where(QUEUE_QUERY_CONDITION, now).
-                           group(column_name).
-                           count
+              group(column_name).
+              count
           end
           result.to_a
         end

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 8
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
 
     begin

data/newrelic.yml

@@ -211,9 +211,6 @@ common: &default_settings
 # With distributed tracing data, you can quickly pinpoint failures or performance issues and fix them.
 # distributed_tracing.enabled: true
 
-# The Entity GUID for the entity that is running this agent.
-# entity_guid: nil
-
 # If true, the agent captures attributes from error collection.
 # error_collector.attributes.enabled: false
 
@@ -334,6 +331,10 @@ common: &default_settings
 # May be one of [auto|prepend|chain|disabled].
 # instrumentation.httprb: auto
 
+# Controls auto-instrumentation of the Ruby standard library Logger.rb.
+# May be one of [auto|prepend|chain|disabled].
+# instrumentation.logger: auto
+
 # Controls auto-instrumentation of memcache-client gem for Memcache at start up.
 # May be one of [auto|prepend|chain|disabled].
 # instrumentation.memcache_client: auto

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Aaron Huntsman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -338,6 +338,10 @@ 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
@@ -444,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

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.19.0" ],
-        :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