newrelic_rpm 9.17.0 → 9.21.0

data/newrelic.yml

@@ -40,9 +40,11 @@ common: &default_settings
 
   # If false, LLM instrumentation (OpenAI only for now) will not capture input and
   # output content on specific LLM events.
+  # 
   # The excluded attributes include:
-  # * content from LlmChatCompletionMessage events
-  # * input from LlmEmbedding events
+  # - content from LlmChatCompletionMessage events
+  # - input from LlmEmbedding events
+  # 
   # This is an optional security setting to prevent recording sensitive data sent
   # to and received from your LLMs.
   # ai_monitoring.record_content.enabled: true
@@ -73,20 +75,23 @@ common: &default_settings
   # application_logging.forwarding.labels.exclude: []
 
   # Sets the minimum level a log event must have to be forwarded to New Relic.
-  # This is based on the integer values of Ruby's Logger::Severity constants:
-  # https://github.com/ruby/logger/blob/113b82a06b3076b93a71cd467e1605b23afb3088/lib/logger/severity.rb
+  # 
+  # This is based on the integer values of Ruby's Logger::Severity constants.
+  # 
   # The intention is to forward logs with the level given to the configuration, as
   # well as any logs with a higher level of severity.
+  # 
   # For example, setting this value to "debug" will forward all log events to New
   # Relic. Setting this value to "error" will only forward log events with the
   # levels "error", "fatal", and "unknown".
+  # 
   # Valid values (ordered lowest to highest):
-  # * "debug"
-  # * "info"
-  # * "warn"
-  # * "error"
-  # * "fatal"
-  # * "unknown"
+  # - "debug"
+  # - "info"
+  # - "warn"
+  # - "error"
+  # - "fatal"
+  # - "unknown"
   # application_logging.forwarding.log_level: debug
 
   # Defines the maximum number of log records to buffer in memory at a time.
@@ -124,48 +129,52 @@ common: &default_settings
   # methods) strings representing Ruby methods that the agent can automatically
   # add custom instrumentation to. This doesn't require any modifications of the
   # source code that defines the methods.
+  # 
   # Use fully qualified class names (using the :: delimiter) that include any
   # module or class namespacing.
+  # 
   # Here is some Ruby source code that defines a render_png instance method for an
   # Image class and a notify class method for a User class, both within a
   # MyCompany module namespace:
-  #
+  # 
   # module MyCompany
-  #   class Image
-  #     def render_png
-  #       # code to render a PNG
-  #     end
-  #   end
-  #
-  #   class User
-  #     def self.notify
-  #       # code to notify users
-  #     end
-  #   end
+  # class Image
+  # def render_png
+  # # code to render a PNG
   # end
-  #
+  # end
+  # 
+  # class User
+  # def self.notify
+  # # code to notify users
+  # end
+  # end
+  # end
+  # 
+  # 
   # Given that source code, the newrelic.yml config file might request
   # instrumentation for both of these methods like so:
-  #
+  # 
   # automatic_custom_instrumentation_method_list:
   # - MyCompany::Image#render_png
   # - MyCompany::User.notify
-  #
+  # 
+  # 
   # That configuration example uses YAML array syntax to specify both methods.
   # Alternatively, you can use a comma-delimited string:
-  #
+  # 
   # automatic_custom_instrumentation_method_list: 'MyCompany::Image#render_png,
   # MyCompany::User.notify'
-  #
+  # 
+  # 
   # Whitespace around the comma(s) in the list is optional. When configuring the
   # agent with a list of methods via the
   # NEW_RELIC_AUTOMATIC_CUSTOM_INSTRUMENTATION_METHOD_LIST environment variable,
   # use this comma-delimited string format:
-  #
+  # 
   # export
   # NEW_RELIC_AUTOMATIC_CUSTOM_INSTRUMENTATION_METHOD_LIST='MyCompany::Image#render_png,
   # MyCompany::User.notify'
-  #
   # automatic_custom_instrumentation_method_list: []
 
   # Specify a list of constants that should prevent the agent from starting
@@ -214,6 +223,7 @@ common: &default_settings
 
   # When true, the agent captures HTTP request parameters and attaches them to
   # transaction traces, traced errors, and TransactionError events.
