newrelic_rpm 9.6.0 → 9.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e08eba5efd3af57153446155d8c29ea47a55641bbf8c593105be4242325b1613
-  data.tar.gz: 571ec550538228168b2cafdf64f3cb55360aaac3ab33938d1200bf63ee840506
+  metadata.gz: 0ece3a3703c9847f5ddf5ddd8776a58ff03c6400e3d61053bfe227ea7ddc3d83
+  data.tar.gz: 14aa9f742b5a9e73d510ff88cfe5292007fb97a002a23d15bc835be72b3ae483
 SHA512:
-  metadata.gz: 13fae847437ac99e08ac4bc25545074e4bf300c91abdabc2d3afcb0b3e7fb87987c1c811bdb7b7eb4a4470d3d58bc11266ee75d6d21672cdab3437418d42814c
-  data.tar.gz: 4eb79daba4531d41b736099e904126af44421a3ca9457fed3a0b9d89ea90973674b204d1f96d2fbe28f449b452d8b12c01b73f991bf3ceb26cfafe0bf7cf794d
+  metadata.gz: 670682da76dcf65d64bd634579e63bf82ab33dafbfd72b5e66605b136d10dcdcc655e8a1d5ecac2db58e948ec57775ef74c337a43428b8458a5436458c1d1522
+  data.tar.gz: 9f5e190e03218aa49d57dba5299770a93f0e835436f21144f65c9e149427a496468644950ccfd6274cdda0ed735002a46a20703afc79483767439266043c5f8e

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # New Relic Ruby Agent Release Notes
 
