newrelic_rpm 4.0.0.332 → 6.13.1

data/lib/new_relic/agent/stats_engine.rb

@@ -1,17 +1,15 @@
 # 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/stats_engine/metric_stats'
 require 'new_relic/agent/stats_engine/gc_profiler'
 require 'new_relic/agent/stats_engine/stats_hash'
+require 'new_relic/language_support'
 
 module NewRelic
   module Agent
     # This class handles all the statistics gathering for the agent
     class StatsEngine
-      include MetricStats
-
       attr_accessor :metric_rules
 
       def initialize
@@ -25,6 +23,176 @@ module NewRelic
       def with_stats_lock
         @stats_lock.synchronize { yield }
       end
+
+      # Update the unscoped metrics given in metric_names.
+      # metric_names may be either a single name, or an array of names.
+      #
+      # This is an internal method, subject to change at any time. Client apps
+      # and gems should use the public API (NewRelic::Agent.record_metric)
+      # instead.
+      #
+      # There are four ways to use this method:
+      #
+      # 1. With a numeric value, it will update the Stats objects associated
+      #    with the given metrics by calling record_data_point(value, aux).
+      #    aux will be treated in this case as the exclusive time associated
+      #    with the call being recorded.
+      #
+      # 2. With a value of :apdex_s, :apdex_t, or :apdex_f, it will treat the
+      #    associated stats as an Apdex metric, updating it to reflect the
+      #    occurrence of a transaction falling into the given category.
+      #    The aux value in this case should be the apdex threshold used in
+      #    bucketing the request.
+      #
+      # 3. If a block is given, value and aux will be ignored, and instead the
+      #    Stats object associated with each named unscoped metric will be
+      #    yielded to the block for customized update logic.
+      #
+      # 4. If value is a Stats instance, it will be merged into the Stats
+      #    associated with each named unscoped metric.
+      #
+      # If this method is called during a transaction, the metrics will be
+      # attached to the Transaction, and not merged into the global set until
+      # the end of the transaction.
+      #
+      # Otherwise, the metrics will be recorded directly into the global set
+      # of metrics, under a lock.
+      #
+      # @api private
+      #
+      def tl_record_unscoped_metrics(metric_names, value=nil, aux=nil, &blk)
+        state = NewRelic::Agent::Tracer.state
+        record_unscoped_metrics(state, metric_names, value, aux, &blk)
+      end
+
+      def record_unscoped_metrics(state, metric_names, value=nil, aux=nil, &blk)
+        txn = state.current_transaction
+        if txn
+          txn.metrics.record_unscoped(metric_names, value, aux, &blk)
+        else
+          specs = coerce_to_metric_spec_array(metric_names, nil)
+          with_stats_lock do
+            @stats_hash.record(specs, value, aux, &blk)
+          end
+        end
+      end
+
+      # Like tl_record_unscoped_metrics, but records a scoped metric as well.
+      #
+      # This is an internal method, subject to change at any time. Client apps
+      # and gems should use the public API (NewRelic::Agent.record_metric)
+      # instead.
+      #
+      # The given scoped_metric will be recoded as both a scoped *and* an
+      # unscoped metric. The summary_metrics will be recorded as unscoped
+      # metrics only.
+      #
+      # If called during a transaction, all metrics will be attached to the
+      # Transaction, and not merged into the global set of metrics until the
+      # end of the transaction.
+      #
+      # If called outside of a transaction, only the *unscoped* metrics will
+      # be recorded, directly into the global set of metrics (under a lock).
+      #
+      # @api private
+      #
+      def tl_record_scoped_and_unscoped_metrics(scoped_metric, summary_metrics=nil, value=nil, aux=nil, &blk)
+        state = NewRelic::Agent::Tracer.state
+        record_scoped_and_unscoped_metrics(state, scoped_metric, summary_metrics, value, aux, &blk)
+      end
+
+      def record_scoped_and_unscoped_metrics(state, scoped_metric, summary_metrics=nil, value=nil, aux=nil, &blk)
+        txn = state.current_transaction
+        if txn
+          txn.metrics.record_scoped_and_unscoped(scoped_metric, value, aux, &blk)
+          if summary_metrics
+            txn.metrics.record_unscoped(summary_metrics, value, aux, &blk)
+          end
+        else
+          specs = coerce_to_metric_spec_array(scoped_metric, nil)
+          if summary_metrics
+            specs.concat(coerce_to_metric_spec_array(summary_metrics, nil))
+          end
+          with_stats_lock do
+            @stats_hash.record(specs, value, aux, &blk)
+          end
+        end
+      end
+
+      # Helper for recording a straight value into the count
+      def tl_record_supportability_metric_count(metric, value)
+        real_name = "Supportability/#{metric}"
+        tl_record_unscoped_metrics(real_name) do |stat|
+          stat.call_count = value
+        end
+      end
+
+      def reset!
+        with_stats_lock do
+          old = @stats_hash
+          @stats_hash = StatsHash.new
+          old
+        end
+      end
+
+      # merge data from previous harvests into this stats engine
+      def merge!(other_stats_hash)
+        with_stats_lock do
+          @stats_hash.merge!(other_stats_hash)
+          @stats_hash
+        end
+      end
+
+      def merge_transaction_metrics!(txn_metrics, scope)
+        with_stats_lock do
+          @stats_hash.merge_transaction_metrics!(txn_metrics, scope)
+        end
+      end
+
+      def harvest!
+        now = Time.now
+        snapshot = reset!
+        snapshot = apply_rules_to_metric_data(@metric_rules, snapshot)
+        snapshot.harvested_at = now
+        snapshot
+      end
+
+      def apply_rules_to_metric_data(rules_engine, stats_hash)
+        renamed_stats = NewRelic::Agent::StatsHash.new(stats_hash.started_at)
+        stats_hash.each do |spec, stats|
+          new_name = rules_engine.rename(spec.name)
+          unless new_name.nil?
+            new_spec = NewRelic::MetricSpec.new(new_name, spec.scope)
+            renamed_stats[new_spec].merge!(stats)
+          end
+        end
+        renamed_stats
+      end
+
+      def coerce_to_metric_spec_array(metric_names_or_specs, scope)
+        specs = []
+        Array(metric_names_or_specs).map do |name_or_spec|
+          case name_or_spec
+          when String
+            specs << NewRelic::MetricSpec.new(name_or_spec)
+            specs << NewRelic::MetricSpec.new(name_or_spec, scope) if scope
+          when NewRelic::MetricSpec
+            specs << name_or_spec
+          end
+        end
+        specs
+      end
+
+      # For use by test code only.
+      def clear_stats
+        reset!
+        NewRelic::Agent::TransactionTimeAggregator.reset!
+      end
+
+      # For use by test code only.
+      def to_h
+        with_stats_lock { @stats_hash.to_h }
+      end
     end
   end
 end

