newrelic_rpm 8.11.0 → 8.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0513ed874184a3e737b2663f0fb404f10ddc0f4660da2b85678a1b93f1de1c2
-  data.tar.gz: b82877030feb527d17c10732a4bfbe9625c36c0f4a3b5fc2e57d4d389f41a857
+  metadata.gz: 5b512b5154279638e712582a488b0021e9aa834163183b3172e8489701bdcc0c
+  data.tar.gz: d44c55615a3b25be8900bf565ed29f5270be9bf6905f163f4bce9865610526cb
 SHA512:
-  metadata.gz: e6ea4eaf8332be93253b1d3d9b894e59c5dee712bad8c098bc1b8c60bff904389b2ae4fb416f1d4d08b4ea36087327955d157101d523e43d1b5ddc97e382c2dc
-  data.tar.gz: 2139d99e93eb289e976611535a46d58a826f66477931bc93ea5577a8f2c287bc9c49fd2ea9abcaf3f7b739a8c952ed58500c9aeab8daecbbd12f57f2b4d4fe4b
+  metadata.gz: 861c112f97dd3c843127264c3a50a34f5601a50addd7378ceec59c8663e58130d5da152f89e2e91cb47ccc6b70cc56f7ad22484357597c4d4b5ae08d01687142
+  data.tar.gz: 584f780e7fdc1029b1d97494a545f488c627c59e3fe1a5729cb7f8f3463ad1cf969ada3f77dbf01c1e4e53fa2c84189a88e22f59c1e1d0ab9abfeb8a00d3fbc9

data/.rubocop.yml

@@ -132,9 +132,6 @@ Layout/EmptyComment:
   AllowBorderComment: true
   AllowMarginComment: true
 
-Layout/EmptyLineAfterGuardClause:
-  Enabled: false
-
 # Disabling for now
 Layout/EmptyLineAfterMagicComment:
   Enabled: false

