newrelic_rpm 7.2.0 → 8.0.0

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Aaron Huntsman
 - Tanna McClure
-- Michael Lang
+- Kayla Reopelle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -261,7 +261,6 @@ files:
 - 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/mongo/statement_formatter.rb
 - lib/new_relic/agent/datastores/redis.rb
 - lib/new_relic/agent/deprecator.rb
 - lib/new_relic/agent/distributed_tracing.rb
@@ -325,7 +324,6 @@ files:
 - lib/new_relic/agent/instrumentation/delayed_job/prepend.rb
 - lib/new_relic/agent/instrumentation/delayed_job_instrumentation.rb
 - lib/new_relic/agent/instrumentation/excon.rb
-- lib/new_relic/agent/instrumentation/excon/connection.rb
 - lib/new_relic/agent/instrumentation/excon/middleware.rb
 - lib/new_relic/agent/instrumentation/grape.rb
 - lib/new_relic/agent/instrumentation/grape/chain.rb
@@ -346,8 +344,6 @@ files:
 - lib/new_relic/agent/instrumentation/memcache/helper.rb
 - lib/new_relic/agent/instrumentation/memcache/instrumentation.rb
 - lib/new_relic/agent/instrumentation/memcache/prepend.rb
-- lib/new_relic/agent/instrumentation/merb/controller.rb
-- lib/new_relic/agent/instrumentation/merb/errors.rb
 - lib/new_relic/agent/instrumentation/middleware_proxy.rb
 - lib/new_relic/agent/instrumentation/middleware_tracing.rb
 - lib/new_relic/agent/instrumentation/mongo.rb
@@ -503,7 +499,6 @@ files:
 - lib/new_relic/control/class_methods.rb
 - lib/new_relic/control/frameworks.rb
 - lib/new_relic/control/frameworks/external.rb
-- lib/new_relic/control/frameworks/merb.rb
 - lib/new_relic/control/frameworks/rails.rb
 - lib/new_relic/control/frameworks/rails3.rb
 - lib/new_relic/control/frameworks/rails4.rb

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

@@ -1,53 +0,0 @@
-# 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.
-
-require 'new_relic/agent/datastores/mongo/obfuscator'
-
-module NewRelic
-  module Agent
-    module Datastores
-      module Mongo
-        module StatementFormatter
-
-          PLAINTEXT_KEYS = [
-            :database,
-            :collection,
-            :operation,
-            :fields,
-            :skip,
-            :limit,
-            :order
-          ]
-
-          OBFUSCATE_KEYS = [
-            :selector
-          ]
-
-          def self.format(statement, operation)
-            return nil unless NewRelic::Agent.config[:'mongo.capture_queries']
-
-            result = { :operation => operation }
-
-            PLAINTEXT_KEYS.each do |key|
-              result[key] = statement[key] if statement.key?(key)
-            end
-
-            OBFUSCATE_KEYS.each do |key|
-              if statement.key?(key) && statement[key]
-                obfuscated = obfuscate(statement[key])
-                result[key] = obfuscated if obfuscated
-              end
-            end
-            result
-          end
-
-          def self.obfuscate(statement)
-            statement = Obfuscator.obfuscate_statement(statement) if NewRelic::Agent.config[:'mongo.obfuscate_queries']
-            statement
-          end
-        end
-      end
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/excon/connection.rb

@@ -1,49 +0,0 @@
-# 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.
-
-module ::Excon
-  class Connection
-    # @connection is deprecated in newer excon versions and replaced with @data
-    def newrelic_connection_params
-      (@data || @connection)
-    end
-
-    def newrelic_resolved_request_params(request_params)
-      resolved = newrelic_connection_params.merge(request_params)
-      resolved[:headers] = resolved[:headers].merge(request_params[:headers] || {})
-      resolved
-    end
-
-    def request_with_newrelic_trace(params, &block)
-      resolved_params = newrelic_resolved_request_params(params)
-      wrapped_request = ::NewRelic::Agent::HTTPClients::ExconHTTPRequest.new(resolved_params)
-      segment = NewRelic::Agent::Tracer.start_external_request_segment(
-        library: wrapped_request.type,
-        uri: wrapped_request.uri,
-        procedure: wrapped_request.method
-      )
-
-      begin
-        response = nil
-        segment.add_request_headers wrapped_request
-
-        response = NewRelic::Agent::Tracer.capture_segment_error segment do
-          request_without_newrelic_trace(resolved_params, &block)
-        end
-
-        wrapped_response = ::NewRelic::Agent::HTTPClients::ExconHTTPResponse.new(response)
-        segment.process_response_headers wrapped_response
-
-        response
-      ensure
-        segment.finish if segment
-      end
-    end
-
-    def self.install_newrelic_instrumentation
-      alias request_without_newrelic_trace request
-      alias request request_with_newrelic_trace
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/merb/controller.rb

@@ -1,44 +0,0 @@
-# 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.
-
-require 'set'
-
-DependencyDetection.defer do
-  @name = :merb_controller
-
-  depends_on do
-    defined?(Merb) && defined?(Merb::Controller)
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Merb Controller instrumentation'
-  end
-
-  executes do
-    require 'merb-core/controller/merb_controller'
-
-    Merb::Controller.class_eval do
-      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-
-      # determine the path that is used in the metric name for
-      # the called controller action
-      def newrelic_metric_path
-        "#{controller_name}/#{action_name}"
-      end
-
-      protected
-
-      def _dispatch_with_newrelic_trace(*args)
-        options = {}
-        options[:params] = params
-        perform_action_with_newrelic_trace(options) do
-          _dispatch_without_newrelic_trace(*args)
-        end
-      end
-
-      alias_method :_dispatch_without_newrelic_trace, :_dispatch
-      alias_method :_dispatch, :_dispatch_with_newrelic_trace
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/merb/errors.rb

@@ -1,33 +0,0 @@
-# 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.
-
-DependencyDetection.defer do
-  @name = :merb_error
-
-  depends_on do
-    defined?(Merb) && defined?(Merb::Dispatcher) && defined?(Merb::Dispatcher::DefaultException)
-  end
-
-  depends_on do
-    Merb::Dispatcher::DefaultException.respond_to?(:before)
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Merb Errors instrumentation'
-  end
-
-  executes do
-
-    # Hook in the notification to merb
-    error_notifier = Proc.new {
-      if request.exceptions #check that there's actually an exception
-        # Note, this assumes we have already captured the other information such as uri and params in the Transaction.
-        NewRelic::Agent::Transaction.notice_error(request.exceptions.first)
-      end
-    }
-    Merb::Dispatcher::DefaultException.before error_notifier
-    Exceptions.before error_notifier
-
-  end
-end

data/lib/new_relic/control/frameworks/merb.rb

@@ -1,29 +0,0 @@
-# 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.
-
-module NewRelic
-  class Control
-    module Frameworks
-      # Includes limited support for Merb
-      class Merb < NewRelic::Control
-
-        def env
-          @env ||= ::Merb.env
-        end
-        def root
-          ::Merb.root
-        end
-
-        def init_config options={}
-          ::Merb::Plugins.add_rakefiles File.join(newrelic_root,"lib/tasks/all.rb")
-
-          # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
-          ::Merb::Plugins.config[:newrelic] = {
-            :config => self
-          }
-        end
-      end
-    end
-  end
-end