Merge pull request #2170 from newrelic/roda_require_update

Add require statement

CHANGELOG.md

@@ -1,5 +1,13 @@
 # New Relic Ruby Agent Release Notes
 
+## v9.4.2
+
+Version 9.4.2 of the agent re-addresses the 9.4.0 issue of `NoMethodError` seen when using the `uppy-s3_multipart` gem.
+
+- **Bugfix: Resolve NoMethodError**
+
+  Ruby agent 9.4.1 attempted to fix a `NoMethodError` introduced in 9.4.0. A missing `require` prevented a method from scoping appropriately and has now been added. Thanks to [@spickermann](https://github.com/spickermann) and [@ColinOrr](https://github.com/ColinOrr) for working with us to get this resolved. [PR#2167](https://github.com/newrelic/newrelic-ruby-agent/pull/2167)
+
 ## v9.4.1
 
 Version 9.4.1 of the agent resolves a `NoMethodError` introduced in 9.4.0.

lib/new_relic/agent/instrumentation/roda.rb

@@ -3,6 +3,7 @@
 # frozen_string_literal: true
 
 require_relative 'roda/instrumentation'
+require_relative 'roda/roda_transaction_namer'
 
 DependencyDetection.defer do
   named :roda

lib/new_relic/agent/instrumentation/roda/roda_transaction_namer.rb

@@ -10,7 +10,7 @@ module TransactionNamer
           extend self
 
           ROOT = '/'.freeze
-          REGEX_MULTIPLE_SLASHES = %r{^[/^\A]*(.*?)[/$?\z]*$}.freeze
+          REGEX_MULTIPLE_SLASHES = %r{^[/^]*(.*?)[/$?]*$}.freeze
 
           def transaction_name(request)
             path = request.path || ::NewRelic::Agent::UNKNOWN_METRIC

test/multiverse/suites/roda/roda_instrumentation_test.rb

@@ -106,6 +106,13 @@ def test_roda_instrumentation_works_if_middleware_disabled
     end
   end
 
+  def test_roda_namer_removes_rogue_slashes
+    get('/home//')
+    txn = harvest_transaction_events![1][0]
+
+    assert_equal 'Controller/Roda/RodaTestApp/GET home', txn[0]['name']
+  end
+
   def test_transaction_name_error
     NewRelic::Agent.stub(:logger, NewRelic::Agent::MemoryLogger.new) do
       # pass in {} to produce an error, because {} doesn't support #path and