WIP: Remove customer agent instance in favor of latest agent version

newrelic · Jan 7, 2025 · a0d6ea2 · a0d6ea2
1 parent a33b673
commit a0d6ea2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/boot/strap.rb b/lib/boot/strap.rb
@@ -17,6 +17,9 @@
 #   - Ruby (tested v2.4+)
 #   - Bundler (included with Ruby, tested v1.17+)
 #
+# Note: The latest version of the New Relic Ruby agent will be used when
+# instrumenting your application using this method.
+#
 # Instructions:
 #   - First, make sure the New Relic Ruby agent exists on disk. For these
 #     instructions, we'll assume the agent exists at `/newrelic`.
@@ -44,13 +47,14 @@ module NRBundlerPatch
   NR_AGENT_GEM = 'newrelic_rpm'
 
   def require(*_groups)
-    super
-
     require_newrelic
+
+    super
   end
 
   def require_newrelic
     lib = File.expand_path('../..', __FILE__)
+    $LOAD_PATH.reject! { |path| path.include?('newrelic_rpm') }
     $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
     Kernel.require NR_AGENT_GEM
   end

diff --git a/test/new_relic/boot/strap_test.rb b/test/new_relic/boot/strap_test.rb
@@ -26,7 +26,7 @@ def test_the_overall_prepend_based_monkeypatch
     end
 
     assert_equal 2, required_gems.size, "Expected 2 gems to be required, saw #{required_gems.size}."
-    assert_equal [PhonyBundler::DEFAULT_GEM_NAME, 'newrelic_rpm'], required_gems,
+    assert_equal ['newrelic_rpm', PhonyBundler::DEFAULT_GEM_NAME], required_gems,
       "Expected to see 'newrelic_rpm' required. Only saw #{required_gems}"
   end