newrelic_rpm 4.8.0.341 → 6.13.1

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

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/sampler'
 require 'new_relic/agent/vm'

data/lib/new_relic/agent/span_event_aggregator.rb

@@ -0,0 +1,49 @@
+# 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 'newrelic_rpm' unless defined?( NewRelic )
+require 'new_relic/agent' unless defined?( NewRelic::Agent )
+require 'new_relic/agent/event_aggregator'
+require 'new_relic/agent/priority_sampled_buffer'
+
+module NewRelic
+  module Agent
+    class SpanEventAggregator < EventAggregator
+      named :SpanEventAggregator
+      capacity_key :'span_events.max_samples_stored'
+
+      enabled_keys :'span_events.enabled',
+                   :'distributed_tracing.enabled'
+
+      def record priority: nil, event:nil, &blk
+        unless(event || priority && blk)
+          raise ArgumentError, "Expected priority and block, or event"
+        end
+
+        return unless enabled?
+
+        @lock.synchronize do
+          @buffer.append priority: priority, event: event, &blk
+          notify_if_full
+        end
+      end
+
+      SUPPORTABILITY_TOTAL_SEEN = "Supportability/SpanEvent/TotalEventsSeen".freeze
+      SUPPORTABILITY_TOTAL_SENT = "Supportability/SpanEvent/TotalEventsSent".freeze
+      SUPPORTABILITY_DISCARDED  = "Supportability/SpanEvent/Discarded".freeze
+
+      def after_harvest metadata
+        seen      = metadata[:seen]
+        sent      = metadata[:captured]
+        discarded = seen - sent
+
+        ::NewRelic::Agent.record_metric(SUPPORTABILITY_TOTAL_SEEN, count: seen)
+        ::NewRelic::Agent.record_metric(SUPPORTABILITY_TOTAL_SENT, count: sent)
+        ::NewRelic::Agent.record_metric(SUPPORTABILITY_DISCARDED,  count: discarded)
+
+        super
+      end
+    end
+  end
+end

data/lib/new_relic/agent/span_event_primitive.rb

