newrelic_rpm 8.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fab89acaea13ee0c348b26ff7d94118b358e9ac3ea6a48c4c231a1e0821d534
-  data.tar.gz: b434c14af26d097547b16601384c045a9b7b119261b17c58b2727b36ff05cf52
+  metadata.gz: dee9561e93a6cd3e2ae811234dae75cd65310c394031fcf3ad3091b46185cb6a
+  data.tar.gz: 7c017fcfeefe7fcce7ce662bed42cc3258028fb42a36e849cbc0d84231e8c4be
 SHA512:
-  metadata.gz: 9c568e526ec679b12cc06e3a9ed40b592665774775baf016b9be0374bea32518529c82eef199bc6369ff394c84732b0b6d7e8919f63097eb39343cde30cbca26
-  data.tar.gz: dde7b7c0d46c2b918d5b97f9e08eadbb1a0f1bccfcd52454600fb7fa17ea4de450c856f99ab87f2d030694ede1779b8224f8ff4c757f4755b9bd3213c181ee97
+  metadata.gz: 7b51ea238bcbaadfc37ed5364556dbb994788a0214dcd4c890ecbf4bb20aac744db0c733e32955da60c60f1e28220f44b8529bdab74d3af613985a5ac6076ab2
+  data.tar.gz: d3400acd658bffec6058a3a7f7ac7e2df0a36ee95777bfc44768f839ec7b6c29184c8172b43d3f9f43a211add2c108aa68a3358f7b93d1e9581b19eeb8f37bd3

data/CHANGELOG.md

@@ -1,5 +1,40 @@
 # New Relic Ruby Agent Release Notes #
 
+  ## v8.2.0
+
+  * **New Instrumentation for Tilt gem**
+
+    Template rendering using [Tilt](https://github.com/rtomayko/tilt) is now instrumented. See [PR #847](https://github.com/newrelic/newrelic-ruby-agent/pull/847) for details.
+
+  * **Configuration `error_collector.ignore_errors` is marked as deprecated**
+
+    This setting has been marked as deprecated in the documentation since version 7.2.0 and is now flagged as deprecated within the code.
+
+  * **Remove Rails 2 instrumentation**
+
+    Though any version of Rails 2 has not been supported by the Ruby Agent since v3.18.1.330, instrumentation for ActionController and ActionWebService specific to that version were still part of the agent. This instrumentation has been removed.
+
+  * **Remove duplicated settings from newrelic.yml**
+
+    Thank you @jakeonfire for bringing this to our attention and @kuroponzu for making the changes!
+
+  * **Bugfix: Span Events recorded when using newrelic_ignore**
+
+    Previously, the agent was incorrectly recording span events only on transactions that should be ignored. This fix will prevent any span events from being created for transactions using newrelic_ignore, or ignored through the `rules.ignore_url_regexes` configuration option.
+  
+  * **Bugfix: Print deprecation warning for Cross-Application Tracing if enabled**
+
+    Prior to this change, the deprecation warning would log whenever the agent started up, regardless of configuration. Thank you @alpha-san for bringing this to our attention!
+
+  * **Bugfix: Scrub non-unicode characters from DecoratingLogger**
+
+    To prevent `JSON::GeneratorErrors`, the DecoratingLogger replaces non-unicode characters with the replacement character: �. Thank you @jdelStrother for bringing this to our attention!
+    
+  * **Bugfix: Distributed tracing headers emitted errors when agent was not connected**
+
+    Previously, when the agent had not yet connected it would fail to create a trace context payload and emit an error, "TypeError: no implicit conversion of nil into String," to the agent logs. The correct behavior in this situation is to not create these headers due to the lack of required information. Now, the agent will not attempt to create trace context payloads until it has connected. Thank you @Izzette for bringing this to our attention!
+
+
   ## v8.1.0
 
   * **Instrumentation for Ruby standard library Logger**
@@ -22,6 +57,10 @@
 
     Integers not wrapped in quotation marks can be passed to `error_collector.ignore_status_codes` in the `newrelic.yml` file. Our thanks goes to @elaguerta and @brammerl for resolving this issue!
 
+  * **Bugfix: Allow add_method_tracer to be used on BasicObjects**
+
+    Previously, our `add_method_tracer` changes referenced `self.class` which is not available on `BasicObjects`. This has been fixed. Thanks to @toncid for bringing this issue to our attention.
+
 
   ## v8.0.0
 

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

@@ -1007,6 +1007,14 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'Controls auto-instrumentation of Ruby standard library Logger at start up.  May be one of [auto|prepend|chain|disabled].'
         },
