newrelic_rpm 6.15.0 → 9.7.1

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

@@ -1,4 +1,3 @@
-# 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
@@ -10,22 +9,23 @@ module NewRelic
 
       # Intrinsic Keys
       INTRINSIC_KEYS = [
-        PARENT_TYPE_KEY                = "parent.type",
-        PARENT_APP_KEY                 = "parent.app",
-        PARENT_ACCOUNT_ID_KEY          = "parent.account",
-        PARENT_TRANSPORT_TYPE_KEY      = "parent.transportType",
-        PARENT_TRANSPORT_DURATION_KEY  = "parent.transportDuration",
-        GUID_KEY                       = "guid",
-        TRACE_ID_KEY                   = "traceId",
-        PARENT_TRANSACTION_ID_KEY      = "parentId",
-        PARENT_SPAN_ID_KEY             = "parentSpanId",
-        SAMPLED_KEY                    = "sampled",
+        PARENT_TYPE_KEY = 'parent.type',
+        PARENT_APP_KEY = 'parent.app',
+        PARENT_ACCOUNT_ID_KEY = 'parent.account',
+        PARENT_TRANSPORT_TYPE_KEY = 'parent.transportType',
+        PARENT_TRANSPORT_DURATION_KEY = 'parent.transportDuration',
+        GUID_KEY = 'guid',
+        TRACE_ID_KEY = 'traceId',
+        PARENT_TRANSACTION_ID_KEY = 'parentId',
+        PARENT_SPAN_ID_KEY = 'parentSpanId',
+        SAMPLED_KEY = 'sampled'
       ].freeze
 
       # This method extracts intrinsics from the transaction_payload and
       # inserts them into the specified destination.
-      def copy_to_hash transaction_payload, destination
+      def copy_to_hash(transaction_payload, destination)
         return unless enabled?
+
         INTRINSIC_KEYS.each do |key|
           value = transaction_payload[key]
           destination[key] = value unless value.nil?
@@ -34,17 +34,19 @@ module NewRelic
 
       # This method extracts intrinsics from the transaction_payload and
       # inserts them as intrinsics in the specified transaction_attributes
-      def copy_to_attributes transaction_payload, destination
+      def copy_to_attributes(transaction_payload, destination)
         return unless enabled?
+
         INTRINSIC_KEYS.each do |key|
-          next unless transaction_payload.key? key
-          destination.add_intrinsic_attribute key, transaction_payload[key]
+          next unless transaction_payload.key?(key)
+
+          destination.add_intrinsic_attribute(key, transaction_payload[key])
         end
       end
 
       # This method takes all distributed tracing intrinsics from the transaction
       # and the trace_payload, and populates them into the destination
-      def copy_from_transaction transaction, trace_payload, destination
+      def copy_from_transaction(transaction, trace_payload, destination)
         destination[GUID_KEY] = transaction.guid
         destination[SAMPLED_KEY] = transaction.sampled?
         destination[TRACE_ID_KEY] = transaction.trace_id
@@ -53,19 +55,18 @@ module NewRelic
           destination[PARENT_SPAN_ID_KEY] = transaction.parent_span_id
         end
 
-        copy_parent_attributes transaction, trace_payload, destination
+        copy_parent_attributes(transaction, trace_payload, destination)
       end
 
-      def copy_parent_attributes transaction, trace_payload, destination
+      def copy_parent_attributes(transaction, trace_payload, destination)
         transport_type = transaction.distributed_tracer.caller_transport_type
-        destination[PARENT_TRANSPORT_TYPE_KEY] = DistributedTraceTransportType.from transport_type
+        destination[PARENT_TRANSPORT_TYPE_KEY] = DistributedTraceTransportType.from(transport_type)
 
         if trace_payload
           destination[PARENT_TYPE_KEY] = trace_payload.parent_type
           destination[PARENT_APP_KEY] = trace_payload.parent_app_id
           destination[PARENT_ACCOUNT_ID_KEY] = trace_payload.parent_account_id