@@ -0,0 +1,206 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
+# frozen_string_literal: true
+
+# This module builds the data structures necessary to create a Span
+# event for a segment.
+
+require 'new_relic/agent/payload_metric_mapping'
+require 'new_relic/agent/distributed_tracing/distributed_trace_payload'
+
+module NewRelic
+  module Agent
+    module SpanEventPrimitive
+      include NewRelic::Coerce
+      extend self
+
+      # Strings for static keys of the event structure
+      ELLIPSIS             = '...'
+      TYPE_KEY             = 'type'
+      TRACE_ID_KEY         = 'traceId'
+      GUID_KEY             = 'guid'
+      PARENT_ID_KEY        = 'parentId'
+      GRANDPARENT_ID_KEY   = 'grandparentId'
+      TRANSACTION_ID_KEY   = 'transactionId'
+      SAMPLED_KEY          = 'sampled'
+      PRIORITY_KEY         = 'priority'
+      TIMESTAMP_KEY        = 'timestamp'
+      DURATION_KEY         = 'duration'
+      NAME_KEY             = 'name'
+      CATEGORY_KEY         = 'category'
+      HTTP_URL_KEY         = 'http.url'
+      HTTP_METHOD_KEY      = 'http.method'
+      HTTP_STATUS_CODE_KEY = 'http.statusCode'
+      COMPONENT_KEY        = 'component'
+      DB_INSTANCE_KEY      = 'db.instance'
+      DB_STATEMENT_KEY     = 'db.statement'
+      PEER_ADDRESS_KEY     = 'peer.address'
+      PEER_HOSTNAME_KEY    = 'peer.hostname'
+      SPAN_KIND_KEY        = 'span.kind'
+      ENTRY_POINT_KEY      = 'nr.entryPoint'
+      TRUSTED_PARENT_KEY   = "trustedParentId"
+      TRACING_VENDORS_KEY  = "tracingVendors"
+      TRANSACTION_NAME_KEY = 'transaction.name'
+
+      # Strings for static values of the event structure
+      EVENT_TYPE         = 'Span'
+      GENERIC_CATEGORY   = 'generic'
+      HTTP_CATEGORY      = 'http'
+      DATASTORE_CATEGORY = 'datastore'
+      CLIENT             = 'client'
+
+      # Builds a Hash of error attributes as well as the Span ID when
+      # an error is present.  Otherwise, returns nil when no error present.
+      def error_attributes segment
+        return if Agent.config[:high_security] || !segment.noticed_error
+        segment.noticed_error.build_error_attributes
+        segment.noticed_error_attributes
+      end
+
+      def for_segment segment
+        intrinsics = intrinsics_for(segment)
+        intrinsics[CATEGORY_KEY] = GENERIC_CATEGORY
+
+        [intrinsics, custom_attributes(segment), agent_attributes(segment)]
+      end
+
+      def for_external_request_segment segment
+        intrinsics = intrinsics_for(segment)
+
+        intrinsics[COMPONENT_KEY]   = segment.library
+        intrinsics[HTTP_METHOD_KEY] = segment.procedure
+        intrinsics[HTTP_STATUS_CODE_KEY] = segment.http_status_code if segment.http_status_code
+        intrinsics[CATEGORY_KEY]    = HTTP_CATEGORY
+        intrinsics[SPAN_KIND_KEY]   = CLIENT
+
+        agent_attributes = error_attributes(segment) || {}
+
+        if allowed?(HTTP_URL_KEY)
+          agent_attributes[HTTP_URL_KEY] = truncate(segment.uri)
+        end
+
+        [intrinsics, custom_attributes(segment), agent_attributes]
+      end
+
+      def for_datastore_segment segment
+        intrinsics = intrinsics_for(segment)
+
+        intrinsics[COMPONENT_KEY] = segment.product
+        intrinsics[SPAN_KIND_KEY] = CLIENT
+        intrinsics[CATEGORY_KEY] = DATASTORE_CATEGORY
+
+        agent_attributes = error_attributes(segment) || {}
+
+        if segment.database_name && allowed?(DB_INSTANCE_KEY)
+          agent_attributes[DB_INSTANCE_KEY] = truncate(segment.database_name)
+        end
+        if segment.host && segment.port_path_or_id && allowed?(PEER_ADDRESS_KEY)
+          agent_attributes[PEER_ADDRESS_KEY] = truncate("#{segment.host}:#{segment.port_path_or_id}")
+        end
+        if segment.host && allowed?(PEER_HOSTNAME_KEY)
+          agent_attributes[PEER_HOSTNAME_KEY] = truncate(segment.host)
+        end
+
+        if segment.sql_statement && allowed?(DB_STATEMENT_KEY)
+          agent_attributes[DB_STATEMENT_KEY] = truncate(segment.sql_statement.safe_sql, 2000)
+        elsif segment.nosql_statement && allowed?(DB_STATEMENT_KEY)
+          agent_attributes[DB_STATEMENT_KEY] = truncate(segment.nosql_statement, 2000)
+        end
+
+        [intrinsics, custom_attributes(segment), agent_attributes]
+      end
+
+      private
+
+      def intrinsics_for segment
+        intrinsics = {
+          TYPE_KEY           => EVENT_TYPE,
+          TRACE_ID_KEY       => segment.transaction.trace_id,
+          GUID_KEY           => segment.guid,
+          TRANSACTION_ID_KEY => segment.transaction.guid,
+          PRIORITY_KEY       => segment.transaction.priority,
+          TIMESTAMP_KEY      => milliseconds_since_epoch(segment),
+          DURATION_KEY       => segment.duration,
+          NAME_KEY           => segment.name
+        }
+
+        # with infinite-tracing, transactions may or may not be sampled!
+        if segment.transaction.sampled?
+          intrinsics[SAMPLED_KEY] = true
+        end
+
+        if segment.parent.nil?
+          intrinsics[ENTRY_POINT_KEY] = true
+          if txn = segment.transaction
+            if header_data = txn.distributed_tracer.trace_context_header_data
+              if trace_state_vendors = header_data.trace_state_vendors
+                intrinsics[TRACING_VENDORS_KEY] = trace_state_vendors unless trace_state_vendors == NewRelic::EMPTY_STR
+              end
+            end
+            if trace_state_payload = txn.distributed_tracer.trace_state_payload
+              intrinsics[TRUSTED_PARENT_KEY] = trace_state_payload.id if trace_state_payload.id
+            end
+          end
+        end
+
+        if parent_id = parent_guid(segment)
+          intrinsics[PARENT_ID_KEY] = parent_id
+        end
+
+        if segment.transaction_name
+          intrinsics[TRANSACTION_NAME_KEY] = segment.transaction_name
+        end
+
+        intrinsics
+      end
+
+      def custom_attributes segment
+        attributes = segment.attributes
+        if attributes
+          result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_SPAN_EVENTS)
+          result.freeze
+        else
+          NewRelic::EMPTY_HASH
+        end
+      end
+
+      def agent_attributes segment
+        attributes = segment.attributes
+        agent_attributes = attributes.agent_attributes_for(NewRelic::Agent::AttributeFilter::DST_SPAN_EVENTS)
+        error_attributes = error_attributes(segment)
+        if agent_attributes || error_attributes
+          agent_attributes.merge!(error_attributes) if error_attributes
+          agent_attributes.freeze
+        else
+          NewRelic::EMPTY_HASH
+        end
+      end
+
+      def parent_guid segment
+        if segment.parent
+          segment.parent.guid
+        elsif txn = segment.transaction
+          txn.distributed_tracer.parent_guid
+        end
+      end
+
+      def milliseconds_since_epoch segment
+        Integer(segment.start_time.to_f * 1000.0)
+      end
+
+      def truncate value, max_size=255
+        value = value.to_s
+        if value.bytesize > max_size
+          value.byteslice(0, max_size - 2).chop! << ELLIPSIS
+        else
+          value
+        end
+      end
+
+      def allowed? key
+        NewRelic::Agent.instance.attribute_filter.allows_key?(key, AttributeFilter::DST_SPAN_EVENTS)
+      end
+    end
+  end
+end