+        :'instrumentation.tilt' => {
+          :default => "auto",
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of Tilt at start up.  May be one of [auto|prepend|chain|disabled].'
+        },
         :disable_data_mapper => {
           :default => false,
           :public => true,
@@ -1305,6 +1313,7 @@ module NewRelic
           :default => 'ActionController::RoutingError,Sinatra::NotFound',
           :public => true,
           :type => String,
+          :deprecated => true, 
           :allowed_from_server => true,
           :dynamic_name => true,
           :description => 'Use `error_collector.ignore_classes` instead. Specify a comma-delimited list of error classes that the agent should ignore.'
@@ -1805,10 +1814,7 @@ module NewRelic
           :type         => Array,
           :allowed_from_server => true,
           :transform    => DefaultSource.method(:convert_to_regexp_list),
-          :description  => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore.' \
-            '*Note:* This will only ignore transaction events, not spans or traces from the same transation. See documentation on ' \
-            '(Ignoring Specific Transactions)[https://docs.newrelic.com/docs/agents/ruby-agent/api-guides/ignoring-specific-transactions/#config-ignoring] ' \
-            'for more details.'
+          :description  => 'Define transactions you want the agent to ignore, by specifying a list of patterns matching the URI you want to ignore.' 
         },
         :'synthetics.traces_limit' => {
           :default      => 20,

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

@@ -110,15 +110,15 @@ module NewRelic
       end
 
       def to_s
-        result = version.to_s
-        result << DELIMITER << parent_type_id.to_s
-        result << DELIMITER << parent_account_id
-        result << DELIMITER << parent_app_id
+        result = version.to_s # required
+        result << DELIMITER << parent_type_id.to_s # required 
+        result << DELIMITER << parent_account_id # required 
+        result << DELIMITER << parent_app_id # required 
         result << DELIMITER << (id || NewRelic::EMPTY_STR)
         result << DELIMITER << (transaction_id || NewRelic::EMPTY_STR)
         result << DELIMITER << (sampled ? TRUE_CHAR : FALSE_CHAR)
         result << DELIMITER << sprintf("%.6f", priority)
-        result << DELIMITER << timestamp.to_s
+        result << DELIMITER << timestamp.to_s # required 
         result
       end
     end

data/lib/new_relic/agent/instrumentation/memcache/dalli.rb

@@ -51,7 +51,11 @@ module NewRelic
           end
 
           def instrument_send_multiget
-            ::Dalli::Server.class_eval do
+            if supports_binary_protocol?
+              ::Dalli::Protocol::Binary
+            else
+              ::Dalli::Server
+            end.class_eval do
               include NewRelic::Agent::Instrumentation::Memcache::Tracer
               alias_method :send_multiget_without_newrelic_trace, :send_multiget
 

data/lib/new_relic/agent/instrumentation/memcache/helper.rb

@@ -7,11 +7,16 @@ module NewRelic::Agent::Instrumentation
   module Memcache
     module Helper
       DATASTORE_INSTANCES_SUPPORTED_VERSION = Gem::Version.new '2.6.4'
+      BINARY_PROTOCOL_SUPPORTED_VERSION = Gem::Version.new '3.0.2'
 
       def supports_datastore_instances?
         DATASTORE_INSTANCES_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
       end
 
+      def supports_binary_protocol?
+        BINARY_PROTOCOL_SUPPORTED_VERSION <= Gem::Version.new(::Dalli::VERSION)
+      end
+
       def client_methods
         [:get, :get_multi, :set, :add, :incr, :decr, :delete, :replace, :append,
           :prepend, :cas, :single_get, :multi_get, :single_cas, :multi_cas]

data/lib/new_relic/agent/instrumentation/memcache/prepend.rb

@@ -31,7 +31,13 @@ module NewRelic::Agent::Instrumentation
         if supports_datastore_instances?
           yield ::Dalli::Client, dalli_client_prepender(dalli_methods)
           yield ::Dalli::Client, dalli_get_multi_prepender(:get_multi)
-          yield ::Dalli::Server, dalli_server_prepender
+
+          if supports_binary_protocol?
+            yield ::Dalli::Protocol::Binary, dalli_server_prepender
+          else
+            yield ::Dalli::Server, dalli_server_prepender
+          end
+
           yield ::Dalli::Ring, dalli_ring_prepender
         else
           yield ::Dalli::Client, dalli_client_prepender(client_methods)
@@ -85,4 +91,4 @@ module NewRelic::Agent::Instrumentation
       end
     end
   end
-end
+end

data/lib/new_relic/agent/instrumentation/tilt/chain.rb

@@ -0,0 +1,24 @@
+# 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::Agent::Instrumentation
+  module Tilt
+    module Chain
+      def self.instrument!
+        ::Tilt::Template.module_eval do
+          include NewRelic::Agent::Instrumentation::Tilt
+
+          def render_with_new_relic(*args, &block)
+            render_with_tracing(*args) {
+              render_without_newrelic(*args, &block)
+            }
+          end
+
+          alias render_without_newrelic render
+          alias render render_with_new_relic
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/tilt/instrumentation.rb

@@ -0,0 +1,41 @@
+# 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
+  module Agent
+    module Instrumentation
+      module Tilt
+
+        def metric_name(klass, file)
+          "View/#{klass}/#{file}/Rendering"
+        end
+
+        # Sinatra uses #caller_locations for the file name in Tilt (unlike Rails/Rack)
+        # So here we are only grabbing the file name and name of directory it is in
+        def create_filename_for_metric(file)
+          return file unless defined?(::Sinatra) && defined?(::Sinatra::Base)
+          file.split('/')[-2..-1].join('/')
+        rescue NoMethodError
+          file
+        end
+
+        def render_with_tracing(*args, &block)
+          begin
+            finishable = Tracer.start_segment(
+              name: metric_name(self.class, create_filename_for_metric(self.file))
+            )
+            begin
+              yield
+            rescue => error
+              NewRelic::Agent.notice_error(error)
+              raise
+            end
+          ensure
+            finishable.finish if finishable
+          end
+        end
+      end
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/tilt/prepend.rb

@@ -0,0 +1,13 @@
+# 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::Agent::Instrumentation
+  module Tilt::Prepend
+    include NewRelic::Agent::Instrumentation::Tilt
+
+    def render(*args, &block)
+      render_with_tracing { super }
+    end
+  end
+end

data/lib/new_relic/agent/instrumentation/tilt.rb

@@ -0,0 +1,25 @@
+# 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_relative 'tilt/instrumentation'
+require_relative 'tilt/chain'
+require_relative 'tilt/prepend'
+
+DependencyDetection.defer do
+  named :tilt
+
+  depends_on { defined?(::Tilt) }
+
+  executes do
+    ::NewRelic::Agent.logger.info('Installing Tilt instrumentation')
+  end
+
+  executes do
+    if use_prepend?
+      prepend_instrument ::Tilt::Template, NewRelic::Agent::Instrumentation::Tilt::Prepend
+    else
+      chain_instrument NewRelic::Agent::Instrumentation::Tilt::Chain
+    end
+  end
+end

data/lib/new_relic/agent/logging.rb

@@ -33,6 +33,7 @@ module NewRelic
         COLON = ':'.freeze
         COMMA = ','.freeze
         CLOSING_BRACE = '}'.freeze
+        REPLACEMENT_CHAR = '�'
 
         def initialize
           Agent.config.register_callback :app_name do
@@ -86,12 +87,10 @@ module NewRelic
           message << QUOTE << key << QUOTE << COLON << QUOTE << value << QUOTE
         end
 
-        def escape message
-          if String === message
-            message.to_json
-          else
-            message.inspect.to_json
-          end
+        def escape(message)
+          message = message.to_s unless message.is_a?(String)
+          message = message.scrub(REPLACEMENT_CHAR) unless message.valid_encoding?
+          message.to_json
         end
 
         def clear_tags!

data/lib/new_relic/agent/monitors/cross_app_monitor.rb

@@ -22,10 +22,12 @@ module NewRelic
         CONTENT_LENGTH_HEADER_KEY = 'HTTP_CONTENT_LENGTH'.freeze
 
         def on_finished_configuring(events)
-          Deprecator.deprecate('cross_application_tracer')
-          ::NewRelic::Agent.logger.warn(
-            "[DEPRECATED] Cross application tracing is enabled. Distributed tracing is replacing cross application tracing as the default means of tracing between services. To continue using cross application tracing, enable it with `cross_application_tracer.enabled: true` and `distributed_tracing.enabled: false`"
-          )
+          if CrossAppTracing.cross_app_enabled?
+            Deprecator.deprecate('cross_application_tracer')
+            ::NewRelic::Agent.logger.warn(
+              "[DEPRECATED] Cross application tracing is enabled. Distributed tracing is replacing cross application tracing as the default means of tracing between services. To continue using cross application tracing, enable it with `cross_application_tracer.enabled: true` and `distributed_tracing.enabled: false`"
+            )
+          end
 
           register_event_listeners(events)
         end

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

@@ -138,6 +138,9 @@ module NewRelic
         end
 
         def record_span_event
+          # don't record a span event if the transaction is ignored
+          return if transaction.ignore?
+          
           aggregator = ::NewRelic::Agent.agent.span_event_aggregator
           priority   = transaction.priority
 

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

@@ -73,6 +73,7 @@ module NewRelic
         end
 
         def insert_headers headers
+          return unless NewRelic::Agent.agent.connected?
           insert_trace_context_header headers
           insert_distributed_trace_header headers
           insert_cross_app_header headers

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

@@ -250,6 +250,9 @@ module NewRelic
         end
 
         def record_span_event
+          # don't record a span event if the transaction is ignored
+          return if transaction.ignore?
+
           aggregator = ::NewRelic::Agent.agent.span_event_aggregator
           priority   = transaction.priority
           aggregator.record(priority: priority) do

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

@@ -79,6 +79,9 @@ module NewRelic
         end
 
         def record_span_event
+          # don't record a span event if the transaction is ignored
+          return if transaction.ignore?
+
           aggregator = ::NewRelic::Agent.agent.span_event_aggregator
           priority   = transaction.priority
 

data/lib/new_relic/version.rb

@@ -11,7 +11,7 @@ module NewRelic
     end
 
     MAJOR = 8
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     begin

data/newrelic.yml

@@ -32,18 +32,6 @@ common: &default_settings
 # Defines the maximum number of request events reported from a single harvest.
 # analytics_events.max_samples_stored: 1200
 
-# If true, enables analytics event sampling.
-# analytics_events.enabled: true
-
-# If true, enables analytics event sampling.
-# analytics_events.enabled: true
-
-# Defines the maximum number of request events reported from a single harvest.
-# analytics_events.max_samples_stored: 1200
-
-# Defines the maximum number of request events reported from a single harvest.
-# analytics_events.max_samples_stored: 1200
-
 # Prefix of attributes to exclude from all destinations. Allows * as wildcard at
 # end.
 # attributes_exclude: []
@@ -222,18 +210,12 @@ common: &default_settings
 # Allows * as wildcard at end.
 # error_collector.attributes.include: []
 
-# If true, the agent collects TransactionError events.
-# error_collector.capture_events: false
-
 # If true, the agent collects TransactionError events.
 # error_collector.capture_events: true
 
 # If true, the agent captures traced errors and error count metrics.
 # error_collector.enabled: true
 
-# If true, the agent captures traced errors and error count metrics.
-# error_collector.enabled: true
-
 # A list of error classes that the agent should treat as expected.
 # error_collector.expected_classes: []
 
@@ -389,6 +371,10 @@ common: &default_settings
 # May be one of [auto|prepend|chain|disabled].
 # instrumentation.sinatra: auto
 
+# Controls auto-instrumentation of Tilt at start up.
+# May be one of [auto|prepend|chain|disabled].
+# instrumentation.tilt: auto
+
 # Controls auto-instrumentation of Typhoeus at start up.
 # May be one of [auto|prepend|chain|disabled].
 # instrumentation.typhoeus: auto

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Aaron Huntsman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-27 00:00:00.000000000 Z
+date: 2021-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -368,8 +368,6 @@ files:
 - lib/new_relic/agent/instrumentation/rack/helpers.rb
 - lib/new_relic/agent/instrumentation/rack/instrumentation.rb
 - lib/new_relic/agent/instrumentation/rack/prepend.rb
-- lib/new_relic/agent/instrumentation/rails/action_controller.rb
-- lib/new_relic/agent/instrumentation/rails/action_web_service.rb
 - lib/new_relic/agent/instrumentation/rails3/action_controller.rb
 - lib/new_relic/agent/instrumentation/rails_middleware.rb
 - lib/new_relic/agent/instrumentation/rails_notifications/action_cable.rb
@@ -399,6 +397,10 @@ files:
 - lib/new_relic/agent/instrumentation/sinatra/prepend.rb
 - lib/new_relic/agent/instrumentation/sinatra/transaction_namer.rb
 - lib/new_relic/agent/instrumentation/sunspot.rb
+- lib/new_relic/agent/instrumentation/tilt.rb
+- lib/new_relic/agent/instrumentation/tilt/chain.rb
+- lib/new_relic/agent/instrumentation/tilt/instrumentation.rb
+- lib/new_relic/agent/instrumentation/tilt/prepend.rb
 - lib/new_relic/agent/instrumentation/typhoeus.rb
 - lib/new_relic/agent/instrumentation/typhoeus/chain.rb
 - lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb

data/lib/new_relic/agent/instrumentation/rails/action_controller.rb

@@ -1,125 +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/parameter_filtering'
-
-DependencyDetection.defer do
-  @name = :rails21_view
-
-  depends_on do
-    !NewRelic::Agent.config[:disable_view_instrumentation] &&
-    defined?(ActionController) && defined?(ActionController::Base) && defined?(ActionView::PartialTemplate) && defined?(ActionView::Template) &&
-    defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.1\./   # Rails 2.1 &&
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 2.1 View instrumentation'
-  end
-
-  executes do
-    ActionView::PartialTemplate.class_eval do
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :render, -> (*) { "View/#{path_without_extension[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Partial" }
-    end
-
-    # this is for template rendering, as opposed to partial rendering.
-    ActionView::Template.class_eval do
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :render, -> (*) { "View/#{(path_without_extension || @view.controller.newrelic_metric_path)[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Rendering" }
-    end
-  end
-end
-
-DependencyDetection.defer do
-  @name = :old_rails_view
-
-  depends_on do
-    !NewRelic::Agent.config[:disable_view_instrumentation] &&
-    defined?(ActionController) && defined?(ActionController::Base) &&
-    defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^(1\.|2\.0)/  # Rails 1.* - 2.0
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 1.* - 2.0 View instrumentation'
-  end
-
-  executes do
-    ActionController::Base.class_eval do
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :render, -> (*) { "View/#{newrelic_metric_path}/Rendering" }
-    end
-  end
-end
-
-DependencyDetection.defer do
-  @name = :rails23_view
-
-  depends_on do
-    !NewRelic::Agent.config[:disable_view_instrumentation] &&
-    defined?(ActionView) && defined?(ActionView::Template) && defined?(ActionView::RenderablePartial) &&
-    defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.[23]/
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 2.2 - 2.3 View instrumentation'
-  end
-
-  executes do
-    ActionView::RenderablePartial.module_eval do
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :render_partial, -> (*) { "View/#{path[%r{^(/.*/)?(.*)$},2]}/Partial" }
-    end
-
-    ActionView::Template.class_eval do
-      include NewRelic::Agent::MethodTracer
-      add_method_tracer :render, -> (*) { "View/#{path[%r{^(/.*/)?(.*)$},2]}/Rendering" }
-    end
-  end
-end
-
-DependencyDetection.defer do
-  @name = :rails2_controller
-
-  depends_on do
-    defined?(ActionController) && defined?(ActionController::Base)
-  end
-
-  depends_on do
-    defined?(Rails::VERSION::MAJOR) && Rails::VERSION::MAJOR.to_i == 2
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails 2 Controller instrumentation'
-  end
-
-  executes do
-    ActionController::Base.class_eval do
-      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-
-      def perform_action_with_newrelic_trace_wrapper
-        munged_params = (respond_to?(:filter_parameters)) ? filter_parameters(params) : params
-        munged_params = NewRelic::Agent::ParameterFiltering.filter_rails_request_parameters(munged_params)
-
-        perform_action_with_newrelic_trace(:params => munged_params) do
-          perform_action_without_newrelic_trace
-        end
-      end
-
-      alias_method :perform_action_without_newrelic_trace, :perform_action
-      alias_method :perform_action, :perform_action_with_newrelic_trace_wrapper
-      private :perform_action
-
-      # determine the path that is used in the metric name for
-      # the called controller action
-      def newrelic_metric_path(action_name_override = nil)
-        action_part = action_name_override || action_name
-        if action_name_override || self.class.action_methods.include?(action_part)
-          "#{self.class.controller_path}/#{action_part}"
-        else
-          "#{self.class.controller_path}/(other)"
-        end
-      end
-    end
-  end
-end

data/lib/new_relic/agent/instrumentation/rails/action_web_service.rb

@@ -1,46 +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 = :rails_action_web_service
-
-  depends_on do
-    defined?(ActionWebService)
-  end
-
-  executes do
-    ::NewRelic::Agent.logger.info 'Installing Rails ActionWebService instrumentation'
-  end
-
-  executes do
-    # NewRelic Agent instrumentation for WebServices
-
-    # Note Action Web Service is removed from default package in rails
-    # 2.0, this is purely here as a service to our legacy customers.
-
-    # instrumentation for Web Service martialing - XML RPC
-    ActionWebService::Protocol::XmlRpc::XmlRpcProtocol.class_eval do
-      add_method_tracer :decode_request, "WebService/Xml Rpc/XML Decode"
-      add_method_tracer :encode_request, "WebService/Xml Rpc/XML Encode"
-      add_method_tracer :decode_response, "WebService/Xml Rpc/XML Decode"
-      add_method_tracer :encode_response, "WebService/Xml Rpc/XML Encode"
-    end
-
-    # instrumentation for Web Service martialing - Soap
-    ActionWebService::Protocol::Soap::SoapProtocol.class_eval do
-      add_method_tracer :decode_request, "WebService/Soap/XML Decode"
-      add_method_tracer :encode_request, "WebService/Soap/XML Encode"
-      add_method_tracer :decode_response, "WebService/Soap/XML Decode"
-      add_method_tracer :encode_response, "WebService/Soap/XML Encode"
-    end
-
-    if defined?(ActionController) && defined?(ActionController::Base)
-      ActionController::Base.class_eval do
-        if method_defined? :perform_invocation
-          add_method_tracer :perform_invocation, -> (*args) { "WebService/#{controller_name}/#{args.first}" }
-        end
-      end
-    end
-  end
-end