changes as per review comments

Signed-off-by: Arjun Rajappa <Arjun.Rajappa@ibm.com>
instana · Jun 24, 2024 · ef485ce · ef485ce
1 parent 98039c5
commit ef485ce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 41 deletions.
diff --git a/lib/instana/activators/action_view.rb b/lib/instana/activators/action_view.rb
@@ -13,7 +13,7 @@ def instrument
 
         ::ActionView::PartialRenderer
           .prepend(Instana::Instrumentation::ActionView::PartialRenderer)
-        if ::Rails::VERSION::STRING > "6.0" && defined?(::ActionView::CollectionRenderer)
+        if defined?(::ActionView::CollectionRenderer)
           ::ActionView::CollectionRenderer
             .prepend(Instrumentation::ActionView::CollectionRenderer)
         end

diff --git a/test/instrumentation/rails_action_view_test.rb b/test/instrumentation/rails_action_view_test.rb
@@ -17,18 +17,6 @@ def app
 
   def setup
     clear_all!
-    @framework_version = Gem::Specification.find_by_name('rails').version
-    @supported_framework_version = @framework_version < Gem::Version.new('7.2')
-    @execute_test_if_framework_version_is_supported = lambda {
-      unless @supported_framework_version
-        skip "Skipping this test because Rails version #{@framework_version} is not yet supported!"
-      end
-    }
-    @execute_test_only_if_framework_version_is_not_supported = lambda {
-      if @supported_framework_version
-        skip "Skipping this test because Rails version #{@framework_version} is already supported!"
-      end
-    }
   end
 
   def test_config_defaults
@@ -37,25 +25,7 @@ def test_config_defaults
     assert_equal true, ::Instana.config[:action_view][:enabled]
   end
 
-  def test_no_tracing_if_unsupported_version_only_render_is_ok
-    @execute_test_only_if_framework_version_is_not_supported.call
-
-    ['/render_view', '/render_view_direct', '/render_partial', '/render_collection', '/render_file',
-     '/render_alternate_layout', '/render_json', '/render_xml',
-     '/render_rawbody', '/render_js'].each do |endpoint|
-      get endpoint
-      assert last_response.ok?
-    end
-
-    get '/render_partial_that_errors'
-    assert_equal false, last_response.ok?
-
-    spans = ::Instana.processor.queued_spans
-    assert_equal [], spans
-  end
-
   def test_render_view
-    @execute_test_if_framework_version_is_supported.call
     get '/render_view'
     assert last_response.ok?
 
@@ -66,7 +36,6 @@ def test_render_view
   end
 
   def test_render_view_direct
-    @execute_test_if_framework_version_is_supported.call
     get '/render_view_direct'
     assert last_response.ok?
 
@@ -89,7 +58,6 @@ def test_render_nothing
   end
 
   def test_render_file
-    @execute_test_if_framework_version_is_supported.call
     get '/render_file'
     assert last_response.ok?
 
@@ -100,7 +68,6 @@ def test_render_file
   end
 
   def test_render_json
-    @execute_test_if_framework_version_is_supported.call
     get '/render_json'
     assert last_response.ok?
 
@@ -111,7 +78,6 @@ def test_render_json
   end
 
   def test_render_xml
-    @execute_test_if_framework_version_is_supported.call
     get '/render_xml'
     assert last_response.ok?
 
@@ -122,7 +88,6 @@ def test_render_xml
   end
 
   def test_render_body
-    @execute_test_if_framework_version_is_supported.call
     get '/render_rawbody'
     assert last_response.ok?
 
@@ -133,7 +98,6 @@ def test_render_body
   end
 
   def test_render_js
-    @execute_test_if_framework_version_is_supported.call
     get '/render_js'
     assert last_response.ok?
 
@@ -144,7 +108,6 @@ def test_render_js
   end
 
   def test_render_alternate_layout
-    @execute_test_if_framework_version_is_supported.call
     get '/render_alternate_layout'
     assert last_response.ok?
 
@@ -155,7 +118,6 @@ def test_render_alternate_layout
   end
 
   def test_render_partial
-    @execute_test_if_framework_version_is_supported.call
     get '/render_partial'
     assert last_response.ok?
 
@@ -166,7 +128,6 @@ def test_render_partial
   end
 
   def test_render_partial_that_errors
-    @execute_test_if_framework_version_is_supported.call
     get '/render_partial_that_errors'
     refute last_response.ok?
 
@@ -182,7 +143,6 @@ def test_render_partial_that_errors
   end
 
   def test_render_collection
-    @execute_test_if_framework_version_is_supported.call
     get '/render_collection'
     assert last_response.ok?