-
-          destination[PARENT_TRANSPORT_DURATION_KEY] = transaction.calculate_transport_duration trace_payload
+          destination[PARENT_TRANSPORT_DURATION_KEY] = transaction.calculate_transport_duration(trace_payload)
 
           if parent_transaction_id = transaction.distributed_tracer.parent_transaction_id
             destination[PARENT_TRANSACTION_ID_KEY] = parent_transaction_id
@@ -78,7 +79,6 @@ module NewRelic
       def enabled?
         return Agent.config[:'distributed_tracing.enabled']
       end
-
     end
   end
 end

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

@@ -1,4 +1,3 @@
-# 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
@@ -8,11 +7,11 @@ module NewRelic
     module DistributedTraceMetrics
       extend self
 
-      ALL_SUFFIX = "all"
-      ALL_WEB_SUFFIX = "allWeb"
-      ALL_OTHER_SUFFIX = "allOther"
+      ALL_SUFFIX = 'all'
+      ALL_WEB_SUFFIX = 'allWeb'
+      ALL_OTHER_SUFFIX = 'allOther'
 
-      UNKNOWN_CALLER_PREFIX = "%s/Unknown/Unknown/Unknown/%s"
+      UNKNOWN_CALLER_PREFIX = '%s/Unknown/Unknown/Unknown/%s'
 
       def transaction_type_suffix
         if Transaction.recording_web_transaction?
@@ -22,17 +21,18 @@ module NewRelic
         end
       end
 
-      def record_metrics_for_transaction transaction
+      def record_metrics_for_transaction(transaction)
         return unless Agent.config[:'distributed_tracing.enabled']
+
         dt = transaction.distributed_tracer
         payload = dt.distributed_trace_payload || dt.trace_state_payload
 
-        record_caller_by_duration_metrics transaction, payload
-        record_transport_duration_metrics transaction, payload
-        record_errors_by_caller_metrics transaction, payload
+        record_caller_by_duration_metrics(transaction, payload)
+        record_transport_duration_metrics(transaction, payload)
+        record_errors_by_caller_metrics(transaction, payload)
       end
 
-      def prefix_for_metric name, transaction, payload
+      def prefix_for_metric(name, transaction, payload)
         if payload
           "#{name}/" \
           "#{payload.parent_type}/" \
@@ -44,31 +44,31 @@ module NewRelic
         end
       end
 
-      def record_caller_by_duration_metrics transaction, payload
-        prefix = prefix_for_metric "DurationByCaller", transaction, payload
-        record_unscoped_metric transaction, prefix, transaction.duration
+      def record_caller_by_duration_metrics(transaction, payload)
+        prefix = prefix_for_metric('DurationByCaller', transaction, payload)
+        record_unscoped_metric(transaction, prefix, transaction.duration)
       end
 
-      def record_transport_duration_metrics transaction, payload
+      def record_transport_duration_metrics(transaction, payload)
         return unless payload
 
-        prefix = prefix_for_metric "TransportDuration", transaction, payload
-        duration = transaction.calculate_transport_duration payload
-        record_unscoped_metric transaction, prefix, duration
+        prefix = prefix_for_metric('TransportDuration', transaction, payload)
+        duration = transaction.calculate_transport_duration(payload)
+        record_unscoped_metric(transaction, prefix, duration)
       end
 
-      def record_errors_by_caller_metrics transaction, payload
+      def record_errors_by_caller_metrics(transaction, payload)
         return unless transaction.exceptions.size > 0
 
-        prefix = prefix_for_metric "ErrorsByCaller", transaction, payload
-        record_unscoped_metric transaction, prefix, 1
+        prefix = prefix_for_metric('ErrorsByCaller', transaction, payload)
+        record_unscoped_metric(transaction, prefix, 1)
       end
 
       private
 
-      def record_unscoped_metric transaction, prefix, duration
-        transaction.metrics.record_unscoped "#{prefix}/#{ALL_SUFFIX}", duration
-        transaction.metrics.record_unscoped "#{prefix}/#{transaction_type_suffix}", duration
+      def record_unscoped_metric(transaction, prefix, duration)
+        transaction.metrics.record_unscoped("#{prefix}/#{ALL_SUFFIX}", duration)
+        transaction.metrics.record_unscoped("#{prefix}/#{transaction_type_suffix}", duration)
       end
     end
   end

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