data/Brewfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+brew 'elasticsearch'
 brew 'imagemagick'
 brew 'memcached'
 tap 'mongodb/brew'

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v8.12.0
+
+  Version 8.12.0 of the agent delivers new Elasticsearch instrumentation, increases the default number of recorded Custom Events, announces the deprecation of Ruby 2.3, and brings some valuable code cleanup.
+
+  * **Support for Elasticsearch instrumentation**
+
+    This release adds support to automatically instrument the [elasticsearch](https://rubygems.org/gems/elasticsearch) gem. Versions 7.x and 8.x are supported. [PR#1525](https://github.com/newrelic/newrelic-ruby-agent/pull/1525)
+
+    | Configuration name | Default | Behavior |
+    | ----------- | ----------- |----------- |
+    | `instrumentation.elasticsearch` | auto | Controls auto-instrumentation of the elasticsearch library at start up. May be one of `auto`, `prepend`, `chain`, `disabled`. |
+    | `elasticsearch.capture_queries` | true | If `true`, the agent captures Elasticsearch queries in transaction traces. |
+    | `elasticsearch.obfuscate_queries` | true |  If `true`, the agent obfuscates Elasticsearch queries in transaction traces. |
+
+  * **Custom Event Limit Increase**
+
+    This version increases the default limit of custom events from 1000 events per minute to 3000 events per minute. In the scenario that custom events were being limited, this change will allow more custom events to be sent to New Relic. There is also a new configurable maximum limit of 100,000 events per minute. To change the limits, see the documentation for [max_samples_stored](https://docs.newrelic.com/docs/apm/agents/ruby-agent/configuration/ruby-agent-configuration/#custom_insights_events-max_samples_stored). To learn more about the change and how to determine if custom events are being dropped, see our Explorers Hub [post](https://discuss.newrelic.com/t/send-more-custom-events-with-the-latest-apm-agents/190497). [PR#1541](https://github.com/newrelic/newrelic-ruby-agent/pull/1541)
+
+  * **Deprecate support for Ruby 2.3**
+
+    Ruby 2.3 reached end of life on March 31, 2019. The Ruby agent has deprecated support for Ruby 2.3 and will make breaking changes for this version in its next major release, v9.0.0 (release date not yet planned). All 8.x.x versions of the agent will remain compatible with Ruby 2.3.
+
+  * **Cleanup: Remove orphaned code**
+
+    In both the agent and unit tests, changes have taken place over the years that have left certain bits of code unreachable. This orphaned code can complicate code maintenance and refactoring, so getting it squared away can be very helpful. Commmuniy member [@ohbarye](https://github.com/ohbarye) contributed two separate cleanup PRs for this release; one for the agent and one for the tests. [PR#1537](https://github.com/newrelic/newrelic-ruby-agent/pull/1537) [PR#1548](https://github.com/newrelic/newrelic-ruby-agent/pull/1548)
+
+    Thank you to [@ohbarye](https://github.com/ohbarye) for contributing this helpful cleanup!
+
+
   ## v8.11.0
 
   Version 8.11.0 of the agent updates the `newrelic deployments` command to work with API keys issued to newer accounts, fixes a memory leak in the instrumentation of Curb error handling, further preps for Ruby 3.2.0 support, and includes several community member driven cleanup and improvement efforts. Thank you to everyone involved!
@@ -49,15 +78,15 @@
 
 
   * **Bugfix: Missing unscoped metrics when instrumentation.thread.tracing is enabled**
-    
+
     Previously, when `instrumentation.thread.tracing` was set to true, some puma applications encountered a bug where a varying number of unscoped metrics would be missing. The agent now will correctly store and send all unscoped metrics.
-    
+
     Thank you to @texpert for providing details of their situation to help resolve the issue.
-  
-  
+
+
   * **Bugfix: gRPC instrumentation causes ArgumentError when other Google gems are present**
 
-    Previously, when the agent had gRPC instrumentation enabled in an application using other gems (such as google-ads-googleads), the instrumentation could cause the error `ArgumentError: wrong number of arguments (given 3, expected 2)`. The gRPC instrumentation has been updated to prevent this issue from occurring in the future. 
+    Previously, when the agent had gRPC instrumentation enabled in an application using other gems (such as google-ads-googleads), the instrumentation could cause the error `ArgumentError: wrong number of arguments (given 3, expected 2)`. The gRPC instrumentation has been updated to prevent this issue from occurring in the future.
 
     Thank you to @FeminismIsAwesome for bringing this issue to our attention.
 
@@ -94,26 +123,26 @@
 
 
   * **Bugfix: Error when setting the yaml configuration with `transaction_tracer.transaction_threshold: apdex_f`**
-    
-    Originally, the agent was only checking the `transaction_tracer.transaction_threshold` from the newrelic.yml correctly if it was on two lines. 
+
+    Originally, the agent was only checking the `transaction_tracer.transaction_threshold` from the newrelic.yml correctly if it was on two lines.
 
     Example:
 
     ```
     # newrelic.yml
     transaction_tracer:
-      transaction_threshold: apdex_f 
+      transaction_threshold: apdex_f
     ```
 
-    When this was instead changed to be on one line, the agent was not able to correctly identify the value of apdex_f. 
+    When this was instead changed to be on one line, the agent was not able to correctly identify the value of apdex_f.
 
     Example:
     ```
     # newrelic.yml
     transaction_tracer.transaction_threshold: apdex_f
     ```
-    This would cause prevent transactions from finishing due to the error `ArgumentError: comparison of Float with String failed`. This has now been corrected and the agent is able to process newrelic.yml with a one line `transaction_tracer.transaction_threshold: apdex_f` correctly now. 
-    
+    This would cause prevent transactions from finishing due to the error `ArgumentError: comparison of Float with String failed`. This has now been corrected and the agent is able to process newrelic.yml with a one line `transaction_tracer.transaction_threshold: apdex_f` correctly now.
+
     Thank you to @oboxodo for bringing this to our attention.
 
 
@@ -123,8 +152,8 @@
 
 
   ## v8.9.0
-  
-  
+
+
   * **Add support for Dalli 3.1.0 to Dalli 3.2.2**
 
     Dalli versions 3.1.0 and above include breaking changes where the agent previously hooked into the gem. We have updated our instrumentation to correctly hook into Dalli 3.1.0 and above. At this time, 3.2.2 is the latest Dalli version and is confirmed to be supported.
@@ -136,9 +165,9 @@
 
   * **Bugfix: Use read_nonblock instead of read on pipe**
 
-    Previously, our PipeChannelManager was using read which could cause Resque jobs to get stuck in some versions. This change updates the PipeChannelManager to use read_nonblock instead. This method can leverage error handling to allow the instrumentation to gracefully log a message and exit the stuck Resque job. 
+    Previously, our PipeChannelManager was using read which could cause Resque jobs to get stuck in some versions. This change updates the PipeChannelManager to use read_nonblock instead. This method can leverage error handling to allow the instrumentation to gracefully log a message and exit the stuck Resque job.
+
 
-    
   ## v8.8.0
 
   * **Support Makara database adapters with ActiveRecord**
@@ -235,7 +264,7 @@
   * **Bugfix: Error events missing attributes when created outside of a transaction**
 
     Previously the agent was not assigning a priority to error events that were created by calling notice_error outside the scope of a transaction. This caused issues with sampling when the error event buffer was full, resulting in a `NoMethodError: undefined method '<' for nil:NilClass` in the newrelic_agent.log. This bugfix ensures that a priority is always assigned on error events so that the agent will be able to sample these error events correctly. Thank you to @olleolleolle for bringing this issue to our attention.
-    
+
 
 
   ## v8.6.0

data/bin/nrdebug

@@ -219,6 +219,7 @@ class ProcessReport
         if c_backtraces =~ /could not attach/i
           fail("Failed to attach to target process. Please try again with sudo.")
         end
+
         section(f, "C Backtraces") { c_backtraces }
         section(f, "Ruby Backtrace(s)") { ruby_backtraces }
       end
@@ -282,6 +283,7 @@ end
 if !target.alive?
   fail("Could not find process with PID #{target_pid}")
 end
+
 target_cmd = target.procline
 
 prompt_for_confirmation(target_pid, target_cmd)

data/docker-compose.yml

@@ -1,5 +1,25 @@
 version: "3.9"
 services:
+  elasticsearch7:
+    image: elasticsearch:7.16.2
+    ports:
+      - "9200:9200"
+    environment:
+      - discovery.type=single-node
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    mem_limit: 1g
+  elasticsearch8:
+    image: elasticsearch:8.4.2
+    ports:
+      - "9250:9250"
+    environment:
+      - discovery.type=single-node
+      - xpack.security.enabled=false
+      - http.port=9250
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    mem_limit: 1g
   mysql:
     image: mysql:5.7
     restart: always
@@ -68,6 +88,8 @@ services:
     volumes:
       - ".:/usr/src/app"
     depends_on:
+      - elasticsearch7
+      - elasticsearch8
       - mysql
       - memcached
       - mongodb

data/lib/new_relic/agent/agent/shutdown.rb

@@ -9,6 +9,7 @@ module NewRelic
       # data.
       def shutdown
         return unless started?
+
         ::NewRelic::Agent.logger.info("Starting Agent shutdown")
 
         stop_event_loop

data/lib/new_relic/agent/agent/special_startup.rb

@@ -57,11 +57,13 @@ module NewRelic
 
       def should_install_exit_handler?
         return false unless Agent.config[:send_data_on_exit]
+
         !sinatra_classic_app? || Agent.config[:force_install_exit_handler]
       end
 
       def install_exit_handler
         return unless should_install_exit_handler?
+
         NewRelic::Agent.logger.debug("Installing at_exit handler")
         at_exit { shutdown }
       end

data/lib/new_relic/agent/agent/startup.rb

@@ -37,6 +37,7 @@ module NewRelic
       def check_config_and_start_agent
         return unless monitoring? && has_correct_license_key?
         return if using_forking_dispatcher?
+
         setup_and_start_agent
       end
 

data/lib/new_relic/agent/attributes.rb

@@ -58,6 +58,7 @@ module NewRelic
       def merge_custom_attributes(other)
         return unless Agent.config[:'custom_attributes.enabled']
         return if other.empty?
+
         AttributeProcessing.flatten_and_coerce(other) do |k, v|
           add_custom_attribute(k, v)
         end

data/lib/new_relic/agent/audit_logger.rb

@@ -29,6 +29,7 @@ module NewRelic
 
       def log_request_headers(uri, headers)
         return unless enabled? && allowed_endpoint?(uri)
+
         @log.info("REQUEST HEADERS: #{headers}")
       rescue StandardError, SystemStackError, SystemCallError => e
         ::NewRelic::Agent.logger.warn("Failed writing request headers to audit log", e)

data/lib/new_relic/agent/commands/thread_profiler_session.rb

@@ -42,6 +42,7 @@ module NewRelic
 
         def stop(report_data)
           return unless running?
+
           NewRelic::Agent.logger.debug("Stopping Thread Profiler.")
           @finished_profile = @backtrace_service.harvest(NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)
           @backtrace_service.unsubscribe(NewRelic::Agent::Threading::BacktraceService::ALL_TRANSACTIONS)

data/lib/new_relic/agent/configuration/default_source.rb

@@ -467,7 +467,7 @@ When `true`, the agent captures HTTP request parameters and attaches them to tra
           :public => false,
           :type => Array,
           :allowed_from_server => false,
-          :description => "An array of candidate locations for the agent\'s configuration file."
+          :description => "An array of candidate locations for the agent's configuration file."
         },
         :dispatcher => {
           :default => DefaultSource.dispatcher,
@@ -916,6 +916,14 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => false,
           :description => 'Controls auto-instrumentation of bunny at start up.  May be one of [auto|prepend|chain|disabled].'
         },
+        :'instrumentation.elasticsearch' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of the elasticsearch library at start up. May be one of [auto|prepend|chain|disabled].'
+        },
         :'instrumentation.httprb' => {
           :default => instrumentation_value_of(:disable_httprb),
           :documentation_default => 'auto',
@@ -1187,7 +1195,7 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :type => Boolean,
           :deprecated => true,
           :allowed_from_server => false,
-          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem\'s additional CAS client support.")
+          :description => deprecated_description(:'instrumentation.memcache', "If `true`, disables instrumentation for the dalli gem's additional CAS client support.")
         },
         :disable_memcache_instrumentation => {
           :default => false,
@@ -1407,6 +1415,20 @@ If `true`, disables agent middleware for Sinatra. This middleware is responsible
           :allowed_from_server => true,
           :description => 'If `true`, the agent obfuscates Mongo queries in transaction traces.'
         },
+        :'elasticsearch.capture_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent captures Elasticsearch queries in transaction traces.'
+        },
+        :'elasticsearch.obfuscate_queries' => {
+          :default => true,
+          :public => true,
+          :type => Boolean,
+          :allowed_from_server => true,
+          :description => 'If `true`, the agent obfuscates Elasticsearch queries in transaction traces.'
+        },
         :'error_collector.enabled' => {
           :default => true,
           :public => true,
@@ -1972,7 +1994,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :public => true,
           :type => String,
           :allowed_from_server => false,
-          :description => "Manual override for the path to your local CA bundle. This CA bundle will be used to validate the SSL certificate presented by New Relic\'s data collection service."
+          :description => "Manual override for the path to your local CA bundle. This CA bundle will be used to validate the SSL certificate presented by New Relic's data collection service."
         },
         :'rules.ignore_url_regexes' => {
           :default => [],
@@ -2004,7 +2026,7 @@ A map of error classes to a list of messages. When an error of one of the classe
           :description => 'If `true`, the agent captures [custom events](/docs/insights/new-relic-insights/adding-querying-data/inserting-custom-events-new-relic-apm-agents).'
         },
         :'custom_insights_events.max_samples_stored' => {
-          :default => 1000,
+          :default => 3000,
           :public => true,
           :type => Integer,
           :allowed_from_server => true,

data/lib/new_relic/agent/configuration/dotted_hash.rb

@@ -36,6 +36,7 @@ module NewRelic
         def dot_flattened(nested_hash, names = [], result = {})
           nested_hash.each do |key, val|
             next if val.nil?
+
             if val.respond_to?(:has_key?)
               dot_flattened(val, names + [key], result)
             else

data/lib/new_relic/agent/configuration/environment_source.rb

@@ -34,6 +34,7 @@ module NewRelic
           set_dotted_alias(config_setting)
 
           return unless value[:aliases]
+
           value[:aliases].each do |config_alias|
             self.alias_map[config_alias] = config_setting
           end

data/lib/new_relic/agent/configuration/high_security_source.rb

@@ -18,6 +18,7 @@ module NewRelic
             :'transaction_tracer.record_sql' => record_sql_setting(local_settings, :'transaction_tracer.record_sql'),
             :'slow_sql.record_sql' => record_sql_setting(local_settings, :'slow_sql.record_sql'),
             :'mongo.obfuscate_queries' => true,
+            :'elasticsearch.obfuscate_queries' => true,
             :'transaction_tracer.record_redis_arguments' => false,
 
             :'custom_insights_events.enabled' => false,

data/lib/new_relic/agent/configuration/manager.rb

@@ -36,6 +36,7 @@ module NewRelic
 
         def add_config_for_testing(source, level = 0)
           raise 'Invalid config type for testing' unless [Hash, DottedHash].include?(source.class)
+
           invoke_callbacks(:add, source)
           @configs_for_testing << [source.freeze, level]
           reset_cache
@@ -110,6 +111,7 @@ module NewRelic
         def fetch(key)
           config_stack.each do |config|
             next unless config
+
             accessor = key.to_sym
 
             if config.has_key?(accessor)
@@ -160,6 +162,7 @@ module NewRelic
 
         def invoke_callbacks(direction, source)
           return unless source
+
           source.keys.each do |key|
             begin
               # we need to evaluate and apply transformations for the value to deal with procs as values

data/lib/new_relic/agent/configuration/security_policy_source.rb

@@ -79,6 +79,15 @@ module NewRelic
                 change_setting(policies, :'mongo.obfuscate_queries', true)
               }
             },
