newrelic_rpm 4.8.0.341 → 6.13.1

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

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

data/lib/new_relic/agent/threading/backtrace_node.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/threading/backtrace_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
@@ -36,8 +36,8 @@ module NewRelic
           @worker_loop = NewRelic::Agent::WorkerLoop.new
 
           # Memoize overhead % to avoid getting stale OR looked up every poll
-          @overhead_percent_threshold = NewRelic::Agent.config[:'xray_session.max_profile_overhead']
-          NewRelic::Agent.config.register_callback(:'xray_session.max_profile_overhead') do |new_value|
+          @overhead_percent_threshold = NewRelic::Agent.config[:'thread_profiler.max_profile_overhead']
+          NewRelic::Agent.config.register_callback(:'thread_profiler.max_profile_overhead') do |new_value|
             @overhead_percent_threshold = new_value
           end
 
@@ -213,7 +213,7 @@ module NewRelic
             if @buffer[thread].length < MAX_BUFFER_LENGTH
               @buffer[thread] << [timestamp, backtrace]
             else
-              NewRelic::Agent.increment_metric('Supportability/XraySessions/DroppedBacktraces')
+              NewRelic::Agent.increment_metric('Supportability/ThreadProfiler/DroppedBacktraces')
             end
           end
         end

data/lib/new_relic/agent/threading/thread_profile.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 'set'
 require 'new_relic/agent/worker_loop'
@@ -16,7 +16,7 @@ module NewRelic
 
         attr_reader :profile_id, :traces, :sample_period,
           :duration, :poll_count, :backtrace_count, :failure_count,
-          :created_at, :xray_id, :command_arguments, :profile_agent_code
+          :created_at, :command_arguments, :profile_agent_code
         attr_accessor :finished_at
 
         def initialize(command_arguments={})
@@ -25,7 +25,6 @@ module NewRelic
           @duration           = command_arguments.fetch('duration', 120)
           @sample_period      = command_arguments.fetch('sample_period', 0.1)
           @profile_agent_code = command_arguments.fetch('profile_agent_code', false)