@@ -1,10 +1,9 @@
-# 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
 
 require 'json'
-require 'base64'
+require 'new_relic/base64'
 
 module NewRelic
   module Agent
@@ -17,27 +16,25 @@ module NewRelic
     class DistributedTracePayload
       extend Coerce
 
-      VERSION     = [0, 1].freeze
-      PARENT_TYPE = "App"
-      POUND       = '#'
+      VERSION = [0, 1].freeze
+      PARENT_TYPE = 'App'
 
       # Key names for serialization
-      VERSION_KEY           = 'v'
-      DATA_KEY              = 'd'
-      PARENT_TYPE_KEY       = 'ty'
+      VERSION_KEY = 'v'
+      DATA_KEY = 'd'
+      PARENT_TYPE_KEY = 'ty'
       PARENT_ACCOUNT_ID_KEY = 'ac'
-      PARENT_APP_KEY        = 'ap'
-      TRUSTED_ACCOUNT_KEY   = 'tk'
-      ID_KEY                = 'id'
-      TX_KEY                = 'tx'
-      TRACE_ID_KEY          = 'tr'
-      SAMPLED_KEY           = 'sa'
-      TIMESTAMP_KEY         = 'ti'
-      PRIORITY_KEY          = 'pr'
+      PARENT_APP_KEY = 'ap'
+      TRUSTED_ACCOUNT_KEY = 'tk'
+      ID_KEY = 'id'
+      TX_KEY = 'tx'
+      TRACE_ID_KEY = 'tr'
+      SAMPLED_KEY = 'sa'
+      TIMESTAMP_KEY = 'ti'
+      PRIORITY_KEY = 'pr'
 
       class << self
-
-        def for_transaction transaction
+        def for_transaction(transaction)
           return nil unless connected?
 
           payload = new
@@ -50,7 +47,7 @@ module NewRelic
 
           payload.id = current_segment_id(transaction)
           payload.transaction_id = transaction.guid
-          payload.timestamp = (Time.now.to_f * 1000).round
+          payload.timestamp = Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
           payload.trace_id = transaction.trace_id
           payload.sampled = transaction.sampled?
           payload.priority = transaction.priority
@@ -58,30 +55,31 @@ module NewRelic
           payload
         end
 
-        def from_json serialized_payload
-          raw_payload = JSON.parse serialized_payload
+        def from_json(serialized_payload)
+          raw_payload = JSON.parse(serialized_payload)
           return raw_payload if raw_payload.nil?
+
           payload_data = raw_payload[DATA_KEY]
 
           payload = new
-          payload.version             = raw_payload[VERSION_KEY]
-          payload.parent_type         = payload_data[PARENT_TYPE_KEY]
-          payload.parent_account_id   = payload_data[PARENT_ACCOUNT_ID_KEY]
-          payload.parent_app_id       = payload_data[PARENT_APP_KEY]
+          payload.version = raw_payload[VERSION_KEY]
+          payload.parent_type = payload_data[PARENT_TYPE_KEY]
+          payload.parent_account_id = payload_data[PARENT_ACCOUNT_ID_KEY]
+          payload.parent_app_id = payload_data[PARENT_APP_KEY]
           payload.trusted_account_key = payload_data[TRUSTED_ACCOUNT_KEY]
-          payload.timestamp           = payload_data[TIMESTAMP_KEY]
-          payload.id                  = payload_data[ID_KEY]
-          payload.transaction_id      = payload_data[TX_KEY]
-          payload.trace_id            = payload_data[TRACE_ID_KEY]
-          payload.sampled             = payload_data[SAMPLED_KEY]
-          payload.priority            = payload_data[PRIORITY_KEY]
+          payload.timestamp = payload_data[TIMESTAMP_KEY]
+          payload.id = payload_data[ID_KEY]
+          payload.transaction_id = payload_data[TX_KEY]
+          payload.trace_id = payload_data[TRACE_ID_KEY]
+          payload.sampled = payload_data[SAMPLED_KEY]
+          payload.priority = payload_data[PRIORITY_KEY]
 
           payload
         end
 