+            {
+              option: :'elasticsearch.capture_queries',
+              supported: true,
+              enabled_fn: method(:enabled?),
+              disabled_value: false,
+              permitted_fn: proc { |policies|
+                change_setting(policies, :'elasticsearch.obfuscate_queries', true)
+              }
+            },
             {
               option: :'transaction_tracer.record_redis_arguments',
               supported: true,
@@ -212,6 +221,7 @@ module NewRelic
           security_policies.inject({}) do |settings, (policy_name, policy_settings)|
             SECURITY_SETTINGS_MAP[policy_name].each do |policy|
               next unless policy[:supported]
+
               if policy_settings[ENABLED]
                 if policy[:enabled_fn].call(policy[:option])
                   if permitted_fn = policy[:permitted_fn]

data/lib/new_relic/agent/configuration/yaml_source.rb

@@ -156,6 +156,7 @@ module NewRelic
         def dot_flattened(nested_hash, names = [], result = {})
           nested_hash.each do |key, val|
             next if val.nil?
+
             if val.respond_to?(:has_key?) && !CONFIG_WITH_HASH_VALUE.include?(key)
               dot_flattened(val, names + [key], result)
             else

data/lib/new_relic/agent/connect/request_builder.rb

@@ -42,6 +42,7 @@ module NewRelic
         # clear out so downstream code doesn't have to check again.
         def sanitize_environment_report(environment_report)
           return NewRelic::EMPTY_ARRAY unless @service.valid_to_marshal?(environment_report)
+
           environment_report
         end
 

data/lib/new_relic/agent/database/obfuscation_helpers.rb

@@ -53,6 +53,7 @@ module NewRelic
 
         def obfuscate_single_quote_literals(sql)
           return sql unless sql =~ COMPONENTS_REGEX_MAP[:single_quotes]
+
           sql.gsub(COMPONENTS_REGEX_MAP[:single_quotes], PLACEHOLDER)
         end
 

data/lib/new_relic/agent/database.rb

@@ -32,6 +32,8 @@ module NewRelic
       # Take care not to the dup the query more than once as
       # correctly encoded may also dup the query.
       def capture_query(query)
+        return unless query
+
         id = query.object_id
         query = Helper.correctly_encoded(truncate_query(query))
         if query.object_id == id
@@ -42,6 +44,8 @@ module NewRelic
       end
 
       def truncate_query(query)
+        return unless query
+
         if query.length > (MAX_QUERY_LENGTH - 4)
           query[0..MAX_QUERY_LENGTH - 4] << ELLIPSIS
         else
@@ -114,6 +118,7 @@ module NewRelic
       # in a report period, selected for shipment to New Relic
       def explain_sql(statement)
         return nil unless statement.sql && statement.explainer && statement.config
+
         statement.sql = statement.sql.split(";\n")[0] # only explain the first
         return statement.explain || []
       end
@@ -223,6 +228,7 @@ module NewRelic
 
         def explain
           return unless explainable?
+
           handle_exception_in_explain do
             start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             plan = @explainer.call(self)
@@ -238,6 +244,7 @@ module NewRelic
 
         def append_sql(new_sql)
           return if new_sql.empty?
+
           @sql = Database.truncate_query(@sql << NEWLINE << new_sql)
         end
 

data/lib/new_relic/agent/database_adapter.rb

@@ -13,6 +13,7 @@ module NewRelic
 
       def self.value
         return unless defined? ActiveRecord::Base
+
         new(::NewRelic::Control.instance.env, ActiveRecord::VERSION::STRING).value
       end
 
@@ -26,6 +27,7 @@ module NewRelic
       def value
         match = VERSIONS.keys.find { |key| version >= Gem::Version.new(key) }
         return unless match
+
         VERSIONS[match].call(env)
       end
     end

data/lib/new_relic/agent/datastores/mongo/event_formatter.rb

@@ -2,7 +2,7 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-require 'new_relic/agent/datastores/mongo/obfuscator'
+require_relative '../nosql_obfuscator'
 
 module NewRelic
   module Agent
@@ -26,6 +26,7 @@ module NewRelic
 
             command.each do |key, value|
               next if DENYLISTED_KEYS.include?(key)
+
               if OBFUSCATE_KEYS.include?(key)
                 obfuscated = obfuscate(value)
                 result[key] = obfuscated if obfuscated
@@ -38,7 +39,7 @@ module NewRelic
 
           def self.obfuscate(statement)
             if NewRelic::Agent.config[:'mongo.obfuscate_queries']
-              statement = Obfuscator.obfuscate_statement(statement)
+              statement = NewRelic::Agent::Datastores::NosqlObfuscator.obfuscate_statement(statement)
             end
             statement
           end

data/lib/new_relic/agent/datastores/mongo/metric_translator.rb

@@ -2,7 +2,7 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-require 'new_relic/agent/datastores/mongo/obfuscator'
+require 'new_relic/agent/datastores/nosql_obfuscator'
 require 'new_relic/agent/datastores/metric_helper'
 
 module NewRelic

data/lib/new_relic/agent/datastores/nosql_obfuscator.rb

@@ -0,0 +1,41 @@
+# 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
+
+module NewRelic
+  module Agent
+    module Datastores
+      module NosqlObfuscator
+        ALLOWLIST = [:operation].freeze
+
+        def self.obfuscate_statement(source, allowlist = ALLOWLIST)
+          if source.is_a?(Hash)
+            obfuscated = {}
+            source.each do |key, value|
+              if allowlist.include?(key)
+                obfuscated[key] = value
+              else
+                obfuscated[key] = obfuscate_value(value, allowlist)
+              end
+            end
+            obfuscated
+          else
+            obfuscate_value(source, allowlist)
+          end
+        end
+
+        QUESTION_MARK = '?'.freeze
+
+        def self.obfuscate_value(value, allowlist = ALLOWLIST)
+          if value.is_a?(Hash)
+            obfuscate_statement(value, allowlist)
+          elsif value.is_a?(Array)
+            value.map { |v| obfuscate_value(v, allowlist) }
+          else
+            QUESTION_MARK
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -64,6 +64,7 @@ module NewRelic
 
       def add_message_cat_headers(headers)
         return unless CrossAppTracing.cross_app_enabled?
+
         @is_cross_app_caller = true
         insert_message_headers(headers,
           transaction.guid,
@@ -112,9 +113,11 @@ module NewRelic
         end
 
         return unless transaction.include_guid?
+
         payload[:guid] = transaction.guid
 
         return unless is_cross_app?
+
         trip_id = cat_trip_id
         path_hash = cat_path_hash
         referring_path_hash = cat_referring_path_hash

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

@@ -25,6 +25,7 @@ module NewRelic
       # inserts them into the specified 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?
@@ -35,8 +36,10 @@ module NewRelic
       # inserts them as intrinsics in the specified transaction_attributes
       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])
         end
       end

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

@@ -23,6 +23,7 @@ module NewRelic
 
       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
 

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

@@ -58,6 +58,7 @@ module NewRelic
         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

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

@@ -96,6 +96,7 @@ module NewRelic
           def extract_traceparent(format, carrier)
             header_name = trace_parent_header_for_format(format)
             return unless header = carrier[header_name]
+
             if matchdata = header.match(TRACE_PARENT_REGEX)
               TRACE_PARENT_REGEX.named_captures.inject({}) do |hash, (name, (index))|
                 hash[name] = matchdata[index]

data/lib/new_relic/agent/encoding_normalizer.rb

@@ -19,9 +19,11 @@ module NewRelic
           normalize_string(object.to_s)
         when Array
           return object if object.empty?
+
           object.map { |x| normalize_object(x) }
         when Hash
           return object if object.empty?
+
           hash = {}
           object.each_pair do |k, v|
             k = normalize_string(k) if k.is_a?(String)