newrelic_rpm 9.23.0 → 10.0.0

data/lib/new_relic/agent/serverless_handler.rb

@@ -144,7 +144,7 @@ module NewRelic
       def payload_v1 # New Relic serverless payload v1
         payload_hash = {'metadata' => metadata, 'data' => @payloads}
         json = NewRelic::Agent.agent.service.marshaller.dump(payload_hash)
-        gzipped = NewRelic::Agent::NewRelicService::Encoders::Compressed::Gzip.encode(json)
+        gzipped = Zlib.gzip(json)
         base64_encoded = NewRelic::Base64.strict_encode64(gzipped)
         array = [PAYLOAD_VERSION, LAMBDA_MARKER, base64_encoded]
         ::JSON.dump(array)
@@ -152,7 +152,7 @@ module NewRelic
 
       def payload_v2 # New Relic serverless payload v2
         json = NewRelic::Agent.agent.service.marshaller.dump(@payloads)
-        gzipped = NewRelic::Agent::NewRelicService::Encoders::Compressed::Gzip.encode(json)
+        gzipped = Zlib.gzip(json)
         base64_encoded = NewRelic::Base64.strict_encode64(gzipped)
         array = [PAYLOAD_VERSION, LAMBDA_MARKER, metadata, base64_encoded]
         ::JSON.dump(array)

data/lib/new_relic/agent/span_event_primitive.rb

@@ -92,7 +92,7 @@ module NewRelic
         [intrinsics, custom_attributes(segment), agent_attributes.merge(agent_attributes(segment))]
       end
 
-      def for_datastore_segment(segment) # rubocop:disable Metrics/AbcSize
+      def for_datastore_segment(segment)
         intrinsics = intrinsics_for(segment)
 
         intrinsics[COMPONENT_KEY] = segment.product

data/lib/new_relic/agent/sql_sampler.rb

@@ -122,37 +122,6 @@ module NewRelic
         @sql_traces.delete(shortest_key)
       end
 
-      # Records an SQL query, potentially creating a new slow SQL trace, or
-      # aggregating the query into an existing slow SQL trace.
-      #
-      # This method should be used only by gem authors wishing to extend
-      # the Ruby agent to instrument new database interfaces - it should
-      # generally not be called directly from application code.
-      #
-      # @param sql [String] the SQL query being recorded
-      # @param metric_name [String] is the metric name under which this query will be recorded
-      # @param config [Object] is the driver configuration for the connection
-      # @param duration [Float] number of seconds the query took to execute
-      # @param explainer [Proc] for internal use only - 3rd-party clients must
-      #                         not pass this parameter.
-      #
-      # @api public
-      # @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 ||= 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")
-            statement = Database::Statement.new(sql, config, explainer, binds, name)
-            data.sql_data << SlowSql.new(statement, metric_name, duration, backtrace)
-          end
-        end
-      end
-
       PRIORITY = 'priority'.freeze
 
       def distributed_trace_attributes(state)

data/lib/new_relic/agent/stats_engine.rb

@@ -4,6 +4,7 @@
 
 require 'new_relic/agent/stats_engine/gc_profiler'
 require 'new_relic/agent/stats_engine/stats_hash'
+require 'new_relic/agent/tracer'
 require 'new_relic/language_support'
 
 module NewRelic

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

@@ -4,13 +4,11 @@
 
 require 'new_relic/agent/transaction/trace_context'
 require 'new_relic/agent/transaction/distributed_tracing'
-require 'new_relic/agent/distributed_tracing/cross_app_tracing'
 
 module NewRelic
   module Agent
     class Transaction
       class DistributedTracer
-        include NewRelic::Agent::CrossAppTracing
         include DistributedTracing
         include TraceContext
 
@@ -55,12 +53,10 @@ module NewRelic
         end
 
         def record_metrics
-          record_cross_app_metrics
           DistributedTraceMetrics.record_metrics_for_transaction(transaction)
         end
 
         def append_payload(payload)