-          @xray_id            = command_arguments.fetch('x_ray_id', nil)
           @finished = false
 
           @traces = {
@@ -51,14 +50,6 @@ module NewRelic
           @poll_count += 1
         end
 
-        def sample_count
-          xray? ? @backtrace_count : @poll_count
-        end
-
-        def xray?
-          !!@xray_id
-        end
-
         def empty?
           @backtrace_count == 0
         end
@@ -121,26 +112,21 @@ module NewRelic
         def to_collector_array(encoder)
           encoded_trace_tree = encoder.encode(generate_traces, :skip_normalization => true)
           result = [
-            int(self.profile_id),
-            float(self.created_at),
-            float(self.finished_at),
-            int(self.sample_count),
+            int(profile_id),
+            float(created_at),
+            float(finished_at),
+            int(poll_count),
             encoded_trace_tree,
-            int(self.unique_thread_count),
+            int(unique_thread_count),
             0 # runnable thread count, which we don't track
           ]
-          result << int(@xray_id) if xray?
           result
         end
 
         def to_log_description
-          id = if xray?
-                 "@xray_id: #{xray_id}"
-               else
-                 "@profile_id: #{profile_id}"
-               end
-
-          "#<ThreadProfile:#{object_id} #{id} @command_arguments=#{@command_arguments.inspect}>"
+          "#<ThreadProfile:#{object_id} "\
+            "@profile_id: #{profile_id} "\
+            "@command_arguments=#{@command_arguments.inspect}>"
         end
 
       end

data/lib/new_relic/agent/timestamp_sampled_buffer.rb

@@ -0,0 +1,19 @@
+# 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'
+
+module NewRelic
+  module Agent
+    class TimestampSampledBuffer < PrioritySampledBuffer
+      TIMESTAMP_KEY = "timestamp".freeze
+
+      private
+
+      def priority_for(event)
+        -event[0][TIMESTAMP_KEY]
+      end
+    end
+  end
+end

data/lib/new_relic/agent/tracer.rb

@@ -0,0 +1,509 @@
+# 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/transaction'
+require 'new_relic/agent/transaction/segment'
+require 'new_relic/agent/transaction/datastore_segment'
+require 'new_relic/agent/transaction/external_request_segment'
+require 'new_relic/agent/transaction/message_broker_segment'
+
+module NewRelic
+  module Agent
+    #
+    # This class helps you interact with the current transaction (if
+    # it exists), start new transactions/segments, etc.
+    #
+    # @api public
+    class Tracer
+      class << self
+        def state
+          state_for(Thread.current)
+        end
+
+        alias_method :tl_get, :state
+
+        # Returns +true+ unless called from within an
+        # +NewRelic::Agent.disable_all_tracing+ block.
+        #
+        # @api public
+        def tracing_enabled?
+          state.tracing_enabled?
+        end
+
+        # Returns the transaction in progress for this thread, or
+        # +nil+ if none exists.
+        #
+        # @api public
+        def current_transaction
+          state.current_transaction
+        end
+
+        # Returns the trace_id of the current_transaction, or +nil+ if
+        # none exists.
+        #
+        # @api public
+        def current_trace_id
+          if txn = current_transaction
+            txn.trace_id
+          end
+        end
+        alias_method :trace_id, :current_trace_id
+
+        # Returns the id of the current span, or +nil+ if none exists.
+        #
+        # @api public
+        def current_span_id
+          if span = current_segment
+            span.guid
+          end
+        end
+        alias_method :span_id, :current_span_id
+
+        # Returns a boolean indicating whether the current_transaction
+        # is sampled, or +nil+ if there is no current transaction.
+        #
+        # @api public
+        def transaction_sampled?
+          if txn = current_transaction
+            txn.sampled?
+          end
+        end
+        alias_method :sampled?, :transaction_sampled?
+
+        # Runs the given block of code in a transaction.
+        #
+        # @param [String] name reserved for New Relic internal use
+        #
+        # @param [String] partial_name a meaningful name for this
+        #   transaction (e.g., +blogs/index+); the Ruby agent will add a
+        #   New-Relic-specific prefix
+        #
+        # @param [Symbol] category +:web+ for web transactions or
+        #   +:background+ for background transactions
+        #
+        # @param [Hash] options reserved for New Relic internal use
+        #
+        # @api public
+        def in_transaction(name: nil,
+                           partial_name: nil,
+                           category: nil,
+                           options: {})
+
+          finishable = start_transaction_or_segment(
+            name: name,
+            partial_name: partial_name,
+            category: category,
+            options: options
+          )
+
+          begin
+            # We shouldn't raise from Tracer.start_transaction_or_segment, but
+            # only wrap the yield to be absolutely sure we don't report agent
+            # problems as app errors
+            yield
+          rescue => exception
+            current_transaction.notice_error(exception)
+            raise
+          ensure
+            finishable.finish if finishable
+          end
+        end
+
+        # Starts a segment on the current transaction (if one exists)
+        # or starts a new transaction otherwise.
+        #
+        # @param [String] name reserved for New Relic internal use
+        #
+        # @param [String] partial_name a meaningful name for this
+        #   transaction (e.g., +blogs/index+); the Ruby agent will add a
+        #   New-Relic-specific prefix
+        #
+        # @param [Symbol] category +:web+ for web transactions or
+        #   +:task+ for background transactions
+        #
+        # @param [Hash] options reserved for New Relic internal use
+        #
+        # @return [Object, #finish] an object that responds to
+        #   +finish+; you _must_ call +finish+ on it at the end of the
+        #   code you're tracing
+        #
+        # @api public
+        def start_transaction_or_segment(name: nil,
+                                         partial_name: nil,
+                                         category: nil,
+                                         options: {})
+          if name.nil? && partial_name.nil?
+            raise ArgumentError, 'missing required argument: name or partial_name'
+          end
+          if category.nil?
+            raise ArgumentError, 'missing required argument: category'
+          end
+
+          if name
+            options[:transaction_name] = name
+          else
+            options[:transaction_name] = Transaction.name_from_partial(
+              partial_name,
+              category
+            )
+          end
+
+          if (txn = current_transaction)
+            txn.create_nested_segment(category, options)
+          else
+            Transaction.start_new_transaction(state, category, options)
+          end
+
+        rescue ArgumentError
+          raise
+        rescue => exception
+          log_error('start_transaction_or_segment', exception)
+        end
+
+        # Takes name or partial_name and a category.
+        # Returns a transaction instance or nil
+        def start_transaction(name: nil,
+                              partial_name: nil,
+                              category: nil,
+                              **options)
+          if name.nil? && partial_name.nil?
+            raise ArgumentError, 'missing required argument: name or partial_name'
+          end
+          if category.nil?
+            raise ArgumentError, 'missing required argument: category'
+          end
+
+          return current_transaction if current_transaction
+
+          if name
+            options[:transaction_name] = name
+          else
+            options[:transaction_name] = Transaction.name_from_partial(
+              partial_name,
+              category
+            )
+          end
+
+          Transaction.start_new_transaction(state,
+                                            category,
+                                            options)
+        rescue ArgumentError
+          raise
+        rescue => exception
+          log_error('start_transaction', exception)
+        end
+
+        def create_distributed_trace_payload
+          return unless txn = current_transaction
+          txn.distributed_tracer.create_distributed_trace_payload
+        end
+
+        def accept_distributed_trace_payload(payload)
+          return unless txn = current_transaction
+          txn.distributed_tracer.accept_distributed_trace_payload(payload)
+        end
+
+        # Returns the currently active segment in the transaction in
+        # progress for this thread, or +nil+ if no segment or
+        # transaction exists.
+        #
+        # @api public
+        def current_segment
+          return unless txn = current_transaction
+          txn.current_segment
+        end
+
+        # Creates and starts a general-purpose segment used to time
+        # arbitrary code.
+        #
+        # @param [String] name full name of the segment; the agent
+        #   will not add a prefix. Third-party users should begin the
+        #   name with +Custom/+; e.g.,
+        #   +Custom/UserMailer/send_welcome_email+
+        #
+        # @param [optional, String, Array] unscoped_metrics additional
+        #   unscoped metrics to record using this segment's timing
+        #   information
+        #
+        # @param start_time [optional, Time] a +Time+ instance
+        #   denoting the start time of the segment. Value is set by
+        #   AbstractSegment#start if not given.
+        #
+        # @param parent [optional, Segment] Use for the rare cases
+        #   (such as async) where the parent segment should be something
+        #   other than the current segment
+        #
+        # @return [Segment] the newly created segment; you _must_ call
+        #   +finish+ on it at the end of the code you're tracing
+        #
+        # @api public
+        def start_segment(name:nil,
+                          unscoped_metrics:nil,
+                          start_time: nil,
+                          parent: nil)
+
+          # ruby 2.0.0 does not support required kwargs
+          raise ArgumentError, 'missing required argument: name' if name.nil?
+
+          segment = Transaction::Segment.new name, unscoped_metrics, start_time
+          start_and_add_segment segment, parent
+
+        rescue ArgumentError
+          raise
+        rescue => exception
+          log_error('start_segment', exception)
+        end
+
+        UNKNOWN = "Unknown".freeze
+        OTHER = "other".freeze
+
+        # Creates and starts a datastore segment used to time
+        # datastore operations.
+        #
+        # @param [String] product the datastore name for use in metric
+        #   naming, e.g. "FauxDB"
+        #
+        # @param [String] operation the name of the operation
+        #   (e.g. "select"), often named after the method that's being
+        #   instrumented.
+        #
+        # @param [optional, String] collection the collection name for use in
+        #   statement-level metrics (i.e. table or model name)
+        #
+        # @param [optional, String] host the host this database
+        #   instance is running on
+        #
+        # @param [optional, String] port_path_or_id TCP port, file
+        #   path, UNIX domain socket, or other connection-related info
+        #
+        # @param [optional, String] database_name the name of this
+        #   database
+        #
+        # @param start_time [optional, Time] a +Time+ instance
+        #   denoting the start time of the segment. Value is set by
+        #   AbstractSegment#start if not given.
+        #
+        # @param parent [optional, Segment] Use for the rare cases
+        #   (such as async) where the parent segment should be something
+        #   other than the current segment
+        #
+        # @return [DatastoreSegment] the newly created segment; you
+        #   _must_ call +finish+ on it at the end of the code you're
+        #   tracing
+        #
+        # @api public
+        def start_datastore_segment(product: nil,
+                                    operation: nil,
+                                    collection: nil,
+                                    host: nil,
+                                    port_path_or_id: nil,
+                                    database_name: nil,
+                                    start_time: nil,
+                                    parent: nil)
+
+          product ||= UNKNOWN
+          operation ||= OTHER
+
+          segment = Transaction::DatastoreSegment.new product, operation, collection, host, port_path_or_id, database_name
+          start_and_add_segment segment, parent
+
+        rescue ArgumentError
+          raise
+        rescue => exception
+          log_error('start_datastore_segment', exception)
+        end
+
+        # Creates and starts an external request segment using the
+        # given library, URI, and procedure. This is used to time
+        # external calls made over HTTP.
+        #
+        # @param [String] library a string of the class name of the library used to
+        #   make the external call, for example, 'Net::HTTP'.
+        #
+        # @param [String, URI] uri indicates the URI to which the
+        #   external request is being made. The URI should begin with the protocol,
+        #   for example, 'https://github.com'.
+        #
+        # @param [String] procedure the HTTP method being used for the external
+        #   request as a string, for example, 'GET'.
+        #
+        # @param start_time [optional, Time] a +Time+ instance
+        #   denoting the start time of the segment. Value is set by
+        #   AbstractSegment#start if not given.
+        #
+        # @param parent [optional, Segment] Use for the rare cases
+        #   (such as async) where the parent segment should be something
+        #   other than the current segment
+        #
+        # @return [ExternalRequestSegment] the newly created segment;
+        #   you _must_ call +finish+ on it at the end of the code
+        #   you're tracing
+        #
+        # @api public
+        def start_external_request_segment(library: nil,
+                                           uri: nil,
+                                           procedure: nil,
+                                           start_time: nil,
+                                           parent: nil)
+
+          # ruby 2.0.0 does not support required kwargs
+          raise ArgumentError, 'missing required argument: library' if library.nil?
+          raise ArgumentError, 'missing required argument: uri' if uri.nil?
+          raise ArgumentError, 'missing required argument: procedure' if procedure.nil?
+
+          segment = Transaction::ExternalRequestSegment.new library, uri, procedure, start_time
+          start_and_add_segment segment, parent
+
+        rescue ArgumentError
+          raise
+        rescue => exception
+          log_error('start_external_request_segment', exception)
+        end
+
+        # Will potentially capture and notice an error at the
+        # segment that was executing when error occurred.
+        # if passed +segment+ is something that doesn't 
+        # respond to +notice_segment_error+ then this method
+        # is effectively just a yield to the given &block
+        def capture_segment_error segment
+          return unless block_given?
+          yield
+        rescue => exception
+          if segment && segment.is_a?(Transaction::AbstractSegment)
+            segment.notice_error exception
+          end
+          raise
+        end
+
+        # For New Relic internal use only.
+        def start_message_broker_segment(action: nil,
+                                         library: nil,
+                                         destination_type: nil,
+                                         destination_name: nil,
+                                         headers: nil,
+                                         parameters: nil,
+                                         start_time: nil,
+                                         parent: nil)
+
+          # ruby 2.0.0 does not support required kwargs
+          raise ArgumentError, 'missing required argument: action' if action.nil?
+          raise ArgumentError, 'missing required argument: library' if library.nil?
+          raise ArgumentError, 'missing required argument: destination_type' if destination_type.nil?
+          raise ArgumentError, 'missing required argument: destination_name' if destination_name.nil?
+
+          segment = Transaction::MessageBrokerSegment.new(
+            action: action,
+            library: library,
+            destination_type: destination_type,
+            destination_name: destination_name,
+            headers: headers,
+            parameters: parameters,
+            start_time: start_time
+          )
+          start_and_add_segment segment, parent
+
+        rescue ArgumentError
+          raise
+        rescue => exception
+          log_error('start_datastore_segment', exception)
+        end
+
+        # This method should only be used by Tracer for access to the
+        # current thread's state or to provide read-only accessors for other threads
+        #
+        # If ever exposed, this requires additional synchronization
+        def state_for(thread)
+          state = thread[:newrelic_tracer_state]
+
+          if state.nil?
+            state = Tracer::State.new
+            thread[:newrelic_tracer_state] = state
+          end
+
+          state
+        end
+
+        alias_method :tl_state_for, :state_for
+
+        def clear_state
+          Thread.current[:newrelic_tracer_state] = nil
+        end
+
+        alias_method :tl_clear, :clear_state
+
+        private
+
+        def start_and_add_segment segment, parent = nil
+          tracer_state = state
+          if (txn = tracer_state.current_transaction) &&
+            tracer_state.tracing_enabled?
+            txn.add_segment segment, parent
+          else
+            segment.record_metrics = false
+          end
+          segment.start
+          segment
+        end
+
+        def log_error(method_name, exception)
+          NewRelic::Agent.logger.error("Exception during Tracer.#{method_name}", exception)
+          nil
+        end
+      end
+
+      # This is THE location to store thread local information during a transaction
+      # Need a new piece of data? Add a method here, NOT a new thread local variable.
+      class State
+
+        def initialize
+          @untraced = []
+          @current_transaction = nil
+          @record_sql = nil
+        end
+
+        # This starts the timer for the transaction.
+        def reset(transaction=nil)
+          # We purposefully don't reset @untraced or @record_sql
+          # since those are managed by NewRelic::Agent.disable_* calls explicitly
+          # and (more importantly) outside the scope of a transaction
+
+          @current_transaction = transaction
+          @sql_sampler_transaction_data = nil
+        end
+
+        # Current transaction stack
+        attr_reader :current_transaction
+
+        # Execution tracing on current thread
+        attr_accessor :untraced
+
+        def push_traced(should_trace)
+          @untraced << should_trace
+        end
+
+        def pop_traced
+          @untraced.pop if @untraced
+        end
+
+        def is_execution_traced?
+          @untraced.nil? || @untraced.last != false
+        end
+
+        alias_method :tracing_enabled?, :is_execution_traced?
+
+        # TT's and SQL
+        attr_accessor :record_sql
+
+        def is_sql_recorded?
+          @record_sql != false
+        end
+
+        # Sql Sampler Transaction Data
+        attr_accessor :sql_sampler_transaction_data
+      end
+    end
+
+    TransactionState = Tracer
+  end
+end