newrelic_rpm 5.2.0.345 → 5.3.0.346

data/lib/new_relic/agent/transaction.rb

@@ -57,9 +57,7 @@ module NewRelic
                     :process_cpu_start,
                     :http_response_code,
                     :response_content_length,
-                    :response_content_type,
-                    :sampled,
-                    :priority
+                    :response_content_type
 
       attr_reader :guid,
                   :metrics,
@@ -73,6 +71,9 @@ module NewRelic
                   :segments,
                   :end_time
 
+      attr_writer :sampled,
+                  :priority
+
       # Populated with the trace sample once this transaction is completed.
       attr_reader :transaction_trace
 
@@ -283,15 +284,8 @@ module NewRelic
         @ignore_enduser = options.fetch(:ignore_enduser, false)
         @ignore_trace = false
 
-        if Agent.config[:'distributed_tracing.enabled']
-          @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
-        else
-          @sampled = nil
-        end
-
-        # we will eventually add this behavior into the AdaptiveSampler (ThroughputMontor)
-        @priority = rand
-        @priority +=1 if @sampled
+        @sampled = nil
+        @priority = nil
 
         @attributes = Attributes.new(NewRelic::Agent.instance.attribute_filter)
 
@@ -305,9 +299,21 @@ module NewRelic
       end
 
       def sampled?
+        return unless Agent.config[:'distributed_tracing.enabled']
+        if @sampled.nil?
+          @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
+        end
         @sampled
       end
 
+      def priority
+        if @priority.nil?
+          @priority = rand.round(6)
+          @priority += 1 if sampled?
+        end
+        @priority
+      end
+
       def referer
         @request_attributes && @request_attributes.referer
       end
@@ -602,7 +608,7 @@ module NewRelic
       end
 
       def assign_intrinsics(state)
-        attributes.add_intrinsic_attribute :'sampled', sampled?
+        attributes.add_intrinsic_attribute(:priority, priority)
 
         if gc_time = calculate_gc_time
           attributes.add_intrinsic_attribute(:gc_time, gc_time)
@@ -618,7 +624,7 @@ module NewRelic
           attributes.add_intrinsic_attribute(:synthetics_monitor_id, synthetics_monitor_id)
         end
 
-        if distributed_trace_payload || distributed_trace_payload_created?
+        if Agent.config[:'distributed_tracing.enabled']
           assign_distributed_trace_intrinsics
         elsif state.is_cross_app?
           attributes.add_intrinsic_attribute(:trip_id, cat_trip_id)
@@ -655,11 +661,9 @@ module NewRelic
           :metrics              => @metrics,
           :attributes           => @attributes,
           :error                => false,
-          :priority             => @priority
+          :priority             => priority
         }
 
-        @payload[:'sampled'] = sampled? if Agent.config[:'distributed_tracing.enabled']
-
         append_cat_info(state, duration, @payload)
         append_distributed_trace_info(@payload)
         append_apdex_perf_zone(duration, @payload)

data/lib/new_relic/agent/transaction/abstract_segment.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/range_extensions'
+require 'securerandom'
 
 module NewRelic
   module Agent
@@ -16,16 +17,17 @@ module NewRelic
         # a segments children time. The reason for this is that computing
         # exclusive duration using time ranges is expensive and it's only
         # necessary if a segment's children run concurrently, or a segment ends
-        # after it's parent. We will use the optimized exclusive duration
+        # after its parent. We will use the optimized exclusive duration
         # calculation in all other cases.
         #
-        attr_reader :start_time, :end_time, :duration, :exclusive_duration
+        attr_reader :start_time, :end_time, :duration, :exclusive_duration, :guid
         attr_accessor :name, :parent, :children_time, :transaction
         attr_writer :record_metrics, :record_scoped_metric, :record_on_finish
 
         def initialize name=nil, start_time=nil
           @name = name
           @transaction = nil
+          @guid = SecureRandom.hex(8)
           @parent = nil
           @params = nil
           @start_time = start_time if start_time

data/lib/new_relic/agent/transaction/datastore_segment.rb

@@ -67,6 +67,23 @@ module NewRelic
           @sql_statement = Database::Statement.new sql, config, explainer, binds, name, host, port_path_or_id, database_name
         end
 