-          append_cat_info(payload)
           DistributedTraceAttributes.copy_from_transaction( \
             transaction,
             trace_state_payload || distributed_trace_payload,
@@ -78,14 +74,12 @@ module NewRelic
 
           insert_trace_context_header(headers)
           insert_distributed_trace_header(headers)
-          insert_cross_app_header(headers)
           log_request_headers(headers)
         end
 
         def consume_message_headers(headers, tracer_state, transport_type)
           log_request_headers(headers, 'INCOMING')
           consume_message_distributed_tracing_headers(headers, transport_type)
-          consume_message_cross_app_tracing_headers(headers, tracer_state)
           consume_message_synthetics_headers(headers)
         rescue => e
           NewRelic::Agent.logger.error('Error in consume_message_headers', e)
@@ -94,8 +88,6 @@ module NewRelic
         def assign_intrinsics
           if dt_enabled?
             DistributedTraceAttributes.copy_to_attributes(transaction.payload, transaction.attributes)
-          elsif is_cross_app?
-            assign_cross_app_intrinsics
           end
         end
 
@@ -107,17 +99,6 @@ module NewRelic
           headers[NewRelic::NEWRELIC_KEY] = payload.http_safe if payload
         end
 
-        def insert_cat_headers(headers)
-          return unless CrossAppTracing.cross_app_enabled?
-
-          @is_cross_app_caller = true
-          insert_message_headers(headers,
-            transaction.guid,
-            cat_trip_id,
-            cat_path_hash,
-            transaction.raw_synthetics_header)
-        end
-
         private
 
         def dt_enabled?
@@ -125,15 +106,18 @@ module NewRelic
         end
 
         def consume_message_synthetics_headers(headers)
-          synthetics_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_SYNTHETICS_HEADER]
-          if synthetics_header and
-              incoming_payload = ::JSON.parse(deobfuscate(synthetics_header)) and
-              SyntheticsMonitor.is_valid_payload?(incoming_payload) and
-              SyntheticsMonitor.is_supported_version?(incoming_payload) and
-              SyntheticsMonitor.is_trusted?(incoming_payload)
-
-            transaction.raw_synthetics_header = synthetics_header
-            transaction.synthetics_payload = incoming_payload
+          synthetics_header = headers[SyntheticsMonitor::NON_HTTP_SYNTHETICS_HEADER_KEY]
+          if synthetics_header
+            require 'new_relic/agent/obfuscator'
+            obfuscator = ::NewRelic::Agent::Obfuscator.new(Agent.config[:encoding_key])
+            incoming_payload = ::JSON.parse(obfuscator.deobfuscate(synthetics_header))
+            if SyntheticsMonitor.is_valid_payload?(incoming_payload) &&
+                SyntheticsMonitor.is_supported_version?(incoming_payload) &&
+                SyntheticsMonitor.is_trusted?(incoming_payload)
+
+              transaction.raw_synthetics_header = synthetics_header
+              transaction.synthetics_payload = incoming_payload
+            end
           end
         rescue => e
           NewRelic::Agent.logger.error('Error in consume_message_synthetics_header', e)
@@ -151,34 +135,6 @@ module NewRelic
 
           accept_distributed_trace_payload(payload)
         end
-
-        def consume_message_cross_app_tracing_headers(headers, tracer_state)
-          return unless CrossAppTracing.cross_app_enabled?
-          return unless CrossAppTracing.message_has_crossapp_request_header?(headers)
-
-          accept_cross_app_payload(headers, tracer_state)
-          CrossAppTracing.assign_intrinsic_transaction_attributes(tracer_state)
-        end
-
-        def accept_cross_app_payload(headers, tracer_state)
-          encoded_id = headers[CrossAppTracing::NR_MESSAGE_BROKER_ID_HEADER]
-          decoded_id = encoded_id.nil? ? EMPTY_STRING : deobfuscate(encoded_id)
-
-          return unless CrossAppTracing.trusted_valid_cross_app_id?(decoded_id)
-
-          txn_header = headers[CrossAppTracing::NR_MESSAGE_BROKER_TXN_HEADER]
-          txn_info = ::JSON.parse(deobfuscate(txn_header))
-          payload = CrossAppPayload.new(decoded_id, transaction, txn_info)
-
-          @cross_app_payload = payload
-        rescue => e
-          NewRelic::Agent.logger.debug("Failure deserializing encoded header in #{self.class}, #{e.class}, #{e.message}")
-          nil
-        end
-
-        def deobfuscate(message)
-          CrossAppTracing.obfuscator.deobfuscate(message)
-        end
       end
     end
   end

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

