newrelic_rpm 6.11.0.365 → 6.12.0.367

data/lib/new_relic/agent/priority_sampled_buffer.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/heap'
 require 'new_relic/agent/event_buffer'
@@ -18,19 +18,22 @@ module NewRelic
         @seen_lifetime     = 0
       end
 
+      def heapify_items_array
+        if @items.is_a?(Array)
+          @items = Heap.new(@items) { |x| priority_for(x) } 
+        end
+      end
+
       # expects priority and a block, or an event as a hash with a `priority` key.
       def append(priority: nil, event: nil, &blk)
         increment_seen
 
         return if @capacity == 0
 
-        if @seen == @capacity
-          @items = Heap.new(@items) { |x| priority_for(x) }
-        end
-
         if full?
           priority ||= priority_for(event)
           if priority_for(@items[0]) < priority
+            heapify_items_array
             incoming = event || blk.call
             @items[0] = incoming
             @items.fix(0)

data/lib/new_relic/agent/range_extensions.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/rules_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/rules_engine/replacement_rule'
 require 'new_relic/agent/rules_engine/segment_terms_rule'

data/lib/new_relic/agent/rules_engine/replacement_rule.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/rules_engine/segment_terms_rule.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/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.
 #
 # A Sampler is used to capture meaningful metrics in a background thread
 # periodically.  They will be invoked about once a minute, each time the agent

data/lib/new_relic/agent/sampler_collection.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/samplers/cpu_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'
 

data/lib/new_relic/agent/samplers/delayed_job_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/delayed_job_injection'

data/lib/new_relic/agent/samplers/memory_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'
 

data/lib/new_relic/agent/samplers/object_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'
 

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

@@ -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 'newrelic_rpm' unless defined?( NewRelic )
 require 'new_relic/agent' unless defined?( NewRelic::Agent )

data/lib/new_relic/agent/span_event_primitive.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.
 # frozen_string_literal: true
 
 # This module builds the data structures necessary to create a Span
@@ -41,6 +41,7 @@ module NewRelic
       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'
@@ -61,7 +62,7 @@ module NewRelic
         intrinsics = intrinsics_for(segment)
         intrinsics[CATEGORY_KEY] = GENERIC_CATEGORY
 
-        [intrinsics, custom_attributes(segment.attributes), error_attributes(segment) || NewRelic::EMPTY_HASH]
+        [intrinsics, custom_attributes(segment), agent_attributes(segment)]
       end
 
       def for_external_request_segment segment
@@ -79,7 +80,7 @@ module NewRelic
           agent_attributes[HTTP_URL_KEY] = truncate(segment.uri)
         end
 
-        [intrinsics, custom_attributes(segment.attributes), agent_attributes]
+        [intrinsics, custom_attributes(segment), agent_attributes]
       end
 
       def for_datastore_segment segment
@@ -107,7 +108,7 @@ module NewRelic
           agent_attributes[DB_STATEMENT_KEY] = truncate(segment.nosql_statement, 2000)
         end
 
-        [intrinsics, custom_attributes(segment.attributes), agent_attributes]
+        [intrinsics, custom_attributes(segment), agent_attributes]
       end
 
       private
@@ -146,10 +147,16 @@ module NewRelic
         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 attributes
+      def custom_attributes segment
+        attributes = segment.attributes
         if attributes
           result = attributes.custom_attributes_for(NewRelic::Agent::AttributeFilter::DST_SPAN_EVENTS)
           result.freeze
@@ -158,6 +165,18 @@ module NewRelic
         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

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'
@@ -156,13 +156,13 @@ module NewRelic
 
       PRIORITY = "priority".freeze
 
-      def distributed_trace_intrinsics(state)
+      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
-          DistributedTraceIntrinsics.copy_from_transaction transaction, payload, params
+          DistributedTraceAttributes.copy_from_transaction transaction, payload, params
           params[PRIORITY] = transaction.priority
         end
         params
@@ -176,7 +176,7 @@ module NewRelic
         if state.is_sql_recorded?
           if duration > Agent.config[:'slow_sql.explain_threshold']
             backtrace = caller.join("\n")
