newrelic_rpm 8.11.0 → 8.13.0

data/test/agent_helper.rb

@@ -48,6 +48,7 @@ end
 
 def assert_has_traced_error(error_class)
   errors = harvest_error_traces!
+
   refute_nil errors.find { |e| e.exception_class_name == error_class.name }, \
     "Didn't find error of class #{error_class}"
 end
@@ -83,6 +84,7 @@ end
 unless defined? assert_includes
   def assert_includes(collection, member, msg = nil)
     msg = "Expected #{collection.inspect} to include #{member.inspect}"
+
     assert_includes collection, member, msg
   end
 end
@@ -90,6 +92,7 @@ end
 unless defined? assert_not_includes
   def assert_not_includes(collection, member, msg = nil)
     msg = "Expected #{collection.inspect} not to include #{member.inspect}"
+
     refute_includes collection, member, msg
   end
 end
@@ -107,6 +110,7 @@ end
 
 def assert_log_contains(log, message)
   lines = log.array
+
   assert (lines.any? { |line| line.match(message) })
 end
 
@@ -117,6 +121,7 @@ def assert_audit_log_contains(audit_log_contents, needle)
   regex = /[:"]/
   needle = needle.gsub(regex, '')
   haystack = audit_log_contents.gsub(regex, '')
+
   assert_includes(haystack, needle, "Expected log to contain '#{needle}'")
 end
 
@@ -136,10 +141,12 @@ def assert_audit_log_contains_object(audit_log_contents, o, format = :json)
       assert_audit_log_contains_object(audit_log_contents, k, format)
     end
   when Array
+
     o.each do |el|
       assert_audit_log_contains_object(audit_log_contents, el, format)
     end
   when NilClass
+
     assert_audit_log_contains(audit_log_contents, format == :json ? "null" : "nil")
   else
     assert_audit_log_contains(audit_log_contents, o.inspect)
@@ -148,6 +155,7 @@ end
 
 def compare_metrics(expected, actual)
   actual.delete_if { |a| a.include?('GC/Transaction/') }
+
   assert_equal(expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.inspect}; missing: #{(expected - actual).to_a.inspect}")
 end
 
@@ -206,6 +214,7 @@ def assert_stats_has_values_with_call_count(expected_value, actual_value, msg)
   if expected_value.to_s =~ /([<>]=?)\s*(\d+)/
     operator = Regexp.last_match(1).to_sym
     count = Regexp.last_match(2).to_i
+
     assert_operator(actual_value, operator, count, msg)
   # == comparison
   else
@@ -229,6 +238,7 @@ def assert_metrics_recorded(expected)
 
       assert(actual_stats, msg) # rubocop:disable Minitest/AssertWithExpectedArgument
     end
+
     assert_stats_has_values(actual_stats, expected_spec, expected_attrs)
   end
 end
@@ -246,6 +256,7 @@ end
 #
 def assert_metrics_recorded_exclusive(expected, options = {})
   expected = _normalize_metric_expectations(expected)
+
   assert_metrics_recorded(expected)
 
   recorded_metrics = NewRelic::Agent.instance.stats_engine.to_h.keys
@@ -300,6 +311,7 @@ def assert_metrics_not_recorded(not_expected)
       found_but_not_expected << spec
     end
   end
+
   assert_empty(found_but_not_expected, "Found unexpected metrics: #{format_metric_spec_list(found_but_not_expected)}")
 end
 
@@ -328,11 +340,13 @@ end
 
 def assert_truthy(expected, msg = nil)
   msg ||= "Expected #{expected.inspect} to be truthy"
+
   refute !expected, msg
 end
 
 def assert_falsy(expected, msg = nil)
   msg ||= "Expected #{expected.inspect} to be falsy"
+
   refute expected, msg
 end
 
@@ -411,6 +425,7 @@ end
 def build_deferred_error_attributes(segment)
   return unless segment.noticed_error
   return if segment.noticed_error_attributes.frozen?
+
   segment.noticed_error.build_error_attributes
 end
 
@@ -454,6 +469,7 @@ end
 
 def last_transaction_trace
   return unless last_sample = NewRelic::Agent.agent.transaction_sampler.last_sample
+
   NewRelic::Agent::Transaction::TraceBuilder.build_trace(last_sample)
 end
 
@@ -639,6 +655,7 @@ def constant_path(name, opts = {})
     if !path.last.constants.include?(part.to_sym)
       return allow_partial ? path : nil
     end
+
     path << path.last.const_get(part)
   end
   path
@@ -655,6 +672,7 @@ def undefine_constant(constant_symbol)
   parent = get_parent(const_str)
   const_name = const_str.gsub(/.*::/, '')
   return yield unless parent && parent.constants.include?(const_name.to_sym)
+
   removed_constant = parent.send(:remove_const, const_name)
   yield
 ensure
@@ -884,6 +902,7 @@ def assert_event_attributes(event, test_name, expected_attributes, non_expected_
   event_attrs.each do |name, actual_value|
     msg << "  #{name}: #{actual_value.inspect}\n"
   end
+
   assert_empty(incorrect_attributes, msg)
 
   non_expected_attributes.each do |name|
@@ -929,6 +948,7 @@ def mock_http_response(headers, wrap_it = true)
     net_http_resp.add_field(key.to_s, value)
   end
   return net_http_resp unless wrap_it
+
   NewRelic::Agent::HTTPClients::NetHTTPResponse.new(net_http_resp)
 end
 
@@ -945,6 +965,7 @@ end
 # the expectations against it.
 def assert_segment_noticed_error(txn, segment_name, error_classes, error_message)
   error_segment = txn.segments.reverse.detect { |s| s.noticed_error }
+
   assert error_segment, "Expected at least one segment with a noticed_error"
 
   assert_match_or_equal segment_name, error_segment.name
@@ -962,6 +983,7 @@ end
 
 def refute_transaction_noticed_error(txn, error_class)
   error_segment = txn.segments.reverse.detect { |s| s.noticed_error }
+
   assert error_segment, "Expected at least one segment with a noticed_error"
   assert_empty txn.exceptions, "Expected transaction to NOT notice any segment errors"
 end
@@ -974,10 +996,12 @@ def refute_raises(*exp)
   rescue MiniTest::Skip => e
     puts "SKIP REPORTS: #{e.inspect}"
     return e if exp.include?(MiniTest::Skip)
+
     raise e
   rescue Exception => e
     puts "EXCEPTION RAISED: #{e.inspect}\n#{e.backtrace}"
     exp = exp.first if exp.size == 1
+
     flunk(msg || "unexpected exception raised: #{e}")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 8.11.0
+  version: 8.13.0
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,14 +61,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -83,62 +83,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 12.3.3
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -153,34 +97,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.26
 description: |
   New Relic is a performance management system, developed by New Relic,
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -272,7 +202,7 @@ files:
 - lib/new_relic/agent/datastores/mongo.rb
 - lib/new_relic/agent/datastores/mongo/event_formatter.rb
 - lib/new_relic/agent/datastores/mongo/metric_translator.rb
-- lib/new_relic/agent/datastores/mongo/obfuscator.rb
+- lib/new_relic/agent/datastores/nosql_obfuscator.rb
 - lib/new_relic/agent/datastores/redis.rb
 - lib/new_relic/agent/deprecator.rb
 - lib/new_relic/agent/distributed_tracing.rb
@@ -339,6 +269,10 @@ files:
 - lib/new_relic/agent/instrumentation/delayed_job/instrumentation.rb
 - lib/new_relic/agent/instrumentation/delayed_job/prepend.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
+- lib/new_relic/agent/instrumentation/elasticsearch.rb
+- lib/new_relic/agent/instrumentation/elasticsearch/chain.rb
+- lib/new_relic/agent/instrumentation/elasticsearch/instrumentation.rb
+- lib/new_relic/agent/instrumentation/elasticsearch/prepend.rb
 - lib/new_relic/agent/instrumentation/excon.rb
 - lib/new_relic/agent/instrumentation/excon/middleware.rb
 - lib/new_relic/agent/instrumentation/grape.rb
@@ -407,7 +341,9 @@ files:
 - lib/new_relic/agent/instrumentation/rake/prepend.rb
 - lib/new_relic/agent/instrumentation/redis.rb
 - lib/new_relic/agent/instrumentation/redis/chain.rb
+- lib/new_relic/agent/instrumentation/redis/constants.rb
 - lib/new_relic/agent/instrumentation/redis/instrumentation.rb
+- lib/new_relic/agent/instrumentation/redis/middleware.rb
 - lib/new_relic/agent/instrumentation/redis/prepend.rb
 - lib/new_relic/agent/instrumentation/resque.rb
 - lib/new_relic/agent/instrumentation/resque/chain.rb
@@ -417,6 +353,9 @@ files:
 - lib/new_relic/agent/instrumentation/sequel.rb
 - lib/new_relic/agent/instrumentation/sequel_helper.rb
 - lib/new_relic/agent/instrumentation/sidekiq.rb
+- lib/new_relic/agent/instrumentation/sidekiq/client.rb
+- lib/new_relic/agent/instrumentation/sidekiq/extensions/delayed_class.rb
+- lib/new_relic/agent/instrumentation/sidekiq/server.rb
 - lib/new_relic/agent/instrumentation/sinatra.rb
 - lib/new_relic/agent/instrumentation/sinatra/chain.rb
 - lib/new_relic/agent/instrumentation/sinatra/ignorer.rb

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

@@ -1,43 +0,0 @@
-# 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 Mongo
-        module Obfuscator
-          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
-end