constrain DI integration tests to configurations on which DI works

DataDog · Jan 13, 2025 · 93abf05 · 93abf05
1 parent 9e71209
commit 93abf05
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 0 deletions.
diff --git a/integration/apps/rails-five/spec/integration/di_spec.rb b/integration/apps/rails-five/spec/integration/di_spec.rb
@@ -3,6 +3,7 @@
 
 RSpec.describe 'Dynamic Instrumentation' do
   include_context 'integration test'
+  di_test
 
   describe 'ActiveRecord integration' do
     subject { JSON.parse(get('di/ar_serializer').body) }

diff --git a/integration/apps/rails-five/spec/support/integration_helper.rb b/integration/apps/rails-five/spec/support/integration_helper.rb
@@ -19,4 +19,23 @@ def get(path)
       Net::HTTP.get_response(uri)
     end
   end
+
+  module ClassMethods
+    def di_test
+      if RUBY_ENGINE == 'jruby'
+        before(:all) do
+          skip "Dynamic instrumentation is not supported on JRuby"
+        end
+      end
+      if RUBY_VERSION < "2.6"
+        before(:all) do
+          skip "Dynamic instrumentation requires Ruby 2.6 or higher"
+        end
+      end
+    end
+  end
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
 end
diff --git a/integration/apps/rails-seven/spec/integration/di_spec.rb b/integration/apps/rails-seven/spec/integration/di_spec.rb
@@ -3,6 +3,7 @@
 
 RSpec.describe 'Dynamic Instrumentation' do
   include_context 'integration test'
+  di_test
 
   describe 'ActiveRecord integration' do
     subject { JSON.parse(get('di/ar_serializer').body) }

diff --git a/integration/apps/rails-seven/spec/support/integration_helper.rb b/integration/apps/rails-seven/spec/support/integration_helper.rb
@@ -19,4 +19,23 @@ def get(path)
       Net::HTTP.get_response(uri)
     end
   end
+
+  module ClassMethods
+    def di_test
+      if RUBY_ENGINE == 'jruby'
+        before(:all) do
+          skip "Dynamic instrumentation is not supported on JRuby"
+        end
+      end
+      if RUBY_VERSION < "2.6"
+        before(:all) do
+          skip "Dynamic instrumentation requires Ruby 2.6 or higher"
+        end
+      end
+    end
+  end
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
 end
diff --git a/integration/apps/rails-six/spec/integration/di_spec.rb b/integration/apps/rails-six/spec/integration/di_spec.rb
@@ -3,6 +3,7 @@
 
 RSpec.describe 'Dynamic Instrumentation' do
   include_context 'integration test'
+  di_test
 
   describe 'ActiveRecord integration' do
     subject { JSON.parse(get('di/ar_serializer').body) }

diff --git a/integration/apps/rails-six/spec/support/integration_helper.rb b/integration/apps/rails-six/spec/support/integration_helper.rb
@@ -19,4 +19,23 @@ def get(path)
       Net::HTTP.get_response(uri)
     end
   end
+
+  module ClassMethods
+    def di_test
+      if RUBY_ENGINE == 'jruby'
+        before(:all) do
+          skip "Dynamic instrumentation is not supported on JRuby"
+        end
+      end
+      if RUBY_VERSION < "2.6"
+        before(:all) do
+          skip "Dynamic instrumentation requires Ruby 2.6 or higher"
+        end
+      end
+    end
+  end
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
 end