@@ -161,29 +161,21 @@ module NewRelic
           transaction.parent_span_id = payload.id
 
           unless payload.sampled.nil?
-            if payload.sampled == true
-              set_priority_and_sampled_newrelic_header(NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_sampled'], payload)
-            elsif payload.sampled == false
-              set_priority_and_sampled_newrelic_header(NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_not_sampled'], payload)
+            if payload.sampled
+              set_priority_and_sampled(
+                NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_sampled'],
+                NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_sampled.trace_id_ratio_based.ratio'],
+                payload
+              )
             else
-              transaction.sampled = payload.sampled
-              transaction.priority = payload.priority if payload.priority
+              set_priority_and_sampled(
+                NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_not_sampled'],
+                NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_not_sampled.trace_id_ratio_based.ratio'],
+                payload
+              )
             end
           end
         end
-
-        def set_priority_and_sampled_newrelic_header(config, payload)
-          if config == 'always_on'
-            transaction.sampled = true
-            transaction.priority = 2.0
-          elsif config == 'always_off'
-            transaction.sampled = false
-            transaction.priority = 0
-          else # case for 'default' value
-            transaction.sampled = payload.sampled
-            transaction.priority = payload.priority if payload.priority
-          end
-        end
       end
     end
   end

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

@@ -64,119 +64,6 @@ module NewRelic
           NewRelic::Agent.logger.error('Error in add_request_headers', e)
         end
 
-        # This method extracts app data from an external response if present. If
-        # a valid cross-app ID is found, the name of the segment is updated to
-        # reflect the cross-process ID and transaction name.
-        #
-        # @param [Hash] response a hash of response headers
-        #
-        # @api public
-        def read_response_headers(response)
-          return unless record_metrics? && CrossAppTracing.cross_app_enabled?
-          return unless CrossAppTracing.response_has_crossapp_header?(response)
-
-          unless data = CrossAppTracing.extract_appdata(response)
-            NewRelic::Agent.logger.debug("Couldn't extract_appdata from external segment response")
-            return
-          end
-
-          if CrossAppTracing.valid_cross_app_id?(data[0])
-            @app_data = data
-            update_segment_name
-          else
-            NewRelic::Agent.logger.debug('External segment response has invalid cross_app_id')
-          end
-        rescue => e
-          NewRelic::Agent.logger.error('Error in read_response_headers', e)
-        end
-
-        def cross_app_request? # :nodoc:
-          !!@app_data
-        end
-
-        def cross_process_id # :nodoc:
-          @app_data && @app_data[0]
-        end
-
-        def transaction_guid # :nodoc:
-          @app_data && @app_data[5]
-        end
-
-        def cross_process_transaction_name # :nodoc:
-          @app_data && @app_data[1]
-        end
-
-        # Obtain an obfuscated +String+ suitable for delivery across public networks that identifies this application
-        # and transaction to another application which is also running a New Relic agent. This +String+ can be processed
-        # by +process_request_metadata+ on the receiving application.
-        #
-        # @return [String] obfuscated request metadata to send
-        #
-        # @api public
-        #
-        def get_request_metadata
-          NewRelic::Agent.record_api_supportability_metric(:get_request_metadata)
-          return unless CrossAppTracing.cross_app_enabled?
-
-          if transaction
-
-            # build hash of CAT metadata
-            #
-            rmd = {
-              NewRelicID: NewRelic::Agent.config[:cross_process_id],
-              NewRelicTransaction: [
-                transaction.guid,
-                false,
-                transaction.distributed_tracer.cat_trip_id,
-                transaction.distributed_tracer.cat_path_hash
-              ]
-            }
-
-            # flag cross app in the state so transaction knows to add bits to payload
-            #
-            transaction.distributed_tracer.is_cross_app_caller = true
-
-            # add Synthetics header if we have it
-            #
-            rmd[:NewRelicSynthetics] = transaction.raw_synthetics_header if transaction.raw_synthetics_header
-
-            # obfuscate the generated request metadata JSON
-            #
-            obfuscator.obfuscate(::JSON.dump(rmd))
-
-          end
-        rescue => e
-          NewRelic::Agent.logger.error('error during get_request_metadata', e)
-        end
-
-        # Process obfuscated +String+ sent from a called application that is also running a New Relic agent and
-        # save information in current transaction for inclusion in a trace. This +String+ is generated by
-        # +get_response_metadata+ on the receiving application.
-        #
-        # @param response_metadata [String] received obfuscated response metadata
-        #
-        # @api public
-        #
-        def process_response_metadata(response_metadata)
-          NewRelic::Agent.record_api_supportability_metric(:process_response_metadata)
-          if transaction
-            app_data = ::JSON.parse(obfuscator.deobfuscate(response_metadata))[APP_DATA_KEY]
-
-            # validate cross app id
-            #
-            if Array === app_data and CrossAppTracing.trusted_valid_cross_app_id?(app_data[0])
-              @app_data = app_data
-              update_segment_name
-            else
-              NewRelic::Agent.logger.error('error processing response metadata: invalid/non-trusted ID')
-            end
-          end
-
-          nil
-        rescue => e
-          NewRelic::Agent.logger.error('error during process_response_metadata', e)
-        end
-
         def record_metrics
           add_unscoped_metrics
           super
@@ -184,7 +71,6 @@ module NewRelic
 
         def process_response_headers(response) # :nodoc:
           set_http_status_code(response)
-          read_response_headers(response)
         end
 
         private
@@ -206,10 +92,6 @@ module NewRelic
 
         def segment_complete
           params[:uri] = uri.to_s
-          if cross_app_request?
-            params[:transaction_guid] = transaction_guid
-          end
-
           super
         end
 
@@ -223,10 +105,6 @@ module NewRelic
           @unscoped_metrics = [EXTERNAL_ALL,
             "External/#{host}/all",
             suffixed_rollup_metric]
-
-          if cross_app_request?
-            @unscoped_metrics << "ExternalApp/#{host}/#{cross_process_id}/all"
-          end
         end
 
         def suffixed_rollup_metric
@@ -238,15 +116,7 @@ module NewRelic
         end
 
         def update_segment_name
-          if @app_data
-            @name = "ExternalTransaction/#{host}/#{cross_process_id}/#{cross_process_transaction_name}"
-          else
-            @name = "External/#{host}/#{library}/#{procedure}"
-          end
-        end
-
-        def obfuscator
-          CrossAppTracing.obfuscator
+          @name = "External/#{host}/#{library}/#{procedure}"
         end
 
         def record_span_event

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

@@ -3,7 +3,6 @@
 # frozen_string_literal: true
 
 require 'new_relic/agent/transaction/segment'
-require 'new_relic/agent/distributed_tracing/cross_app_tracing'
 
 module NewRelic
   module Agent
@@ -89,7 +88,6 @@ module NewRelic
         def transaction_assigned
           if headers && transaction && action == :produce && record_metrics?
             transaction.distributed_tracer.insert_distributed_trace_header(headers)
-            transaction.distributed_tracer.insert_cat_headers(headers)
             transaction.distributed_tracer.log_request_headers(headers)
           end
         rescue => e

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

@@ -154,32 +154,54 @@ module NewRelic
 
         def determine_sampling_decision(payload, trace_flags)
           if trace_flags == '01'
-            set_priority_and_sampled(NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_sampled'], payload)
+            set_priority_and_sampled(
+              NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_sampled'],
+              NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_sampled.trace_id_ratio_based.ratio'],
+              payload,
+              trace_flags
+            )
           elsif trace_flags == '00'
-            set_priority_and_sampled(NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_not_sampled'], payload)
+            set_priority_and_sampled(
+              NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_not_sampled'],
+              NewRelic::Agent.config[:'distributed_tracing.sampler.remote_parent_not_sampled.trace_id_ratio_based.ratio'],
+              payload,
+              trace_flags
+            )
           else
-            use_nr_tracestate_sampled(payload)
+            use_nr_tracestate_sampled(payload, trace_flags)
           end
         rescue
-          use_nr_tracestate_sampled(payload)
+          use_nr_tracestate_sampled(payload, trace_flags)
         end
 
-        def use_nr_tracestate_sampled(payload)
-          unless payload.sampled.nil?
+        def use_nr_tracestate_sampled(payload, trace_flags)
+          if payload.sampled.nil?
+            if trace_flags == '01'
+              transaction.sampled = NewRelic::Agent.instance.adaptive_sampler_remote_parent_sampled.sampled?
+            elsif trace_flags == '00'
+              transaction.sampled = NewRelic::Agent.instance.adaptive_sampler_remote_parent_not_sampled.sampled?
+            end
+
+            transaction.priority = transaction.default_priority
+          else
             transaction.sampled = payload.sampled
             transaction.priority = payload.priority if payload.priority
           end
         end
 
-        def set_priority_and_sampled(config, payload)
-          if config == 'always_on'
+        def set_priority_and_sampled(sampler, ratio, payload, trace_flags = nil)
+          case sampler
+          when 'adaptive'
+            use_nr_tracestate_sampled(payload, trace_flags)
+          when 'always_on'
             transaction.sampled = true
             transaction.priority = 2.0
-          elsif config == 'always_off'
+          when 'always_off'
             transaction.sampled = false
             transaction.priority = 0
-          else # default
-            use_nr_tracestate_sampled(payload)
+          when 'trace_id_ratio_based'
+            transaction.sampled = transaction.trace_ratio_sampled?(ratio)
+            transaction.priority = transaction.default_priority
           end
         end
 

data/lib/new_relic/agent/transaction.rb

@@ -211,7 +211,7 @@ module NewRelic
         end
       end
 
-      def initialize(category, options) # rubocop:disable Metrics/AbcSize
+      def initialize(category, options)
         @nesting_max_depth = 0
         @current_segment_by_thread = {}
         @current_segment_lock = Mutex.new
@@ -294,11 +294,31 @@ module NewRelic
         return false unless Agent.config[:'distributed_tracing.enabled']
 
         if @sampled.nil?
-          @sampled = NewRelic::Agent.instance.adaptive_sampler.sampled?
+          @sampled = case NewRelic::Agent.config[:'distributed_tracing.sampler.root']
+          when 'adaptive'
+            NewRelic::Agent.instance.adaptive_sampler.sampled?
+          when 'always_on'
+            true
+          when 'always_off'
+            false
+          when 'trace_id_ratio_based'
+            trace_ratio_sampled?(NewRelic::Agent.config[:'distributed_tracing.sampler.root.trace_id_ratio_based.ratio'])
+          end
         end
         @sampled
       end
 
+      def trace_ratio_sampled?(ratio)
+        # In the opentelemetry-sdk TraceIdRatioBased sampler, the algorithm
+        # looks like this:
+        # ratio == 1.0 || trace_id[8, 8].unpack1('Q>') < (ratio * (2**64 - 1)).ceil
+        # OTel stores their trace ids as binary strings
+        # ex. Array(trace_id).pack('H*')
+        # Since we don't store our trace ids as binary strings, this way is
+        # faster, but still gets the same result.
+        ratio == 1.0 || Integer(trace_id[16, 16], 16) < (ratio * (2**64 - 1)).ceil
+      end
+
       def trace_id
         @trace_id ||= NewRelic::Agent::GuidGenerator.generate_guid(32)
       end
@@ -307,8 +327,19 @@ module NewRelic
         @trace_id = value
       end
 
+      def default_priority
+        (sampled? ? rand + 1.0 : rand).round(NewRelic::PRIORITY_PRECISION)
+      end
+
       def priority
-        @priority ||= (sampled? ? rand + 1.0 : rand).round(NewRelic::PRIORITY_PRECISION)
+        @priority ||= case NewRelic::Agent.config[:'distributed_tracing.sampler.root']
+        when 'adaptive', 'trace_id_ratio_based'
+          default_priority
+        when 'always_on'
+          2.0
+        when 'always_off'
+          0
+        end
       end
 
       def referer
@@ -689,7 +720,7 @@ module NewRelic
       end
 
       def include_guid?
-        distributed_tracer.is_cross_app? || is_synthetics_request?
+        is_synthetics_request?
       end
 
       def is_synthetics_request?

data/lib/new_relic/agent/transaction_error_primitive.rb

@@ -26,8 +26,6 @@ module NewRelic
       NAME_KEY = 'transactionName'
       DURATION_KEY = 'duration'
       SAMPLED_KEY = 'sampled'
-      CAT_GUID_KEY = 'nr.transactionGuid'
-      CAT_REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
       SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'
       SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'
       SYNTHETICS_MONITOR_ID_KEY = 'nr.syntheticsMonitorId'
@@ -69,7 +67,6 @@ module NewRelic
           attrs[SAMPLED_KEY] = payload[:sampled] if payload.key?(:sampled)
           attrs[PRIORITY_KEY] = payload[:priority]
           append_synthetics(payload, attrs)
-          append_cat(payload, attrs)
           DistributedTraceAttributes.copy_to_hash(payload, attrs)
           PayloadMetricMapping.append_mapped_metrics(payload[:metrics], attrs)
         else
@@ -95,11 +92,6 @@ module NewRelic
           sample[new_key] = v
         end
       end
-
-      def append_cat(payload, sample)
-        sample[CAT_GUID_KEY] = payload[:guid] if payload[:guid]
-        sample[CAT_REFERRING_TRANSACTION_GUID_KEY] = payload[:referring_transaction_guid] if payload[:referring_transaction_guid]
-      end
     end
   end
 end

data/lib/new_relic/agent/transaction_event_primitive.rb

@@ -30,10 +30,6 @@ module NewRelic
       SAMPLED_KEY = 'sampled'
       PRIORITY_KEY = 'priority'
       GUID_KEY = 'nr.guid'
-      REFERRING_TRANSACTION_GUID_KEY = 'nr.referringTransactionGuid'
-      CAT_PATH_HASH_KEY = 'nr.pathHash'
-      CAT_REFERRING_PATH_HASH_KEY = 'nr.referringPathHash'
-      CAT_ALTERNATE_PATH_HASHES_KEY = 'nr.alternatePathHashes'
       APDEX_PERF_ZONE_KEY = 'nr.apdexPerfZone'
       SYNTHETICS_RESOURCE_ID_KEY = 'nr.syntheticsResourceId'
       SYNTHETICS_JOB_ID_KEY = 'nr.syntheticsJobId'
@@ -69,9 +65,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_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)
         optionally_append(SYNTHETICS_RESOURCE_ID_KEY, :synthetics_resource_id, sample, payload)
         optionally_append(SYNTHETICS_JOB_ID_KEY, :synthetics_job_id, sample, payload)
@@ -79,7 +72,6 @@ module NewRelic
         optionally_append(SYNTHETICS_TYPE_KEY, :synthetics_type, sample, payload)
         optionally_append(SYNTHETICS_INITIATOR_KEY, :synthetics_initiator, sample, payload)
         append_synthetics_info_attributes(sample, payload)
-        append_cat_alternate_path_hashes(sample, payload)
       end
 
       def append_synthetics_info_attributes(sample, payload)
@@ -93,12 +85,6 @@ module NewRelic
         end
       end
 
-      def append_cat_alternate_path_hashes(sample, payload)
-        if payload.include?(:cat_alternate_path_hashes)
-          sample[CAT_ALTERNATE_PATH_HASHES_KEY] = payload[:cat_alternate_path_hashes].sort.join(COMMA)
-        end
-      end
-
       def optionally_append(sample_key, payload_key, sample, payload)
         if payload.include?(payload_key)
           sample[sample_key] = string(payload[payload_key])

data/lib/new_relic/agent/utilization/gcp.rb

@@ -25,6 +25,8 @@ module NewRelic
         end
 
         def trim_leading(value)
+          return nil unless value.is_a?(String)
+
           value.split(NewRelic::SLASH).last
         end
       end