-            params = distributed_trace_intrinsics state
+            params = distributed_trace_attributes state
             data.sql_data << SlowSql.new(statement, metric_name, duration, backtrace, params)
           end
         end

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'

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

data/lib/new_relic/agent/synthetics_event_aggregator.rb

@@ -1,7 +1,7 @@
 # -*- 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/timestamp_sampled_buffer'

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 -

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

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

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'

data/lib/new_relic/agent/timestamp_sampled_buffer.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/heap'
 

data/lib/new_relic/agent/tracer.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/transaction'
 require 'new_relic/agent/transaction/segment'

data/lib/new_relic/agent/transaction.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.
 # frozen_string_literal: true
 
 require 'new_relic/agent/instrumentation/queue_time'
@@ -208,6 +208,7 @@ module NewRelic
 
       def add_agent_attribute(key, value, default_destinations)
         @attributes.add_agent_attribute(key, value, default_destinations)
+        current_segment.add_agent_attribute(key, value) if current_segment
       end
 
       def self.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
@@ -220,6 +221,7 @@ module NewRelic
 
       def merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
         @attributes.merge_untrusted_agent_attributes(attributes, prefix, default_destinations)
+        current_segment.merge_untrusted_agent_attributes(attributes, prefix, default_destinations) if current_segment
       end
 
       @@java_classes_loaded = false
@@ -421,6 +423,10 @@ module NewRelic
         ignore! if user_defined_rules_ignore?
 
         create_initial_segment
+        Segment.merge_untrusted_agent_attributes \
+          @filtered_params,
+          :'request.parameters',
+          AttributeFilter::DST_SPAN_EVENTS
       end
 
       def initial_segment
@@ -507,6 +513,9 @@ module NewRelic
           initial_segment.name = @frozen_name
         end
 
+        initial_segment.transaction_name = @frozen_name
+        assign_segment_dt_attributes
+        assign_agent_attributes
         initial_segment.finish
 
         NewRelic::Agent::TransactionTimeAggregator.transaction_stop(@end_time, @starting_thread_id)
@@ -530,8 +539,6 @@ module NewRelic
 
       def commit!(outermost_node_name)
         generate_payload
-
-        assign_agent_attributes
         assign_intrinsics
 
         finalize_segments
@@ -551,6 +558,13 @@ module NewRelic
         send_transaction_finished_event
       end
 
+      def assign_segment_dt_attributes
+        dt_payload = distributed_tracer.trace_state_payload || distributed_tracer.distributed_trace_payload
+        parent_attributes = {}
+        DistributedTraceAttributes.copy_parent_attributes self, dt_payload, parent_attributes
+        parent_attributes.each { |k, v| initial_segment.add_agent_attribute k, v }
+      end
+
       def assign_agent_attributes
         default_destinations = AttributeFilter::DST_TRANSACTION_TRACER |
                                AttributeFilter::DST_TRANSACTION_EVENTS |
@@ -558,6 +572,9 @@ module NewRelic
 
         if http_response_code
           add_agent_attribute(:httpResponseCode, http_response_code.to_s, default_destinations)
+          # Sending status code as an int with http.statusCode key is correct
+          # The above attribute is deprecated and should be removed in agent version 7.0.0
+          add_agent_attribute(:'http.statusCode', http_response_code, default_destinations)
         end
 
         if response_content_length

data/lib/new_relic/agent/transaction/abstract_segment.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/range_extensions'
 require 'new_relic/agent/guid_generator'
@@ -21,12 +21,13 @@ module NewRelic
         # calculation in all other cases.
         #
         attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid
-        attr_accessor :name, :parent, :children_time, :transaction
+        attr_accessor :name, :parent, :children_time, :transaction, :transaction_name
         attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
         attr_reader :noticed_error
 
         def initialize name=nil, start_time=nil
           @name = name
+          @transaction_name = nil
           @transaction = nil
           @guid = NewRelic::Agent::GuidGenerator.generate_guid
           @parent = nil