newrelic_rpm 9.7.0 → 9.16.1

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

@@ -2,27 +2,30 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-require_relative '<%= @name.downcase %>/instrumentation'
-require_relative '<%= @name.downcase %>/chain'
-require_relative '<%= @name.downcase %>/prepend'
-
 DependencyDetection.defer do
-  named :<%= @name.match?(/\-|\_/) ? "'#{@name.downcase}'" : @name.downcase %>
+  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 %>)
+    defined?(<%= @class_name %>)
     # Add any additional requirements to verify whether this instrumentation
     # should be installed
   end
 
   executes do
-    ::NewRelic::Agent.logger.info('Installing <%= @name.downcase %> instrumentation')
+    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?
-      prepend_instrument ::<%= @class_name %>, NewRelic::Agent::Instrumentation::<%= @class_name %>::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

data/lib/tasks/instrumentation_generator/templates/newrelic.yml.tt

@@ -6,7 +6,7 @@ development:
   monitor_mode: true
   license_key: bootstrap_newrelic_admin_license_key_000
   instrumentation:
-    <%= @name.downcase %>: <%= @instrumentation_method_global_erb_snippet %>
+    <%= @snake_name %>: <%= @instrumentation_method_global_erb_snippet %>
   app_name: test
   log_level: debug
   host: 127.0.0.1