+  # 
   # When using the capture_params setting, the Ruby agent will not attempt to
   # filter secret information. Recommendation: To filter secret information from
   # request parameters, use the attributes.include setting instead. For more
@@ -233,10 +243,10 @@ common: &default_settings
 
   # Path to newrelic.yml. If undefined, the agent checks the following directories
   # (in order):
-  # * config/newrelic.yml
-  # * newrelic.yml
-  # * $HOME/.newrelic/newrelic.yml
-  # * $HOME/newrelic.yml
+  # - config/newrelic.yml
+  # - newrelic.yml
+  # - $HOME/.newrelic/newrelic.yml
+  # - $HOME/newrelic.yml
   # config_path: newrelic.yml
 
   # If false, custom attributes will not be sent on events.
@@ -245,9 +255,9 @@ common: &default_settings
   # If true, the agent captures custom events.
   # custom_insights_events.enabled: true
 
-  # * Specify a maximum number of custom events to buffer in memory at a time.
-  # * When configuring the agent for AI monitoring, set to max value 100000. This
-  # ensures the agent captures the maximum amount of LLM events.
+  # - Specify a maximum number of custom events to buffer in memory at a time.
+  #   - When configuring the agent for AI monitoring, set to max value 100000.
+  # This ensures the agent captures the maximum amount of LLM events.
   # custom_insights_events.max_samples_stored: 3000
 
   # If false, the agent will not add database_name parameter to transaction or
@@ -300,6 +310,7 @@ common: &default_settings
 
   # If true, the agent won't wrap third-party middlewares in instrumentation
   # (regardless of whether they are installed via Rack::Builder or Rails).
+  # 
   # When middleware instrumentation is disabled, if an application is using
   # middleware that could alter the response code, the HTTP status code reported
   # on the transaction may not reflect the altered value.
@@ -322,6 +333,18 @@ common: &default_settings
   # If true, disables agent middleware for Sinatra. This middleware is responsible
   # for advanced feature support such as cross application tracing, page load
   # timing, and error collection.
+  # 
+  # Cross application tracing is deprecated in favor of distributed tracing.
+  # Distributed tracing is on by default for Ruby agent versions 8.0.0 and above.
+  # Middlewares are not required to support distributed tracing.
+  # 
+  # To continue using cross application tracing, update the following options in
+  # your newrelic.yml configuration file:
+  # 
+  # cross_application_tracer:
+  # enabled: true
+  # distributed_tracing:
+  # enabled: false
   # disable_sinatra_auto_middleware: false
 
   # If true, disables view instrumentation.
@@ -336,6 +359,20 @@ common: &default_settings
   # enable this feature.
   # distributed_tracing.enabled: true
 
+  # This setting controls the behavior of transaction sampling when a remote
+  # parent is not sampled and the trace flag is not set in the traceparent.
+  # Available values are default, always_on, and always_off.
+  # distributed_tracing.sampler.remote_parent_not_sampled: default
+
+  # This setting controls the behavior of transaction sampling when a remote
+  # parent is sampled and the trace flag is set in the traceparent. Available
+  # values are default, always_on, and always_off.
+  # distributed_tracing.sampler.remote_parent_sampled: default
+
+  # If true, the agent captures the Elasticsearch cluster name in transaction
+  # traces.
+  # elasticsearch.capture_cluster_name: true
+
   # If true, the agent captures Elasticsearch queries in transaction traces.
   # elasticsearch.capture_queries: true
 
@@ -382,7 +419,7 @@ common: &default_settings
   # classes specified here occurs, if its error message contains one of the
   # strings corresponding to it here, that error will be ignored.
   # This option can't be set via environment variable.
-  # error_collector.ignore_messages: {}
+  # error_collector.ignore_messages: {ThreadError: ["queue empty"]}
 
   # A comma separated list of status codes, possibly including ranges. Errors
   # associated with these status codes, where applicable, will be ignored.
@@ -428,9 +465,9 @@ common: &default_settings
   # sending each span individually.
   # infinite_tracing.batching: true
 
-  # Configure the compression level for data sent to the trace observer.
-  # May be one of: :none, :low, :medium, :high.
-  # Set the level to :none to disable compression.
+  # Configure the compression level for data sent to the trace observer. May be
+  # one of: :none, :low, :medium, :high. Set the level to :none to disable
+  # compression.
   # infinite_tracing.compression_level: high
 
   # Configures the hostname for the trace observer Host. When configured, enables