data/lib/new_relic/agent/sql_sampler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'zlib'
 require 'base64'
@@ -61,7 +61,7 @@ module NewRelic
       end
 
       def tl_transaction_data # only used for testing
-        TransactionState.tl_get.sql_sampler_transaction_data
+        Tracer.state.sql_sampler_transaction_data
       end
 
       # This is called when we are done with the transaction.
@@ -141,7 +141,7 @@ module NewRelic
       # @deprecated Use {Datastores.notice_sql} instead.
       #
       def notice_sql(sql, metric_name, config, duration, state=nil, explainer=nil, binds=nil, name=nil) #THREAD_LOCAL_ACCESS sometimes
-        state ||= TransactionState.tl_get
+        state ||= Tracer.state
         data = state.sql_sampler_transaction_data
         return unless data
 
@@ -154,15 +154,30 @@ module NewRelic
         end
       end
 
+      PRIORITY = "priority".freeze
+
+      def distributed_trace_attributes(state)
+        transaction = state.current_transaction
+        params = nil
+        if transaction && transaction.distributed_tracer.distributed_trace_payload
+          params = {}
+          payload = transaction.distributed_tracer.distributed_trace_payload
+          DistributedTraceAttributes.copy_from_transaction transaction, payload, params
+          params[PRIORITY] = transaction.priority
+        end
+        params
+      end
+
       def notice_sql_statement(statement, metric_name, duration)
-        state ||= TransactionState.tl_get
+        state ||= Tracer.state
         data = state.sql_sampler_transaction_data
         return unless data
 
         if state.is_sql_recorded?
           if duration > Agent.config[:'slow_sql.explain_threshold']
             backtrace = caller.join("\n")
-            data.sql_data << SlowSql.new(statement, metric_name, duration, backtrace)
+            params = distributed_trace_attributes state
+            data.sql_data << SlowSql.new(statement, metric_name, duration, backtrace, params)
           end
         end
       end
@@ -225,11 +240,12 @@ module NewRelic
       attr_reader :duration
       attr_reader :backtrace
 
-      def initialize(statement, metric_name, duration, backtrace=nil)
+      def initialize(statement, metric_name, duration, backtrace=nil, params=nil)
         @statement = statement
         @metric_name = metric_name
         @duration = duration
         @backtrace = backtrace
+        @params = params
       end
 
       def sql
@@ -237,7 +253,7 @@ module NewRelic
       end
 
       def base_params
-        params = {}
+        params = @params || {}
 
         if NewRelic::Agent.config[:'datastore_tracer.instance_reporting.enabled']
           params[:host] = statement.host if statement.host

data/lib/new_relic/agent/stats.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
     class Stats

data/lib/new_relic/agent/stats_engine.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under New Relic's license terms.
-# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+# See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 
 require 'new_relic/agent/stats_engine/gc_profiler'
 require 'new_relic/agent/stats_engine/stats_hash'
@@ -61,7 +61,7 @@ module NewRelic
       # @api private
       #
       def tl_record_unscoped_metrics(metric_names, value=nil, aux=nil, &blk)
-        state = NewRelic::Agent::TransactionState.tl_get
+        state = NewRelic::Agent::Tracer.state
         record_unscoped_metrics(state, metric_names, value, aux, &blk)
       end
 
@@ -97,7 +97,7 @@ module NewRelic
       # @api private
       #
       def tl_record_scoped_and_unscoped_metrics(scoped_metric, summary_metrics=nil, value=nil, aux=nil, &blk)
-        state = NewRelic::Agent::TransactionState.tl_get
+        state = NewRelic::Agent::Tracer.state
         record_scoped_and_unscoped_metrics(state, scoped_metric, summary_metrics, value, aux, &blk)
       end
 
@@ -186,7 +186,7 @@ module NewRelic
       # For use by test code only.
       def clear_stats
         reset!
-        NewRelic::Agent::BusyCalculator.reset
+        NewRelic::Agent::TransactionTimeAggregator.reset!
       end
 
       # For use by test code only.

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,7 +11,7 @@ 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",
@@ -119,7 +119,7 @@ module NewRelic
       :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"],
+        :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",

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