data/lib/new_relic/agent/stats_engine/gc_profiler.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.
 
 # -*- coding: utf-8 -*-
 module NewRelic

data/lib/new_relic/agent/stats_engine/stats_hash.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 Hash-like class for storing metric data.
 #

data/lib/new_relic/agent/supported_versions.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
@@ -11,22 +11,22 @@ module NewRelic
       {
         :type        => :ruby,
         :name        => "MRI",
-        :supported   => ["2.0.0", "~> 2.1.0", "~> 2.2.0", "~> 2.3.0", "~> 2.4.0"],
+        :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.0.329.",
+        :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"],
+        :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.0.329."]
+        :notes       => ["Last supported agent for ~>1.7.0 was 3.18.1.330."]
       },
 
       # App servers
@@ -78,17 +78,17 @@ module NewRelic
       :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"],
+        :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.0.329.",
+        :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"],
+        :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"
       },
@@ -119,11 +119,12 @@ module NewRelic
       :activerecord =>
       {
         :type        => :database,
-        :supported   => ["~>2.1.0", "~>2.2.0", "~>2.3.0", "~>3.0.0", "~>3.1.0", "~>3.2.0", "~>4.0.0", "~>4.1.0", "~>4.2.0"],
-        :deprecated  => ["~>2.0.0"],
+        :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.0.x was 3.6.8.168"]
+        :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 =>
       {
@@ -149,7 +150,7 @@ module NewRelic
       :redis =>
       {
         :type        => :database,
-        :supported   => ["~> 3.0"],
+        :supported   => ["~>3.0"],
         :url         => "https://rubygems.org/gems/redis",
         :feed        => "https://rubygems.org/gems/redis/versions.atom"
       },
@@ -158,7 +159,7 @@ module NewRelic
       :rake =>
       {
         :type        => :background,
-        :supported   => ["~> 10.0"],
+        :supported   => ["~>10.0"],
         :url         => "https://rubygems.org/gems/rake",
         :feed        => "https://rubygems.org/gems/rake/versions.atom"
       },

data/lib/new_relic/agent/synthetics_event_aggregator.rb

@@ -1,33 +1,26 @@
 # -*- 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.
 
 require 'new_relic/agent/event_aggregator'
-require 'new_relic/agent/synthetics_event_buffer'
+require 'new_relic/agent/timestamp_sampled_buffer'
 
 module NewRelic
   module Agent
     class SyntheticsEventAggregator < EventAggregator
+      TIMESTAMP = 'timestamp'.freeze
 
       named :SyntheticsEventAggregator
       capacity_key :'synthetics.events_limit'
       enabled_key :'analytics_events.enabled'
-      buffer_class SyntheticsEventBuffer
+      buffer_class TimestampSampledBuffer
 
-      def append_or_reject event
+      def record event
         return unless enabled?
 
         @lock.synchronize do
-          @buffer.append_with_reject event
-        end
-      end
-
-      # slightly different semantics than the EventAggregator for merge
-      def merge! payload
-        _, events = payload
-        @lock.synchronize do
-          events.each { |e| @buffer.append_with_reject e}
+          @buffer.append event: event, priority: -event[0][TIMESTAMP]
         end
       end
 

data/lib/new_relic/agent/system_info.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.
 
 # This module is intended to provide access to information about the host OS and
 # [virtual] machine. It intentionally does no caching and maintains no state -
@@ -8,6 +8,7 @@
 # the requested information is unavailable.
 
 require 'rbconfig'
+require 'socket'
 
 module NewRelic
   module Agent
@@ -30,6 +31,10 @@ module NewRelic
 
       @processor_info = nil
 
+      def self.ip_addresses
+        Socket.ip_address_list.map(&:ip_address)
+      end
+
       def self.clear_processor_info
         @processor_info = nil
       end
@@ -165,15 +170,20 @@ module NewRelic
 
         container_id = case cpu_cgroup
         # docker native driver w/out systemd (fs)
-        when %r{^/docker/([0-9a-f]+)$}                      then $1
+        when /[0-9a-f]{64,}/
+          if $&.length == 64
+            $&
+          else # container ID is too long
+            ::NewRelic::Agent.logger.debug("Ignoring docker ID of invalid length: '#{cpu_cgroup}'")
+            return
+          end
         # docker native driver with systemd
-        when %r{^/system\.slice/docker-([0-9a-f]+)\.scope$} then $1
-        # docker lxc driver
-        when %r{^/lxc/([0-9a-f]+)$}                         then $1
-        # not in any cgroup
-        when '/'                                            then nil
+        when '/'              then nil
         # in a cgroup, but we don't recognize its format
-        when %r{docker}                                     then
+        when /docker\/.*[^0-9a-f]/ then
+          ::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id has invalid characters: '#{cpu_cgroup}'")
+          return
+        when /docker/ then
           ::NewRelic::Agent.logger.debug("Cgroup indicates docker but container_id unrecognized: '#{cpu_cgroup}'")
           ::NewRelic::Agent.increment_metric "Supportability/utilization/docker/error"
           return
@@ -251,6 +261,40 @@ module NewRelic
           nil
         end
       end
+
+      def self.boot_id
+        return nil unless linux?
+        if bid = proc_try_read('/proc/sys/kernel/random/boot_id')
+          bid.chomp!
+
+          if bid.ascii_only?
+            if bid.empty?
+              ::NewRelic::Agent.logger.debug("boot_id not found in /proc/sys/kernel/random/boot_id")
+              ::NewRelic::Agent.increment_metric "Supportability/utilization/boot_id/error"
+              nil
+
+            elsif bid.bytesize == 36
+              bid
+
+            else
+              ::NewRelic::Agent.logger.debug("Found boot_id with invalid length: #{bid}")
+              ::NewRelic::Agent.increment_metric "Supportability/utilization/boot_id/error"
+              bid[0,128]
+
+            end
+          else
+            ::NewRelic::Agent.logger.debug("Found boot_id with non-ASCII characters: #{bid}")
+            ::NewRelic::Agent.increment_metric "Supportability/utilization/boot_id/error"
+            nil
+
+          end
+        else
+          ::NewRelic::Agent.logger.debug("boot_id not found in /proc/sys/kernel/random/boot_id")
+          ::NewRelic::Agent.increment_metric "Supportability/utilization/boot_id/error"
+          nil
+
+        end
+      end
     end
   end
 end

data/lib/new_relic/agent/threading/agent_thread.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
@@ -37,10 +37,12 @@ module NewRelic
           if thread.key?(:newrelic_label)
             profile_agent_code ? :agent : :ignore
           else
-            state = TransactionState.tl_state_for(thread)
-            if state.in_background_transaction?
+            state = Tracer.state_for(thread)
+            txn   = state.current_transaction
+
+            if    txn && !txn.recording_web_transaction?
               :background
-            elsif state.in_web_transaction?
+            elsif txn &&  txn.recording_web_transaction?
               :request
             else
               :other