@@ -785,9 +822,9 @@ common: &default_settings
   # If true, enables span event sampling.
   # span_events.enabled: true
 
-  # * Defines the maximum number of span events reported from a single harvest.
+  # - Defines the maximum number of span events reported from a single harvest.
   # Any Integer between 1 and 10000 is valid.'
-  # * When configuring the agent for AI monitoring, set to max value 10000.This
+  #   - When configuring the agent for AI monitoring, set to max value 10000.This
   # ensures the agent captures the maximum amount of distributed traces.
   # span_events.max_samples_stored: 2000
 
@@ -957,7 +994,7 @@ common: &default_settings
   #   NOTE: All "security.*" configuration parameters are related only to the
   #         security agent, and all other configuration parameters that may
   #         have "security" in the name somewhere are related to the APM agent.
-
+  
   # If true, the security agent is loaded (a Ruby 'require' is performed)
   # security.agent.enabled: false
 

data/newrelic_rpm.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = NewRelic::VERSION::STRING
   s.required_ruby_version = '>= 2.4.0'
   s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to?(:required_rubygems_version=)
-  s.authors = ['Tanna McClure', 'Kayla Reopelle', 'James Bunch', 'Hannah Ramadan']
+  s.authors = ['Tanna McClure', 'Kayla Reopelle', 'Hannah Ramadan']
   s.licenses = ['Apache-2.0']
   s.description = <<~EOS
     New Relic is a performance management system, developed by New Relic,

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 9.17.0
+  version: 9.21.0
 platform: ruby
 authors:
 - Tanna McClure
 - Kayla Reopelle
-- James Bunch
 - Hannah Ramadan
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,15 +244,15 @@ description: |
   https://github.com/newrelic/newrelic-ruby-agent/
 email: support@newrelic.com
 executables:
-- newrelic_rpm
 - newrelic
+- newrelic_rpm
 - nrdebug
 extensions: []
 extra_rdoc_files:
 - CHANGELOG.md
+- CONTRIBUTING.md
 - LICENSE
 - README.md
-- CONTRIBUTING.md
 - newrelic.yml
 files:
 - ".build_ignore"
@@ -555,6 +554,7 @@ files:
 - 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/delay_extensions.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
@@ -613,6 +613,15 @@ files:
 - lib/new_relic/agent/noticeable_error.rb
 - lib/new_relic/agent/null_logger.rb
 - lib/new_relic/agent/obfuscator.rb
+- lib/new_relic/agent/opentelemetry/context.rb
+- lib/new_relic/agent/opentelemetry/context/propagation.rb
+- lib/new_relic/agent/opentelemetry/context/propagation/trace_propagator.rb
+- lib/new_relic/agent/opentelemetry/trace.rb
+- lib/new_relic/agent/opentelemetry/trace/span.rb
+- lib/new_relic/agent/opentelemetry/trace/tracer.rb
+- lib/new_relic/agent/opentelemetry/trace/tracer_provider.rb
+- lib/new_relic/agent/opentelemetry/transaction_patch.rb
+- lib/new_relic/agent/opentelemetry_bridge.rb
 - lib/new_relic/agent/parameter_filtering.rb
 - lib/new_relic/agent/payload_metric_mapping.rb
 - lib/new_relic/agent/pipe_channel_manager.rb
@@ -673,6 +682,8 @@ files:
 - lib/new_relic/agent/transaction_time_aggregator.rb
 - lib/new_relic/agent/utilization/aws.rb
 - lib/new_relic/agent/utilization/azure.rb
+- lib/new_relic/agent/utilization/ecs.rb
+- lib/new_relic/agent/utilization/ecs_v4.rb
 - lib/new_relic/agent/utilization/gcp.rb
 - lib/new_relic/agent/utilization/pcf.rb
 - lib/new_relic/agent/utilization/vendor.rb
@@ -746,19 +757,6 @@ files:
 - lib/tasks/helpers/prompt.rb
 - lib/tasks/helpers/version_bump.rb
 - lib/tasks/install.rake