+        # Method for simplifying attaching non-SQL data statements to a
+        # transaction. For instance, Mongo or CQL queries, Memcached or Redis
+        # keys would all be appropriate data to attach as statements.
+        #
+        # Data passed to this method is NOT obfuscated by New Relic, so please
+        # ensure that user information is obfuscated if the agent setting
+        # `transaction_tracer.record_sql` is set to `obfuscated`
+        #
+        # @param [String] nosql_statement text of the statement to capture.
+        #
+        # @note THERE ARE SECURITY CONCERNS WHEN CAPTURING STATEMENTS!
+        #   This method will properly ignore statements when the user has turned
+        #   off capturing queries, but it is not able to obfuscate arbitrary data!
+        #   To prevent exposing user information embedded in captured queries,
+        #   please ensure all data passed to this method is safe to transmit to
+        #   New Relic.
+
         def notice_nosql_statement nosql_statement
           return unless record_sql?
           @nosql_statement = Database.truncate_query(nosql_statement)
@@ -120,6 +137,15 @@ module NewRelic
         def record_sql?
           transaction_state.is_sql_recorded?
         end
+
+        def record_span_event
+          aggregator = ::NewRelic::Agent.agent.span_event_aggregator
+          priority   = transaction.priority
+
+          aggregator.record(priority: priority) do
+            SpanEventPrimitive.for_datastore_segment(self)
+          end
+        end
       end
     end
   end

data/lib/new_relic/agent/transaction/distributed_tracing.rb

@@ -35,7 +35,9 @@ module NewRelic
         def accept_distributed_trace_payload payload
           return unless Agent.config[:'distributed_tracing.enabled']
           return false if check_payload_ignored(payload)
+          return false unless check_payload_present(payload)
           return false unless payload = decode_payload(payload)
+          return false unless check_required_fields_present(payload)
           return false unless check_valid_version(payload)
           return false unless check_trusted_account(payload)
 
@@ -61,14 +63,7 @@ module NewRelic
           # The payload comes from our parent transaction, so its ID
           # is our parent ID.
           #
-          distributed_trace_payload && distributed_trace_payload.id
-        end
-
-        def grandparent_id
-          # The payload comes from our parent transaction, so its
-          # parent ID is our grandparent ID.
-          #
-          distributed_trace_payload && distributed_trace_payload.parent_id
+          distributed_trace_payload && distributed_trace_payload.transaction_id
         end
 
         def distributed_trace_payload_created?
@@ -81,16 +76,16 @@ module NewRelic
           return unless Agent.config[:'distributed_tracing.enabled']
           if distributed_trace_payload
             distributed_trace_payload.assign_intrinsics self, transaction_payload
-          elsif distributed_trace_payload_created?
-            DistributedTracePayload.assign_intrinsics_for_first_trace self, transaction_payload
+          else
+            DistributedTracePayload.assign_initial_intrinsics self, transaction_payload
           end
         end
 
         def assign_distributed_trace_intrinsics
           return unless Agent.config[:'distributed_tracing.enabled']
           DistributedTracePayload::INTRINSIC_KEYS.each do |key|
-            next unless value = @payload[key]
-            attributes.add_intrinsic_attribute key, value
+            next unless @payload.key? key
+            attributes.add_intrinsic_attribute key, @payload[key]
           end
           nil
         end
@@ -100,7 +95,8 @@ module NewRelic
         # for metrics and intrinsics.
         def transport_duration
           return unless distributed_trace_payload
-          (start_time.to_f * 1000 - distributed_trace_payload.timestamp) / 1000
+          duration = (start_time.to_f * 1000 - distributed_trace_payload.timestamp) / 1000
+          duration < 0 ? 0 : duration
         end
 
         private
@@ -111,10 +107,7 @@ module NewRelic
         SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_BROWSER = "Supportability/DistributedTrace/AcceptPayload/Ignored/BrowserAgentInjected".freeze
 
         def check_payload_ignored(payload)
-          if payload.nil?
-            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_NULL
-            return true
-          elsif distributed_trace_payload
+          if distributed_trace_payload
             NewRelic::Agent.increment_metric SUPPORTABILITY_MULTIPLE_ACCEPT_PAYLOAD
             return true
           elsif distributed_trace_payload_created?
