newrelic_rpm 9.6.0 → 9.7.1

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

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

data/newrelic.yml

@@ -1,5 +1,5 @@
 #
-# This file configures the New Relic Agent.  New Relic monitors Ruby, Java,
+# This file configures the New Relic agent.  New Relic monitors Ruby, Java,
 # .NET, PHP, Python, Node, and Go applications with deep visibility and low
 # overhead.  For more information, visit www.newrelic.com.
 
@@ -341,7 +341,7 @@ common: &default_settings
   # embedded service within another framework and the agent is detecting the Sinatra
   # app and skipping the at_exit handler as a result. Sinatra classically runs the
   # entire application in an at_exit block and would otherwise misbehave if the
-  # Agent's at_exit handler was also installed in those circumstances. Note:
+  # agent's at_exit handler was also installed in those circumstances. Note:
   # send_data_on_exit should also be set to true in  tandem with this setting.
   # force_install_exit_handler: false
 
@@ -535,6 +535,10 @@ common: &default_settings
   # prepend, chain, disabled.
   # instrumentation.typhoeus: auto
 
+  # Controls auto-instrumentation of ViewComponent at startup. May be one of: auto,
+  # prepend, chain, disabled.
+  # instrumentation.view_component: auto
+
   # A dictionary of label names and values that will be applied to the data sent
   # from this agent. May also be expressed as a semicolon-delimited ; string of
   # colon-separated : pairs. For example, Server:One;Data Center:Primary.

data/newrelic_rpm.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
     https://github.com/newrelic/newrelic-ruby-agent/
   EOS
   s.email = 'support@newrelic.com'
-  # TODO: MAJOR VERSION - remove newrelic_cmd, deprecated since version 2.13
-  s.executables = %w[newrelic_cmd newrelic nrdebug]
+  # TODO: MAJOR VERSION - remove newrelic, deprecated since version xxx.
+  s.executables = %w[newrelic_rpm newrelic nrdebug]
   s.extra_rdoc_files = [
     'CHANGELOG.md',
     'LICENSE',
@@ -50,8 +50,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.summary = 'New Relic Ruby Agent'
 
-  s.add_dependency 'base64'
-
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'feedjira', '3.2.1' unless ENV['CI'] || RUBY_VERSION < '2.5' # for Gabby
   s.add_development_dependency 'httparty' unless ENV['CI'] # for perf tests and Gabby
@@ -62,7 +60,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rake', '12.3.3'
 
-  s.add_development_dependency 'rubocop', '1.54' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
+  s.add_development_dependency 'rubocop', '1.57.2' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
   s.add_development_dependency 'rubocop-ast', '1.28.1' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
   s.add_development_dependency 'rubocop-minitest', '0.27.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'
   s.add_development_dependency 'rubocop-performance', '1.16.0' unless ENV['CI'] && RUBY_VERSION < '3.0.0'

data/test/agent_helper.rb

@@ -845,7 +845,7 @@ ensure
 end
 
 def json_dump_and_encode(object)
-  Base64.encode64(JSON.dump(object))
+  NewRelic::Base64.encode64(JSON.dump(object))
 end
 
 def get_last_analytics_event
@@ -871,7 +871,7 @@ def load_cross_agent_test(name)
   test_file_path = File.join(cross_agent_tests_dir, "#{name}.json")
   data = File.read(test_file_path)
   data.gsub!('callCount', 'call_count')
-  data = JSON.load(data)
+  data = JSON.parse(data)
   data.each { |testcase| testcase['testname'].tr!(' ', '_') if String === testcase['testname'] }
   data
 end
@@ -1025,3 +1025,15 @@ def defer_testing_to_min_supported_rails(test_file, min_rails_version, supports_
     puts "Skipping tests in #{File.basename(test_file)} because Rails >= #{min_rails_version} is unavailable" if ENV['VERBOSE_TEST_OUTPUT']
   end
 end
+
+def first_call_for(subject)
+  items = $collector.calls_for(subject)
+
+  if defined?(JRUBY_VERSION)
+    refute_predicate items.size, :zero?, "Expected at least one call for '#{subject}'"
+  else
+    assert_equal 1, items.size, "Expected exactly one call for '#{subject}'"
+  end
+
+  items.first
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 9.6.0
+  version: 9.7.1
 platform: ruby
 authors:
 - Tanna McClure
@@ -11,22 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,14 +103,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.54'
+        version: 1.57.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '1.54'
+        version: 1.57.2
 - !ruby/object:Gem::Dependency
   name: rubocop-ast
   requirement: !ruby/object:Gem::Requirement
@@ -232,7 +218,7 @@ description: |
   https://github.com/newrelic/newrelic-ruby-agent/
 email: support@newrelic.com
 executables:
-- newrelic_cmd
+- newrelic_rpm
 - newrelic
 - nrdebug
 extensions: []
@@ -253,7 +239,7 @@ files:
 - THIRD_PARTY_NOTICES.md
 - Thorfile
 - bin/newrelic
-- bin/newrelic_cmd
+- bin/newrelic_rpm
 - bin/nrdebug
 - init.rb
 - install.rb
@@ -520,6 +506,10 @@ files:
 - lib/new_relic/agent/instrumentation/typhoeus/chain.rb
 - lib/new_relic/agent/instrumentation/typhoeus/instrumentation.rb
 - lib/new_relic/agent/instrumentation/typhoeus/prepend.rb
+- lib/new_relic/agent/instrumentation/view_component.rb
+- lib/new_relic/agent/instrumentation/view_component/chain.rb
+- lib/new_relic/agent/instrumentation/view_component/instrumentation.rb
+- lib/new_relic/agent/instrumentation/view_component/prepend.rb
 - lib/new_relic/agent/internal_agent_error.rb
 - lib/new_relic/agent/javascript_instrumentor.rb
 - lib/new_relic/agent/linking_metadata.rb
@@ -608,11 +598,12 @@ files:
 - lib/new_relic/agent/utilization/vendor.rb
 - lib/new_relic/agent/utilization_data.rb
 - lib/new_relic/agent/vm.rb
+- lib/new_relic/agent/vm/c_ruby_vm.rb
 - lib/new_relic/agent/vm/jruby_vm.rb
 - lib/new_relic/agent/vm/monotonic_gc_profiler.rb
-- lib/new_relic/agent/vm/mri_vm.rb
 - lib/new_relic/agent/vm/snapshot.rb
 - lib/new_relic/agent/worker_loop.rb
+- lib/new_relic/base64.rb
 - lib/new_relic/cli/command.rb
 - lib/new_relic/cli/commands/deployments.rb
 - lib/new_relic/cli/commands/install.rb

data/bin/newrelic_cmd

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# This command has been renamed "newrelic"
-# executes one of the commands in the new_relic/commands directory
-# pass the name of the command as an argument
-load File.dirname(__FILE__) + '/newrelic'