-- lib/tasks/instrumentation_generator/README.md
-- lib/tasks/instrumentation_generator/TODO.md
-- lib/tasks/instrumentation_generator/instrumentation.thor
-- lib/tasks/instrumentation_generator/templates/Envfile.tt
-- lib/tasks/instrumentation_generator/templates/chain.tt
-- lib/tasks/instrumentation_generator/templates/chain_method.tt
-- lib/tasks/instrumentation_generator/templates/dependency_detection.tt
-- lib/tasks/instrumentation_generator/templates/instrumentation.tt
-- lib/tasks/instrumentation_generator/templates/instrumentation_method.tt
-- lib/tasks/instrumentation_generator/templates/newrelic.yml.tt
-- lib/tasks/instrumentation_generator/templates/prepend.tt
-- lib/tasks/instrumentation_generator/templates/prepend_method.tt
-- lib/tasks/instrumentation_generator/templates/test.tt
 - lib/tasks/newrelic.rb
 - lib/tasks/newrelicyml.rake
 - lib/tasks/tests.rake
@@ -789,7 +787,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: New Relic Ruby Agent
 test_files: []

data/lib/tasks/instrumentation_generator/README.md

@@ -1,63 +0,0 @@
-# Instrumentation Generator
-
-## Usage
-
-`thor list` can be passed to get a list of all available thor commands
-
-### instrumentation:scaffold
-
-This task requires one parameter by default: the name of the library or class you are instrumenting. This task generates the basic file structure needed to add new instrumentation to the Ruby agent.
-
-Run it using:
-
-`thor instrumentation:scaffold gem_name`
-
-It accepts two optional parameters:
-
-- `--method`: the name of a method to instrument. Only one method can be accepted at this time. Defaults to `method_to_instrument`
-- `--args`: the arguments for the instrumented method. A comma-separated list can be given if there are multiple arguments. Defaults to `*args`.
-
-With the optional parameters, the task can be run like so:
-
-`thor instrumentation:scaffold gem_name --method=method_to_instrument --args=arg1,arg2,arg3`
-
-### WIP: instrumentation:add_new_method
-
-Are you trying add instrumentation for a method within library we already instrument? This task is for you! Instead of building the entire scaffold, this task inserts only the changes needed within the `instrumentation.rb` and test files to instrument the new method. It requires one argument, the name of the existing instrumentation to add the method to. If the instrumented library does not already exist, it will create a new scaffold for that library.
-
-Run it using:
-
-`thor instrumentation:scaffold gem_name`
-
-It accepts two optional parameters:
-
-- `--method`: the name of a method to instrument. Only one method can be accepted at this time. Defaults to `method_to_instrument`
-- `--args`: the arguments for the instrumented method. A comma-separated list can be given if there are multiple arguments. Defaults to `*args`.
-
-With the optional parameters, the task can be run like so:
-
-`thor instrumentation:add_new_method gem_name --method=method_to_instrument --args=arg1,arg2,arg3`
-
-## Idea
-
-Create a CLI, similar to Rails’ generators and scaffold scripts, to create the required files and basic classes for instrumenting new libraries. The hope is that the parts of adding new instrumentation that is repetitive can be eliminated and/or reduced so that it takes less time to add new instrumentation and we can spend development time considering the best attributes to collect and interactions to measure. I also hope this project will reduce the overall toil related to adding new instrumentation.
-
-The files we create with little variation besides library and method names are:
-
-- Lib
-  - Dependency detection
-  - Chain
-  - Prepend
-  - Instrumentation
-- Tests
-  - configuration/newrelic.yml
-  - Envfile
-  - Test file
-
-Furthermore, we also create very similar snippets inside the default source configuration file that could be generated by this project as well.
-
-## Outcome
-
-A prototype outside the agent was first created. This prototype generated the required files to add instrumentation. The prototype accepted three arguments: name (name of the library), method (method to instrument), args (arguments for the method). This prototype has evolved into the current directory.
-
-This project leverages the Ruby gem Thor, a toolkit for building powerful command-line interfaces used in Bundler, Vagrant, Rails and others powers this CLI.

data/lib/tasks/instrumentation_generator/TODO.md