+## v9.7.0
+
+
+Version 9.7.0 introduces ViewComponent instrumentation, changes the endpoint used to access the cluster name for Elasticsearch instrumentation, removes the creation of the Ruby/Thread and Ruby/Fiber spans, and adds support for Falcon.
+
+- **Feature: ViewComponent instrumentation**
+
+  [ViewComponent](https://viewcomponent.org/) is a now an instrumented framework. The agent currently supports Roda versions 2.0.0+. [PR#2367](https://github.com/newrelic/newrelic-ruby-agent/pull/2367) 
+
+- **Feature: Use root path to access Elasticsearch cluster name**
+
+  Previously, the agent used the cluster health endpoint (`/_cluster/health`) to access the cluster name. However, this has been found to make startup unstable for large clusters. Now, the agent uses the more performant root endpoint (`/`).
+
+  Our thanks go to [@erikkessler1](https://github.com/erikkessler1), [@gremerritt](https://github.com/gremerritt), and [@joshbranham](https://github.com/joshbranham) for reporting the issue, suggesting solutions, and testing them. [Issue#2360](https://github.com/newrelic/newrelic-ruby-agent/issues/2360) [PR#2377](https://github.com/newrelic/newrelic-ruby-agent/pull/2377)
+
+- **Feature: Remove base64 dependency, use direct calls to String methods**
+
+  In version 9.6.0, the agent required the Ruby `base64` gem as a depdendency to prepare for deprecation warnings in Ruby 3.3 and the gem's removal from the Ruby standard libraries in 3.4. Including `base64` as a dependency has caused problems with version resolution in some environments.
+
+  To resolve this, the agent now directly calls the `String` methods used in the `base64` library in the new `NewRelic::Base64` module.
+
+  Thank you, [@Earlopain](https://github.com/Earlopain), for submitting this change. [PR#2378](https://github.com/newrelic/newrelic-ruby-agent/pull/2378)
+
+- **Feature: Add Falcon support**
+
+  The agent now supports the web server [Falcon](https://socketry.github.io/falcon/). [PR#2383](https://github.com/newrelic/newrelic-ruby-agent/pull/2383)
+
+- **Feature: Remove spans with name Ruby/Thread and Ruby/Fiber**
+
+  Due to the lack of helpful information and the confusion commonly caused by the spans named Ruby/Thread and Ruby/Fiber, these spans have been removed. However, the agents ability to monitor instrumented code running in a thread or fiber will remain unchanged. [PR#2389](https://github.com/newrelic/newrelic-ruby-agent/pull/2389)
+
 ## v9.6.0
 
 Version 9.6.0 adds instrumentation for Async::HTTP, Ethon, and HTTPX, adds the ability to ignore specific routes with Roda, gleans Docker container IDs from cgroups v2-based containers, records additional synthetics attributes, fixes an issue with Rails 7.1 that could cause duplicate log records to be sent to New Relic, fixes a deprecation warning for the Sidekiq error handler, adds additional attributes for OpenTelemetry compatibility, and resolves some technical debt, thanks to the community.
@@ -69,7 +100,7 @@ Version 9.6.0 adds instrumentation for Async::HTTP, Ethon, and HTTPX, adds the a
 
   We also received some great contributions from community members to resolve some outstanding technical debt issues. Thank you for your contributions!
     * Add and Replace SLASH and ROOT constants: [PR#2256](https://github.com/newrelic/newrelic-ruby-agent/pull/2256) [chahmedejaz](https://github.com/chahmedejaz)
-    * Remove pry as a dev dependency: [PR#2665](https://github.com/newrelic/newrelic-ruby-agent/pull/2265), [PR#2273](https://github.com/newrelic/newrelic-ruby-agent/pull/2273) [AlajeBash](https://github.com/AlajeBash)
+    * Remove pry as a dev dependency: PR#2665, PR#2273, AlajeBash (profile no longer active)
     * Replace "start up" with "start-up": [PR#2249](https://github.com/newrelic/newrelic-ruby-agent/pull/2249) [chahmedejaz](https://github.com/chahmedejaz)
     * Remove unused variables in test suites: [PR#2250](https://github.com/newrelic/newrelic-ruby-agent/pull/2250)
 
@@ -1465,7 +1496,7 @@ The multiverse collection of test suites requires a variety of data handling sof
 
 - **Additional Transaction Information applied to Span Events**
 
-  When Distributed Tracing and/or Infinite Tracing are enabled, the Agent will now incorporate additional information from the Transaction Event on to the root Span Event of the transaction.
+  When Distributed Tracing and/or Infinite Tracing are enabled, the agent will now incorporate additional information from the Transaction Event on to the root Span Event of the transaction.
 
   The following items are affected:
 

data/CONTRIBUTING.md

@@ -178,13 +178,6 @@ opensource@newrelic.com.
 For more information about CLAs, please check out Alex Russell’s excellent post,
 [“Why Do I Need to Sign This?”](https://infrequently.org/2008/06/why-do-i-need-to-sign-this/).
 
-## Slack
-
-We host a public Slack with a dedicated channel for contributors and maintainers
-of open source projects hosted by New Relic.  If you are contributing to this
-project, you're welcome to request access to the #oss-contributors channel in
-the newrelicusers.slack.com workspace.  To request access, please use this [link](https://join.slack.com/t/newrelicusers/shared_invite/zt-1ayj69rzm-~go~Eo1whIQGYnu3qi15ng).
-
 ## Explorer's Hub
 
 New Relic hosts and moderates an online forum where customers can interact with

data/bin/newrelic

@@ -1,15 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+# This command has been renamed "newrelic_rpm"
 # executes one of the commands in the new_relic/commands directory
 # pass the name of the command as an argument
 
-$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'new_relic/cli/command'
-begin
-  NewRelic::Cli::Command.run
-rescue NewRelic::Cli::Command::CommandFailure => failure
-  STDERR.puts failure.message
-  STDERR.puts failure.options if failure.options
-  exit(1)
-end
+load File.dirname(__FILE__) + '/newrelic_rpm'

data/bin/newrelic_rpm

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# executes one of the commands in the new_relic/commands directory
+# pass the name of the command as an argument
+
+$LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'new_relic/cli/command'
+begin
+  NewRelic::Cli::Command.run
+rescue NewRelic::Cli::Command::CommandFailure => failure
+  STDERR.puts failure.message
+  STDERR.puts failure.options if failure.options
+  exit(1)
+end

data/init.rb

@@ -2,7 +2,7 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-# This is the initialization for the New Relic Ruby Agent when used as
+# This is the initialization for the New Relic Ruby agent when used as
 # a plugin
 require 'new_relic/control'
 
@@ -12,7 +12,7 @@ require 'new_relic/control'
 # If you can't find any log files and you don't see anything in your
 # application log files please visit support.newrelic.com.
 
-# Initializer for the NewRelic Ruby Agent
+# Initializer for the New Relic Ruby agent
 
 # After version 2.0 of Rails we can access the configuration directly.
 # We need it to add dev mode routes after initialization finished.

data/lib/new_relic/agent/agent.rb

@@ -47,7 +47,7 @@ require 'new_relic/agent/agent_helpers/transmit'
 
 module NewRelic
   module Agent
-    # The Agent is a singleton that is instantiated when the plugin is
+    # The agent is a singleton that is instantiated when the plugin is
     # activated.  It collects performance data from ruby applications
     # in realtime as the application runs, and periodically sends that
     # data to the NewRelic server.

data/lib/new_relic/agent/agent_helpers/shutdown.rb

@@ -11,7 +11,7 @@ module NewRelic
         def shutdown
           return unless started?
 
-          ::NewRelic::Agent.logger.info('Starting Agent shutdown')
+          ::NewRelic::Agent.logger.info('Starting agent shutdown')
 
           stop_event_loop
           trap_signals_for_litespeed

data/lib/new_relic/agent/agent_helpers/special_startup.rb

@@ -10,7 +10,7 @@ module NewRelic
         # requests, we need to wait until the children are forked
         # before connecting, otherwise the parent process sends useless data
         def using_forking_dispatcher?
-          if [:puma, :passenger, :unicorn].include?(Agent.config[:dispatcher])
+          if [:puma, :passenger, :unicorn, :falcon].include?(Agent.config[:dispatcher])
             ::NewRelic::Agent.logger.info('Deferring startup of agent reporting thread because ' \
               "#{Agent.config[:dispatcher]} may fork.")
             true

data/lib/new_relic/agent/agent_helpers/start_worker_thread.rb

@@ -19,12 +19,12 @@ module NewRelic
         # See #connect for a description of connection_options.
         def start_worker_thread(connection_options = {})
           if disable = NewRelic::Agent.config[:disable_harvest_thread]
-            NewRelic::Agent.logger.info('Not starting Ruby Agent worker thread because :disable_harvest_thread is ' \
+            NewRelic::Agent.logger.info('Not starting Ruby agent worker thread because :disable_harvest_thread is ' \
               "#{disable}")
             return
           end
 
-          ::NewRelic::Agent.logger.debug('Creating Ruby Agent worker thread.')
+          ::NewRelic::Agent.logger.debug('Creating Ruby agent worker thread.')
           @worker_thread = Threading::AgentThread.create('Worker Loop') do
             deferred_work!(connection_options)
           end

data/lib/new_relic/agent/agent_helpers/startup.rb

@@ -103,7 +103,7 @@ module NewRelic
         # so we can disambiguate processes in the log file and make
         # sure they're running a reasonable version
         def log_version_and_pid
-          ::NewRelic::Agent.logger.debug("New Relic Ruby Agent #{NewRelic::VERSION::STRING} Initialized: pid = #{$$}")
+          ::NewRelic::Agent.logger.debug("New Relic Ruby agent #{NewRelic::VERSION::STRING} initialized: pid = #{$$}")
         end
 
         # Logs the configured application names
@@ -180,7 +180,7 @@ module NewRelic
 
           unless app_name_configured?
             NewRelic::Agent.logger.error('No application name configured.',
-              'The Agent cannot start without at least one. Please check your ',
+              'The agent cannot start without at least one. Please check your ',
               'newrelic.yml and ensure that it is valid and has at least one ',
               "value set for app_name in the #{NewRelic::Control.instance.env} ",
               'environment.')

data/lib/new_relic/agent/attribute_filter.rb

@@ -2,7 +2,7 @@
 # See https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE for complete details.
 # frozen_string_literal: true
 
-# This class applies filtering rules as specified in the Agent Attributes
+# This class applies filtering rules as specified in the agent attributes
 # cross-agent spec.
 #
 # Instances of it are constructed by deriving a set of rules from the agent
@@ -44,7 +44,7 @@
 # 1. First, the names are compared lexicographically. This has the impact of
 #    forcing shorter (more general) rules towards the top of the list and longer
 #    (more specific) rules towards the bottom. This is important, because the
-#    Agent Attributes spec stipulates that the most specific rule for a given
+#    agent Attributes spec stipulates that the most specific rule for a given
 #    destination should take precedence. Since rules are applied top-to-bottom,
 #    this sorting guarantees that the most specific rule will be applied last.
 # 2. If the names are identical, we next examine the wildcard flag. Rules ending
@@ -274,7 +274,7 @@ module NewRelic
 
       def initialize(attribute_name, destinations, is_include)
         @attribute_name = attribute_name.sub(/\*$/, '')
-        @wildcard = attribute_name.end_with?('*')
+        @wildcard = attribute_name.end_with?(ASTERISK)
         @is_include = is_include
         @destinations = is_include ? destinations : ~destinations
       end

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

@@ -313,6 +313,7 @@ module NewRelic
         'webpacker:compile'
       ].join(',').freeze
 
+      # rubocop:disable Metrics/CollectionLiteralLength
       DEFAULTS = {
         # Critical
         :agent_enabled => {
@@ -336,6 +337,7 @@ module NewRelic
           :public => true,
           :type => String,
           :allowed_from_server => false,
+          :exclude_from_reported_settings => true,
           :description => 'Your New Relic <InlinePopover type="licenseKey" />.'
         },
         :log_level => {
@@ -444,7 +446,7 @@ module NewRelic
             'before shutting down to be installed regardless of detecting scenarios where it generally should not be. ' \
             'Known use-case for this option is where Sinatra is running as an 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 ' \
+            '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: `send_data_on_exit` should also be set to `true` in  tandem with this setting.'
         },
         :high_security => {
@@ -1656,6 +1658,14 @@ module NewRelic
           :allowed_from_server => false,
           :description => 'Controls auto-instrumentation of Stripe at startup. May be one of: `enabled`, `disabled`.'
         },
+        :'instrumentation.view_component' => {
+          :default => 'auto',
+          :public => true,
+          :type => String,
+          :dynamic_name => true,
+          :allowed_from_server => false,
+          :description => 'Controls auto-instrumentation of ViewComponent at startup. May be one of: `auto`, `prepend`, `chain`, `disabled`.'
+        },
         :'stripe.user_data.include' => {
           default: NewRelic::EMPTY_ARRAY,
           public: true,
@@ -2227,7 +2237,8 @@ module NewRelic
           :public => false,
           :type => String,
           :allowed_from_server => true,
-          :description => 'JavaScript agent loader content.'
+          :description => 'JavaScript agent loader content.',
+          :exclude_from_reported_settings => true
         },
         :keep_alive_timeout => {
           :default => 60,
@@ -2403,6 +2414,7 @@ module NewRelic
           :description => 'This value represents the total amount of memory available to the host (not the process), in mebibytes (1024 squared or 1,048,576 bytes).'
         }
       }.freeze
+      # rubocop:enable Metrics/CollectionLiteralLength
     end
   end
 end

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

@@ -230,7 +230,7 @@ module NewRelic
         end
 
         def to_collector_hash
-          DottedHash.new(apply_mask(flattened)).to_hash.delete_if do |k, v|
+          DottedHash.new(apply_mask(flattened)).to_hash.delete_if do |k, _v|
             default = DEFAULTS[k]
             if default
               default[:exclude_from_reported_settings]
@@ -364,7 +364,7 @@ module NewRelic
         def reset_cache
           return new_cache unless defined?(@cache) && @cache
 
-          preserved = @cache.select { |_k, v| DEPENDENCY_DETECTION_VALUES.include?(v) }
+          preserved = @cache.dup.select { |_k, v| DEPENDENCY_DETECTION_VALUES.include?(v) }
           new_cache
           preserved.each { |k, v| @cache[k] = v }
 
@@ -376,12 +376,13 @@ module NewRelic
         end
 
         def log_config(direction, source)
-          # Just generating this log message (specifically calling
-          # flattened.inspect) is expensive enough that we don't want to do it
-          # unless we're actually going to be logging the message based on our
-          # current log level.
+          # Just generating this log message (specifically calling `flattened`)
+          # is expensive enough that we don't want to do it unless we're
+          # actually going to be logging the message based on our current log
+          # level, so use a `do` block.
           ::NewRelic::Agent.logger.debug do
-            "Updating config (#{direction}) from #{source.class}. Results: #{flattened.inspect}"
+            hash = flattened.delete_if { |k, _h| DEFAULTS.fetch(k, {}).fetch(:exclude_from_reported_settings, false) }
+            "Updating config (#{direction}) from #{source.class}. Results: #{hash.inspect}"
           end
         end
 

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

@@ -128,7 +128,7 @@ module NewRelic
           end
 
           def self.drop_indexes?(name, payload)
-            name == :deleteIndexes && payload[:selector] && payload[:selector][:index] == '*'
+            name == :deleteIndexes && payload[:selector] && payload[:selector][:index] == ASTERISK
           end
 
           def self.drop_index?(name, payload)

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

@@ -3,7 +3,7 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'base64'
+require 'new_relic/base64'
 
 module NewRelic
   module Agent
@@ -78,7 +78,7 @@ module NewRelic
         end
 
         def from_http_safe(http_safe_payload)
-          decoded_payload = Base64.strict_decode64(http_safe_payload)
+          decoded_payload = NewRelic::Base64.strict_decode64(http_safe_payload)
           from_json(decoded_payload)
         end
 
@@ -156,7 +156,7 @@ module NewRelic
       #
       # @api public
       def http_safe
-        Base64.strict_encode64(text)
+        NewRelic::Base64.strict_encode64(text)
       end
     end
   end

data/lib/new_relic/agent/event_loop.rb

@@ -156,7 +156,7 @@ module NewRelic
         end
 
         if !errors.empty?
-          ::NewRelic::Agent.logger.error("#{errors.size} error(s) running task for event '#{event}' in Agent Event Loop:", *errors)
+          ::NewRelic::Agent.logger.error("#{errors.size} error(s) running task for event '#{event}' in agent event loop:", *errors)
         end
       end
 

data/lib/new_relic/agent/http_clients/abstract.rb

@@ -14,6 +14,10 @@ module NewRelic
       #
       # @api public
       class AbstractRequest
+        LHOST = 'host'
+        UHOST = 'Host'
+        COLON = ':'
+
         %i[[] []= type host_from_header host method headers uri].each do |name|
           define_method(name) do
             not_implemented(name)

data/lib/new_relic/agent/http_clients/async_http_wrappers.rb

@@ -31,9 +31,6 @@ module NewRelic
         end
 
         ASYNC_HTTP = 'Async::HTTP'
-        LHOST = 'host'
-        UHOST = 'Host'
-        COLON = ':'
 
         def type
           ASYNC_HTTP

data/lib/new_relic/agent/http_clients/curb_wrappers.rb

@@ -7,10 +7,8 @@ require_relative 'abstract'
 module NewRelic
   module Agent
     module HTTPClients
-      class CurbRequest
+      class CurbRequest < AbstractRequest
         CURB = 'Curb'
-        LHOST = 'host'
-        UHOST = 'Host'
 
         def initialize(curlobj)
           @curlobj = curlobj

data/lib/new_relic/agent/http_clients/ethon_wrappers.rb

@@ -42,8 +42,6 @@ module NewRelic
         DEFAULT_ACTION = 'GET'
         DEFAULT_HOST = 'UNKNOWN_HOST'
         ETHON = 'Ethon'
-        LHOST = 'host'.freeze
-        UHOST = 'Host'.freeze
 
         def initialize(easy)
           @easy = easy

data/lib/new_relic/agent/http_clients/excon_wrappers.rb

@@ -47,9 +47,6 @@ module NewRelic
         attr_reader :method
 
         EXCON = 'Excon'
-        LHOST = 'host'
-        UHOST = 'Host'
-        COLON = ':'
 
         def initialize(datum)
           @datum = datum

data/lib/new_relic/agent/http_clients/http_rb_wrappers.rb

@@ -20,8 +20,6 @@ module NewRelic
 
       class HTTPRequest < AbstractRequest
         HTTP_RB = 'http.rb'
-        HOST = 'host'
-        COLON = ':'
 
         def initialize(wrapped_request)
           @wrapped_request = wrapped_request
@@ -36,7 +34,7 @@ module NewRelic
         end
 
         def host_from_header
-          if hostname = self[HOST]
+          if hostname = self[LHOST]
             hostname.split(COLON).first
           end
         end

data/lib/new_relic/agent/http_clients/httpclient_wrappers.rb

@@ -26,9 +26,6 @@ module NewRelic
         attr_reader :request
 
         HTTP_CLIENT = 'HTTPClient'.freeze
-        LHOST = 'host'.freeze
-        UHOST = 'Host'.freeze
-        COLON = ':'.freeze
 
         def initialize(request)
           @request = request

data/lib/new_relic/agent/http_clients/httpx_wrappers.rb

@@ -52,8 +52,6 @@ module NewRelic
 
         DEFAULT_HOST = 'UNKNOWN_HOST'
         TYPE = 'HTTPX'
-        LHOST = 'host'.freeze
-        UHOST = 'Host'.freeze
 
         def initialize(request)
           @request = request

data/lib/new_relic/agent/http_clients/net_http_wrappers.rb

@@ -30,11 +30,8 @@ module NewRelic
           NET_HTTP
         end
 
-        HOST = 'host'
-        COLON = ':'
-
         def host_from_header
-          if hostname = self[HOST]
+          if hostname = self[LHOST]
             hostname.split(COLON).first
           end
         end

data/lib/new_relic/agent/http_clients/typhoeus_wrappers.rb

@@ -48,9 +48,6 @@ module NewRelic
           TYPHOEUS
         end
 
-        LHOST = 'host'.freeze
-        UHOST = 'Host'.freeze
-
         def host_from_header
           self[LHOST] || self[UHOST]
         end

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

@@ -39,7 +39,7 @@ DependencyDetection.defer do
   executes do
     next unless Gem::Version.new(ActiveMerchant::VERSION) < Gem::Version.new('1.65.0')
 
-    deprecation_msg = 'The Ruby Agent is dropping support for ActiveMerchant versions below 1.65.0 ' \
+    deprecation_msg = 'The Ruby agent is dropping support for ActiveMerchant versions below 1.65.0 ' \
       'in version 9.0.0. Please upgrade your ActiveMerchant version to continue receiving full support. ' \
 
     NewRelic::Agent.logger.log_once(

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

@@ -56,7 +56,7 @@ module NewRelic::Agent::Instrumentation
       return if nr_hosts.empty?
 
       NewRelic::Agent.disable_all_tracing do
-        @nr_cluster_name ||= perform_request('GET', '_cluster/health').body['cluster_name']
+        @nr_cluster_name ||= perform_request('GET', '/').body['cluster_name']
       end
     rescue StandardError => e
       NewRelic::Agent.logger.error('Failed to get cluster name for elasticsearch', e)

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

@@ -14,10 +14,7 @@ module NewRelic::Agent::Instrumentation
     def add_thread_tracing(&block)
       return block if !NewRelic::Agent::Tracer.thread_tracing_enabled?
 
-      NewRelic::Agent::Tracer.thread_block_with_current_transaction(
-        segment_name: 'Ruby/Fiber',
-        &block
-      )
+      NewRelic::Agent::Tracer.thread_block_with_current_transaction(&block)
     end
   end
 end

data/lib/new_relic/agent/instrumentation/sinatra/ignorer.rb

@@ -33,7 +33,7 @@ module NewRelic::Agent::Instrumentation
         set(:newrelic_ignores, Hash.new([])) if !respond_to?(:newrelic_ignores)
 
         # If we call an ignore without a route, it applies to the whole app
-        routes = ['*'] if routes.empty?
+        routes = [::NewRelic::ASTERISK] if routes.empty?
 
         settings.newrelic_ignores[type] += routes.map do |r|
           # Ugly sending to private Base#compile, but we want to mimic

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

@@ -46,7 +46,7 @@ DependencyDetection.defer do
   executes do
     next unless Gem::Version.new(Sinatra::VERSION) < Gem::Version.new('2.0.0')
 
-    deprecation_msg = 'The Ruby Agent is dropping support for Sinatra versions below 2.0.0 ' \
+    deprecation_msg = 'The Ruby agent is dropping support for Sinatra versions below 2.0.0 ' \
       'in version 9.0.0. Please upgrade your Sinatra version to continue receiving full compatibility. ' \
 
     NewRelic::Agent.logger.log_once(

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

@@ -16,10 +16,7 @@ module NewRelic
         def add_thread_tracing(*args, &block)
           return block if !NewRelic::Agent::Tracer.thread_tracing_enabled?
 
-          NewRelic::Agent::Tracer.thread_block_with_current_transaction(
-            segment_name: 'Ruby/Thread',
-            &block
-          )
+          NewRelic::Agent::Tracer.thread_block_with_current_transaction(&block)
         end
       end
     end

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

@@ -0,0 +1,21 @@
+# 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 ViewComponent::Chain
+    def self.instrument!
+      ::ViewComponent::Base.class_eval do
+        include NewRelic::Agent::Instrumentation::ViewComponent
+
+        alias_method(:render_in_without_tracing, :render_in)
+
+        def render_in(*args)
+          render_in_with_tracing(*args) do
+            render_in_without_tracing(*args)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# 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 ViewComponent
+    INSTRUMENTATION_NAME = NewRelic::Agent.base_name(name)
+
+    def render_in_with_tracing(*args)
+      NewRelic::Agent.record_instrumentation_invocation(INSTRUMENTATION_NAME)
+
+      begin
+        segment = NewRelic::Agent::Tracer.start_segment(
+          name: metric_name(self.class.identifier, self.class.name)
+        )
+        yield
+      rescue => e
+        ::NewRelic::Agent.logger.debug('Error capturing ViewComponent segment', e)
+      ensure
+        segment&.finish
+      end
+    end
+
+    def metric_name(identifier, component)
+      "View/#{metric_path(identifier)}/#{component}"
+    end
+
+    def metric_path(identifier)
+      return 'component' unless identifier
+
+      if (parts = identifier.split('/')).size > 1
+        parts[-2..-1].join('/') # Get filepath by assuming the Rails' structure: app/components/home/example_component.rb
+      else
+        NewRelic::Agent::UNKNOWN_METRIC
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# 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 ViewComponent::Prepend
+    include NewRelic::Agent::Instrumentation::ViewComponent
+
+    def render_in(*args)
+      render_in_with_tracing(*args) { super }
+    end
+  end
+end