-        def from_http_safe http_safe_payload
-          decoded_payload = Base64.strict_decode64 http_safe_payload
-          from_json decoded_payload
+        def from_http_safe(http_safe_payload)
+          decoded_payload = NewRelic::Base64.strict_decode64(http_safe_payload)
+          from_json(decoded_payload)
         end
 
         def major_version_matches?(payload)
@@ -90,7 +88,7 @@ module NewRelic
 
         private
 
-        def assign_trusted_account_key payload, account_id
+        def assign_trusted_account_key(payload, account_id)
           trusted_account_key = Agent.config[:trusted_account_key]
 
           if account_id != trusted_account_key
@@ -110,16 +108,16 @@ module NewRelic
       end
 
       attr_accessor :version,
-                    :parent_type,
-                    :parent_account_id,
-                    :parent_app_id,
-                    :trusted_account_key,
-                    :id,
-                    :transaction_id,
-                    :trace_id,
-                    :sampled,
-                    :priority,
-                    :timestamp
+        :parent_type,
+        :parent_account_id,
+        :parent_app_id,
+        :trusted_account_key,
+        :id,
+        :transaction_id,
+        :trace_id,
+        :sampled,
+        :priority,
+        :timestamp
 
       alias_method :sampled?, :sampled
 
@@ -134,17 +132,17 @@ module NewRelic
         }
 
         result[DATA_KEY] = {
-          PARENT_TYPE_KEY       => parent_type,
+          PARENT_TYPE_KEY => parent_type,
           PARENT_ACCOUNT_ID_KEY => parent_account_id,
-          PARENT_APP_KEY        => parent_app_id,
-          TX_KEY                => transaction_id,
-          TRACE_ID_KEY          => trace_id,
-          SAMPLED_KEY           => sampled,
-          PRIORITY_KEY          => priority,
-          TIMESTAMP_KEY         => timestamp,
+          PARENT_APP_KEY => parent_app_id,
+          TX_KEY => transaction_id,
+          TRACE_ID_KEY => trace_id,
+          SAMPLED_KEY => sampled,
+          PRIORITY_KEY => priority,
+          TIMESTAMP_KEY => timestamp
         }
 
-        result[DATA_KEY][ID_KEY]              = id if id
+        result[DATA_KEY][ID_KEY] = id if id
         result[DATA_KEY][TRUSTED_ACCOUNT_KEY] = trusted_account_key if trusted_account_key
 
         JSON.dump(result)
@@ -158,7 +156,7 @@ module NewRelic
       #
       # @api public
       def http_safe
-        Base64.strict_encode64 text
+        NewRelic::Base64.strict_encode64(text)
       end
     end
   end

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

@@ -1,4 +1,3 @@
-# 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
@@ -12,26 +11,26 @@ module NewRelic
         NewRelic::UNKNOWN,
         NewRelic::HTTP,
         NewRelic::HTTPS,
-        "Kafka",
-        "JMS",
-        "IronMQ",
-        "AMQP",
-        "Queue",
-        "Other",
+        'Kafka',
+        'JMS',
+        'IronMQ',
+        'AMQP',
+        'Queue',
+        'Other'
       ].freeze
 
       URL_SCHEMES = {
-        'http'  => NewRelic::HTTP,
-        'https' => NewRelic::HTTPS,
+        'http' => NewRelic::HTTP,
+        'https' => NewRelic::HTTPS
       }.freeze
 
       RACK_URL_SCHEME = 'rack.url_scheme'
 
-      def from value
+      def from(value)
         ALLOWABLE_TRANSPORT_TYPES.include?(value) ? value : NewRelic::UNKNOWN
       end
 
-      def for_rack_request request
+      def for_rack_request(request)
         URL_SCHEMES[request[RACK_URL_SCHEME]]
       end
     end