@@ -1,33 +0,0 @@
-# TODO
-
-# - [X] Create instrumentation file
-
-# - [X] Create chain file
-
-# - [X] Create prepend file
-
-# - [X] Create dependency detection file
-
-# - [X] Add config to default source
-
-# - [X] Create multiverse suite
-
-# - [X] Create Envfile
-
-# - [X] Create test file with examples
-
-# - [X] Create option for method names to instrument
-
-# - [X] Add entry to newrelic.yml
-
-# - [ ] Append a new method to instrument to an existing instrumentation class (with tests?)
-
-# - [ ] Documentation: examples of what to add in each gap (Good examples of tests, instrumentation, etc. as comments to guide users)
-
-# - [ ] Handle multi-word gem names (camel case for classes, handle hyphens, concurrent-ruby as example)
-
-# - [ ] Allow multiple method arguments to be passed to the command line
-
-# - [ ] Add tests for the instrumentation_generator code
-
-# - [ ] See if instrumentation PRs can get automatically generated when an already instrumented library adds methods to its codebase

data/lib/tasks/instrumentation_generator/instrumentation.thor

@@ -1,130 +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
-
-require_relative '../../new_relic/language_support'
-require 'thor'
-
-class Instrumentation < Thor
-  include Thor::Actions
-
-  INSTRUMENTATION_ROOT = 'lib/new_relic/agent/instrumentation/'
-  MULTIVERSE_SUITE_ROOT = 'test/multiverse/suites/'
-  DEFAULT_SOURCE_LOCATION = 'lib/new_relic/agent/configuration/default_source.rb'
-  NEWRELIC_YML_LOCATION = 'newrelic.yml'
-
-  desc('scaffold NAME', 'Scaffold the required files for adding new instrumentation')
-  long_desc <<~LONGDESC
-    `instrumentation scaffold` requires one parameter by default: the name of the
-    library or class you are instrumenting. This task generates the basic
-    file structure needed to add new instrumentation to the Ruby agent.
-  LONGDESC
-
-  source_root(File.dirname(__FILE__))
-
-  option :method,
-    default: 'method_to_instrument',
-    desc: 'The method you would like to prepend or chain instrumentation onto'
-  option :args,
-    default: '*args',
-    desc: 'The arguments associated with the original method'
-
-  def scaffold(name)
-    @name = name
-    @snake_name = snake_name(@name)
-    @method = options[:method] if options[:method]
-    @args = options[:args] if options[:args]
-    @class_name = ::NewRelic::LanguageSupport.camelize(name)
-    base_path = "#{INSTRUMENTATION_ROOT}#{@snake_name}"
-
-    empty_directory(base_path)
-    create_instrumentation_files(base_path)
-    append_to_default_source(@name, @snake_name)
-    # append_to_newrelic_yml(@name, @snake_name) # This is now done on release, we don't need it anymore, but leaving it to be sure.
-    create_tests(name)
-  end
-
-  desc 'add_new_method NAME', 'Inserts a new method into an existing piece of instrumentation'
-
-  option :method, required: true, desc: 'The name of the method to instrument'
-  option :args, default: '*args', desc: 'The arguments associated with the instrumented method'
-
-  def add_new_method(name, method_name)
-    # Verify that existing instrumentation exists
-    # if it doesn't, should we just call the #scaffold method instead since we have all the stuff
-    # otherwise, inject the new method into the instrumentation matching the first arg
-    # add to only chain, instrumentation, prepend
-    # move the method content to a partial
-  end
-
-  private
-
-  def create_instrumentation_files(base_path)
-    %w[chain instrumentation prepend].each do |file|
-      template("templates/#{file}.tt", "#{base_path}/#{file}.rb")
-    end
-
-    template('templates/dependency_detection.tt', "#{base_path}.rb")
-  end
-
-  def create_tests(name)
-    @name = name
-    @instrumentation_method_global_erb_snippet = '<%= $instrumentation_method %>'
-    @snake_name = snake_name(@name)
-    base_path = "#{MULTIVERSE_SUITE_ROOT}#{@snake_name}"
-    empty_directory(base_path)
-    template('templates/Envfile.tt', "#{base_path}/Envfile")
-    template('templates/test.tt', "#{base_path}/#{@snake_name}_instrumentation_test.rb")
-
-    empty_directory("#{base_path}/config")
-    template('templates/newrelic.yml.tt', "#{base_path}/config/newrelic.yml")
-  end
-
-  def append_to_default_source(name, snake_name)
-    insert_into_file(
-      DEFAULT_SOURCE_LOCATION,
-      config_block(name, snake_name),
-      after: ":description => 'Controls auto-instrumentation of bunny at start-up. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
-        },\n"
-    )
-  end
-
-  def append_to_newrelic_yml(name, snake_name)
-    insert_into_file(
-      NEWRELIC_YML_LOCATION,
-      yaml_block(name, snake_name),
-      after: "# instrumentation.bunny: auto\n"
-    )
-  end
-
-  def config_block(name, snake_name)
-    # Don't change to <<~
-    # We want to preserve the whitespace so the config is correctly indented
-    <<-CONFIG
-        :'instrumentation.#{snake_name}' => {
-          :default => 'auto',
-          :documentation_default => 'auto',
-          :public => true,
-          :type => String,
-          :dynamic_name => true,
-          :allowed_from_server => false,
-          :description => 'Controls auto-instrumentation of the #{name} library at start-up. May be one of `auto`, `prepend`, `chain`, `disabled`.'
-        },
-    CONFIG
-  end
-
-  def yaml_block(name, snake_name)
-    <<~HEREDOC
-
-      # Controls auto-instrumentation of #{name} at start-up.
-      # May be one of [auto|prepend|chain|disabled]
-      # instrumentation.#{snake_name}: auto
-    HEREDOC
-  end
-
-  def snake_name(name)
-    name.downcase.tr('-', '_')
-  end
-end
-
-Instrumentation.start(ARGV)