@@ -124,21 +117,55 @@ module NewRelic
           false
         end
 
+        NULL_PAYLOAD = 'null'.freeze
+
+        def check_payload_present(payload)
+          # We might be passed a Ruby `nil` object _or_ the JSON "null"
+          if payload.nil? || payload == NULL_PAYLOAD
+            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_NULL
+            return nil
+          end
+
+          payload
+        end
+
         SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_PARSE_EXCEPTION = "Supportability/DistributedTrace/AcceptPayload/ParseException".freeze
         LBRACE = "{".freeze
 
         def decode_payload(payload)
-          if payload.start_with? LBRACE
+          decoded = if payload.start_with? LBRACE
             DistributedTracePayload.from_json payload
           else
             DistributedTracePayload.from_http_safe payload
           end
+
+          return nil unless check_payload_present(decoded)
+
+          decoded
         rescue => e
           NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_PARSE_EXCEPTION
           NewRelic::Agent.logger.warn "Error parsing distributed trace payload", e
           nil
         end
 
+        def check_required_fields_present(payload)
+          if \
+            !payload.version.nil? &&
+            !payload.parent_account_id.nil? &&
+            !payload.parent_app_id.nil? &&
+            !payload.parent_type.nil? &&
+            (!payload.transaction_id.nil? || !payload.id.nil?) &&
+            !payload.trace_id.nil? &&
+            !payload.timestamp.nil? &&
+            !payload.parent_account_id.nil?
+
+            true
+          else
+            NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_PARSE_EXCEPTION
+            false
+          end
+        end
+
         SUPPORTABILITY_PAYLOAD_ACCEPT_IGNORED_MAJOR_VERSION = "Supportability/DistributedTrace/AcceptPayload/Ignored/MajorVersion".freeze
 
         def check_valid_version(payload)
@@ -153,14 +180,11 @@ module NewRelic
         SUPPORTABILITY_PAYLOAD_ACCEPT_UNTRUSTED_ACCOUNT = "Supportability/DistributedTrace/AcceptPayload/Ignored/UntrustedAccount".freeze
 
         def check_trusted_account(payload)
-          trusted_account_ids = NewRelic::Agent.config[:trusted_account_ids]
-          trusted = trusted_account_ids.include?(payload.parent_account_id.to_i)
-
-          unless trusted
+          compare_key = payload.trusted_account_key || payload.parent_account_id
+          unless compare_key == NewRelic::Agent.config[:trusted_account_key]
             NewRelic::Agent.increment_metric SUPPORTABILITY_PAYLOAD_ACCEPT_UNTRUSTED_ACCOUNT
             return false
           end
-
           true
         end
 

data/lib/new_relic/agent/transaction/external_request_segment.rb

@@ -211,12 +211,12 @@ module NewRelic
           CrossAppTracing.insert_request_headers request, txn_guid, trip_id, path_hash
         end
 
-        X_NEWRELIC_TRACE_HEADER = "X-NewRelic-Trace".freeze
+        NEWRELIC_TRACE_HEADER = "newrelic".freeze
 
         def insert_distributed_trace_header request
           return unless Agent.config[:'distributed_tracing.enabled']
           payload = transaction.create_distributed_trace_payload
-          request[X_NEWRELIC_TRACE_HEADER] = payload.http_safe
+          request[NEWRELIC_TRACE_HEADER] = payload.http_safe if payload
         end
 
         EXTERNAL_ALL = "External/all".freeze
@@ -254,6 +254,15 @@ module NewRelic
         def obfuscator
           CrossAppTracing.obfuscator
         end
+
+        def record_span_event
+          aggregator = ::NewRelic::Agent.agent.span_event_aggregator
+          priority   = transaction.priority
+
+          aggregator.record(priority: priority) do
+            SpanEventPrimitive.for_external_request_segment(self)
+          end
+        end
       end
     end
   end

data/lib/new_relic/agent/transaction/message_broker_segment.rb

@@ -89,12 +89,12 @@ module NewRelic
           @name
         end
 
