Fix ci-changes-detector skipping pro jobs for node renderer changes (#2475)

## Summary
- Add `PRO_NODE_RENDERER_CHANGED` to the `RUN_PRO_LINT` and
`RUN_PRO_TESTS` conditions in `script/ci-changes-detector` so that PRs
touching only `packages/react-on-rails-pro-node-renderer/` correctly
trigger pro lint, pro package tests, and pro integration tests
- Add `PRO_NODE_RENDERER_CHANGED=true` to the CI infrastructure
catch-all for consistency
- Add `run_pro_node_renderer_tests:false` to the docs-only output path
for consistency

## Test plan
- [x] Verified bash syntax passes (`bash -n`)
- [x] Simulated node-renderer-only change locally — `RUN_PRO_LINT`,
`RUN_PRO_TESTS`, and `RUN_PRO_NODE_RENDERER_TESTS` all correctly set to
`true`
- [ ] CI workflows on this PR should demonstrate correct detection (this
PR changes `script/ci-changes-detector` which is CI infrastructure, so
all jobs trigger)

Fixes #2471

🤖 Generated with [Claude Code](https://claude.com/claude-code)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Chores**
* CI now detects changes to the Pro Node Renderer and exposes a
dedicated change flag.
* CI decision logic was extended so Pro Node Renderer changes gate and
trigger the appropriate Pro Node Renderer test runs.
* Test run decisions and summaries now include the Pro Node Renderer
flag and appear in CI outputs and final summaries (including JSON/GitHub
outputs).
* Change-detection categories and reporting were expanded to cover Node
Renderer updates.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: 2 people

CHANGELOG.md

@@ -31,6 +31,7 @@ Changes since the last non-beta release.
 
 ##### Fixed
 
+- **Fixed ScoutApm instrumentation depending on Gemfile ordering**. ScoutApm instrumentation for `react_component`, `react_component_hash`, and `exec_server_render_js` was previously installed at gem load time using `defined?(ScoutApm)` guards, which meant it was silently skipped if `scout_apm` appeared after `react_on_rails` in the Gemfile, and produced noisy INFO log messages if it appeared before (since ScoutApm wasn't yet initialized). Moved instrumentation into an initializer that runs after `scout_apm.start`, ensuring it works regardless of gem ordering and only after ScoutApm is fully configured. [PR 2442](https://github.com/shakacode/react_on_rails/pull/2442) by [tonyta](https://github.com/tonyta).
 - **Fixed node renderer upload race condition causing ENOENT errors and asset corruption during concurrent requests**. Concurrent multipart uploads (e.g., during pod rollovers) all wrote to a single shared path (`uploads/<filename>`), causing file overwrites, `ENOENT` errors, and cross-contamination between requests. Each request now gets its own isolated upload directory (`uploads/<uuid>/`), eliminating all shared-path collisions. [PR 2456](https://github.com/shakacode/react_on_rails/pull/2456) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 - **Fixed node renderer race condition between `/upload-assets` and render requests writing to the same bundle directory**. The `/upload-assets` endpoint used a global lock while render requests used per-bundle locks, so both could write to the same bundle directory concurrently, risking asset corruption. Now both endpoints share the same per-bundle lock key. Also switched parallel bundle processing from `Promise.all` to `Promise.allSettled` to prevent the `onResponse` cleanup hook from deleting uploaded files while in-flight copies are still reading from them. [PR 2464](https://github.com/shakacode/react_on_rails/pull/2464) by [AbanoubGhadban](https://github.com/AbanoubGhadban).
 

react_on_rails/lib/react_on_rails/engine.rb

@@ -83,6 +83,23 @@ def self.package_json_missing?
       !File.exist?(VersionChecker::NodePackageVersion.package_json_path)
     end
 
+    # Install ScoutApm instrumentation after ScoutApm is configured via "scout_apm.start" initializer.
+    # https://github.com/scoutapp/scout_apm_ruby/blob/v6.1.0/lib/scout_apm.rb#L221
+    initializer "react_on_rails.scout_apm_instrumentation", after: "scout_apm.start" do
+      next unless defined?(ScoutApm)
+
+      ReactOnRails::Helper.class_eval do
+        include ScoutApm::Tracer
+        instrument_method :react_component, type: "ReactOnRails", name: "react_component"
+        instrument_method :react_component_hash, type: "ReactOnRails", name: "react_component_hash"
+      end
+
+      ReactOnRails::ServerRenderingPool::RubyEmbeddedJavaScript.singleton_class.class_eval do
+        include ScoutApm::Tracer
+        instrument_method :exec_server_render_js, type: "ReactOnRails", name: "ExecJs React Server Rendering"
+      end
+    end
+
     config.to_prepare do
       ReactOnRails::ServerRenderingPool.reset_pool
     end

react_on_rails/lib/react_on_rails/helper.rb

@@ -714,13 +714,6 @@ def in_mailer?
       controller.is_a?(ActionMailer::Base)
     end
 
-    if defined?(ScoutApm)
-      include ScoutApm::Tracer
-
-      instrument_method :react_component, type: "ReactOnRails", name: "react_component"
-      instrument_method :react_component_hash, type: "ReactOnRails", name: "react_component_hash"
-    end
-
     def raise_missing_autoloaded_bundle(react_component_name)
       raise ReactOnRails::SmartError.new(
         error_type: :missing_auto_loaded_bundle,

react_on_rails/lib/react_on_rails/server_rendering_pool/ruby_embedded_java_script.rb

@@ -211,12 +211,6 @@ def console_polyfill
           JS
         end
 
-        if defined?(ScoutApm)
-          include ScoutApm::Tracer
-
-          instrument_method :exec_server_render_js, type: "ReactOnRails", name: "ExecJs React Server Rendering"
-        end
-
         private
 
         def file_url_to_string(url)

react_on_rails/spec/react_on_rails/engine_spec.rb

@@ -166,6 +166,93 @@ module ReactOnRails
       end
     end
 
+    describe "ScoutApm instrumentation initializer" do
+      subject(:initializer) { described_class.initializers.find { |i| i.name.include?("scout_apm") } }
+
+      it "defines a named Rails initializer to run after scout_apm.start" do
+        expect(initializer.name).to eq "react_on_rails.scout_apm_instrumentation"
+        expect(initializer.after).to eq "scout_apm.start"
+      end
+
+      describe "react_on_rails.scout_apm_instrumentation" do
+        let(:mock_scout_tracer) do
+          #
+          # Simplified mock of ScoutApm::Tracer that mirrors its real implementation.
+          # https://github.com/scoutapp/scout_apm_ruby/blob/v6.1.0/lib/scout_apm/tracer.rb#L47-L70
+          #
+          Module.new do
+            def self.included(base)
+              base.define_singleton_method(:instrument_method) do |method_name, **|
+                raise "method does not exist: #{method_name}" unless method_defined?(method_name)
+
+                instrumented_name = :"#{method_name}_with_test_instrument"
+                uninstrumented_name = :"#{method_name}_without_test_instrument"
+
+                define_method(instrumented_name) do |*args, **kwargs, &block|
+                  send(uninstrumented_name, *args, **kwargs, &block)
+                end
+
+                alias_method uninstrumented_name, method_name
+                alias_method method_name, instrumented_name
+              end
+            end
+          end
+        end
+
+        let(:mock_helper) { Module.new.include(ReactOnRails::Helper) }
+        let(:mock_rb_embedded_js) { Class.new(ReactOnRails::ServerRenderingPool::RubyEmbeddedJavaScript) }
+
+        before do
+          stub_const("ReactOnRails::Helper", mock_helper)
+          stub_const("ReactOnRails::ServerRenderingPool::RubyEmbeddedJavaScript", mock_rb_embedded_js)
+        end
+
+        context "when ScoutApm is not defined" do
+          before { hide_const("ScoutApm") }
+
+          it "does not instrument Helper#react_component" do
+            initializer.run
+            expect(mock_helper.instance_methods(false)).not_to include(:react_component_with_test_instrument)
+            expect(mock_helper.instance_methods(false)).not_to include(:react_component_without_test_instrument)
+          end
+
+          it "does not instrument Helper#react_component_hash" do
+            initializer.run
+            expect(mock_helper.instance_methods(false)).not_to include(:react_component_hash_with_test_instrument)
+            expect(mock_helper.instance_methods(false)).not_to include(:react_component_hash_without_test_instrument)
+          end
+
+          it "does not instrument RubyEmbeddedJavaScript.exec_server_render_js" do
+            initializer.run
+            expect(mock_rb_embedded_js.methods(false)).not_to include(:exec_server_render_js_with_test_instrument)
+            expect(mock_rb_embedded_js.methods(false)).not_to include(:exec_server_render_js_without_test_instrument)
+          end
+        end
+
+        context "when ScoutApm is defined" do
+          before { stub_const("ScoutApm::Tracer", mock_scout_tracer) }
+
+          it "instruments Helper#react_component" do
+            initializer.run
+            expect(mock_helper.instance_methods(false)).to include(:react_component_with_test_instrument)
+            expect(mock_helper.instance_methods(false)).to include(:react_component_without_test_instrument)
+          end
+
+          it "instruments Helper#react_component_hash" do
+            initializer.run
+            expect(mock_helper.instance_methods(false)).to include(:react_component_hash_with_test_instrument)
+            expect(mock_helper.instance_methods(false)).to include(:react_component_hash_without_test_instrument)
+          end
+
+          it "instruments RubyEmbeddedJavaScript.exec_server_render_js" do
+            initializer.run
+            expect(mock_rb_embedded_js.methods(false)).to include(:exec_server_render_js_with_test_instrument)
+            expect(mock_rb_embedded_js.methods(false)).to include(:exec_server_render_js_without_test_instrument)
+          end
+        end
+      end
+    end
+
     describe "automatic rake task loading" do
       # Rails::Engine automatically loads all .rake files from lib/tasks/
       # This test verifies that our rake tasks are loaded without needing

script/ci-changes-detector

@@ -158,6 +158,7 @@ while IFS= read -r file; do
       PRO_RUBY_CORE_CHANGED=true
       PRO_JS_CHANGED=true
       PRO_DUMMY_CHANGED=true
+      PRO_NODE_RENDERER_CHANGED=true
       ;;
 
     # Catch-all: any file not explicitly categorized above
@@ -188,6 +189,7 @@ if [ "$DOCS_ONLY" = true ]; then
     "run_pro_lint:false"
     "run_pro_tests:false"
     "run_pro_dummy_tests:false"
+    "run_pro_node_renderer_tests:false"
   )
 
   # Output to GITHUB_OUTPUT if in GitHub Actions
@@ -281,7 +283,7 @@ if [ "$PRO_RUBY_CORE_CHANGED" = true ] || [ "$PRO_RSPEC_CHANGED" = true ] || [ "
   RUN_PRO_TESTS=true
 fi
 
-if [ "$PRO_DUMMY_CHANGED" = true ] || [ "$PRO_RUBY_CORE_CHANGED" = true ] || [ "$PRO_JS_CHANGED" = true ] || [ "$RUBY_CORE_CHANGED" = true ]; then
+if [ "$PRO_DUMMY_CHANGED" = true ] || [ "$PRO_RUBY_CORE_CHANGED" = true ] || [ "$PRO_JS_CHANGED" = true ] || [ "$PRO_NODE_RENDERER_CHANGED" = true ] || [ "$RUBY_CORE_CHANGED" = true ]; then
   RUN_PRO_DUMMY_TESTS=true
 fi