data/lib/tasks/instrumentation_generator/templates/chain.tt

@@ -1,21 +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::Agent::Instrumentation
-  module <%= @class_name %>::Chain
-    def self.instrument!
-      ::<%= @class_name %>.class_eval do
-        include NewRelic::Agent::Instrumentation::<%= @class_name %>
-
-        alias_method(:<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>)
-
-        def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
-          <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> do
-            <%= @method.downcase %>_without_new_relic<%= "(#{@args})" unless @args.empty? %>
-          end
-        end
-      end
-    end
-  end
-end

data/lib/tasks/instrumentation_generator/templates/chain_method.tt

@@ -1,7 +0,0 @@
-alias_method(:<%= @method.downcase %>_without_new_relic, :<%= @method.downcase %>)
-
-def <%= @method.downcase %><%= "(#{@args})" unless @args.empty? %>
-  <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %> do
-    <%= @method.downcase %>_without_new_relic<%= "(#{@args})" unless @args.empty? %>
-  end
-end

data/lib/tasks/instrumentation_generator/templates/dependency_detection.tt

@@ -1,32 +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
-
-DependencyDetection.defer do
-  named :<%= @snake_name %>
-
-  depends_on do
-    # The class that needs to be defined to prepend/chain onto. This can be used
-    # to determine whether the library is installed.
-    defined?(<%= @class_name %>)
-    # Add any additional requirements to verify whether this instrumentation
-    # should be installed
-  end
-
-  executes do
-    require_relative '<%= @snake_name.downcase %>/instrumentation'
-
-    # prepend_instrument and chain_instrument call extract_supportability_name
-    # to get the library name for supportability metrics and info-level logging.
-    # This is done by spliting on the 2nd to last spot of the instrumented
-    # module. If this isn't how we want the name to appear, pass in the desired
-    # name as a third argument.
-    if use_prepend?
-      require_relative '<%= @snake_name.downcase %>/prepend'
-      prepend_instrument <%= @class_name %>, NewRelic::Agent::Instrumentation::<%= @class_name %>::Prepend
-    else
-      require_relative '<%= @snake_name.downcase %>/chain'
-      chain_instrument NewRelic::Agent::Instrumentation::<%= @class_name %>::Chain
-    end
-  end
-end

data/lib/tasks/instrumentation_generator/templates/instrumentation.tt

@@ -1,13 +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::Agent::Instrumentation
-  module <%= @class_name %>
-
-    def <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %>
-      # add instrumentation content here
-      yield
-    end
-  end
-end

data/lib/tasks/instrumentation_generator/templates/instrumentation_method.tt

@@ -1,3 +0,0 @@
-def <%= @method.downcase %>_with_new_relic<%= "(#{@args})" unless @args.empty? %>
-  # add instrumentation content here
-end