-        NEWRELIC_TRACE_KEY = "NewRelicTrace".freeze
+        NEWRELIC_TRACE_KEY = "newrelic".freeze
 
         def insert_distributed_trace_header
           return unless Agent.config[:'distributed_tracing.enabled']
           payload = transaction.create_distributed_trace_payload
-          headers[NEWRELIC_TRACE_KEY] = payload.http_safe
+          headers[NEWRELIC_TRACE_KEY] = payload.http_safe if payload
         end
 
         def transaction= t

data/lib/new_relic/agent/transaction/segment.rb

@@ -3,6 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require 'new_relic/agent/transaction/abstract_segment'
+require 'new_relic/agent/span_event_primitive'
 
 module NewRelic
   module Agent
@@ -46,6 +47,19 @@ module NewRelic
             @unscoped_metrics = metric
           end
         end
+
+        def segment_complete
+          record_span_event if transaction.sampled?
+        end
+
+        def record_span_event
+          aggregator = ::NewRelic::Agent.agent.span_event_aggregator
+          priority   = transaction.priority
+
+          aggregator.record(priority: priority) do
+            SpanEventPrimitive.for_segment(self)
+          end
+        end
       end
     end
   end

data/lib/new_relic/agent/transaction/trace.rb

@@ -90,18 +90,9 @@ module NewRelic
         end
 
         def prepare_sql_for_transmission!
-          strategy = NewRelic::Agent::Database.record_sql_method
           each_node do |node|
             next unless node[:sql]
-
-            case strategy
-            when :obfuscated
-              node[:sql] = NewRelic::Agent::Database.obfuscate_sql(node[:sql])
-            when :raw
-              node[:sql] = node[:sql].sql.to_s
-            else
-              node[:sql] = nil
-            end
+            node[:sql] = node[:sql].safe_sql
           end
         end
 

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -29,7 +29,6 @@ module NewRelic
       PRIORITY_KEY                   = 'priority'.freeze
       GUID_KEY                       = 'nr.guid'.freeze
       REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'.freeze
-      CAT_TRIP_ID_KEY                = 'nr.tripId'.freeze
       CAT_PATH_HASH_KEY              = 'nr.pathHash'.freeze
       CAT_REFERRING_PATH_HASH_KEY    = 'nr.referringPathHash'.freeze
       CAT_ALTERNATE_PATH_HASHES_KEY  = 'nr.alternatePathHashes'.freeze
@@ -68,7 +67,6 @@ module NewRelic
       def append_optional_attributes(sample, payload)
         optionally_append(GUID_KEY,                       :guid, sample, payload)
         optionally_append(REFERRING_TRANSACTION_GUID_KEY, :referring_transaction_guid, sample, payload)
-        optionally_append(CAT_TRIP_ID_KEY,                :cat_trip_id, sample, payload)
         optionally_append(CAT_PATH_HASH_KEY,              :cat_path_hash, sample, payload)
         optionally_append(CAT_REFERRING_PATH_HASH_KEY,    :cat_referring_path_hash, sample, payload)
         optionally_append(APDEX_PERF_ZONE_KEY,            :apdex_perf_zone, sample, payload)

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 5
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
 
     begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 5.2.0.345
+  version: 5.3.0.346
 platform: ruby
 authors:
 - Matthew Wear
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -239,6 +239,7 @@ files:
 - lib/new_relic/agent/deprecator.rb
 - lib/new_relic/agent/distributed_trace_monitor.rb
 - lib/new_relic/agent/distributed_trace_payload.rb
+- lib/new_relic/agent/distributed_tracing.rb
 - lib/new_relic/agent/encoding_normalizer.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/error_event_aggregator.rb
@@ -352,6 +353,8 @@ files:
 - lib/new_relic/agent/samplers/memory_sampler.rb
 - lib/new_relic/agent/samplers/object_sampler.rb
 - lib/new_relic/agent/samplers/vm_sampler.rb
+- lib/new_relic/agent/span_event_aggregator.rb
+- lib/new_relic/agent/span_event_primitive.rb
 - lib/new_relic/agent/sql_sampler.rb
 - lib/new_relic/agent/stats.rb
 - lib/new_relic/agent/stats_engine.rb