Fix CI failures

Author: ericfirth

Matrixfile

@@ -127,6 +127,11 @@
     # karafka 2.0.41 contains broken dependency of karafka-core 2.2.4, which depends on Ruby (>= 2.6.0)
     'karafka-min'    => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby',
   },
+  'waterdrop' => {
+    # WaterDrop 2.8.8+ requires Ruby >= 3.1.0 (JRuby 9.4+ only, not 9.2/9.3)
+    'waterdrop-latest' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby-9.4+',
+    'waterdrop-min'    => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ❌ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby-9.4+'
+  },
   'lograge' => {
     'activesupport' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ 3.4 / ✅ 3.5 / ✅ jruby'
   },

Rakefile

@@ -286,7 +286,8 @@ namespace :spec do
     :stripe,
     :sucker_punch,
     :suite,
-    :trilogy
+    :trilogy,
+    :waterdrop
   ].each do |contrib|
     desc '' # "Explicitly hiding from `rake -T`"
     RSpec::Core::RakeTask.new(contrib) do |t, args|

Steepfile

@@ -329,9 +329,12 @@ target :datadog do
   ignore 'lib/datadog/tracing/contrib/karafka/configuration/settings.rb'
   ignore 'lib/datadog/tracing/contrib/karafka/distributed/propagation.rb'
   ignore 'lib/datadog/tracing/contrib/karafka/ext.rb'
+  ignore 'lib/datadog/tracing/contrib/karafka/framework.rb'
   ignore 'lib/datadog/tracing/contrib/karafka/integration.rb'
   ignore 'lib/datadog/tracing/contrib/karafka/monitor.rb'
   ignore 'lib/datadog/tracing/contrib/karafka/patcher.rb'
+  ignore 'lib/datadog/tracing/contrib/waterdrop.rb'
+  ignore 'lib/datadog/tracing/contrib/waterdrop/'
   ignore 'lib/datadog/tracing/contrib/patcher.rb'
   ignore 'lib/datadog/tracing/contrib/configuration/resolver.rb'
   ignore 'lib/datadog/tracing/contrib/propagation/sql_comment/comment.rb'

appraisal/jruby-10.0.rb

@@ -83,6 +83,7 @@
 build_coverage_matrix('rest-client')
 build_coverage_matrix('dalli', [2])
 build_coverage_matrix('karafka', min: '2.3.0')
+build_coverage_matrix('waterdrop', min: '2.8.8.rc1')
 
 appraise 'karafka-min' do
   gem 'karafka', '= 2.3.0'

appraisal/jruby-9.2.rb

@@ -204,6 +204,7 @@
 build_coverage_matrix('rest-client')
 build_coverage_matrix('mongo', min: '2.1.0')
 build_coverage_matrix('dalli', [2])
+# NOTE: waterdrop requires Ruby >= 3.1.0, JRuby 9.2 (Ruby 2.5) is not supported
 # NOTE: JRuby bundler failed to install some dependencies https://github.com/ruby/psych/issues/700
 #       and it could be re-enabled when upstream fix the issue
 # build_coverage_matrix('devise', min: '3.2.1')

appraisal/jruby-9.3.rb

@@ -177,6 +177,7 @@
 build_coverage_matrix('rest-client')
 build_coverage_matrix('mongo', min: '2.1.0')
 build_coverage_matrix('dalli', [2])
+# NOTE: waterdrop requires Ruby >= 3.1.0, JRuby 9.3 (Ruby 2.6) is not supported
 # NOTE: JRuby bundler failed to install some dependencies https://github.com/ruby/psych/issues/700
 #       and it could be re-enabled when upstream fix the issue
 # build_coverage_matrix('devise', min: '3.2.1')

appraisal/ruby-3.0.rb

@@ -98,7 +98,6 @@
 build_coverage_matrix('mongo', min: '2.1.0')
 build_coverage_matrix('dalli', [2])
 build_coverage_matrix('karafka', min: '2.3.0')
-build_coverage_matrix('waterdrop', min: '2.8.8.rc1')
 build_coverage_matrix('devise', min: '3.2.1')
 
 appraise 'relational_db' do

appraisal/ruby-3.5.rb

@@ -93,6 +93,7 @@
 build_coverage_matrix('mongo', min: '2.20.0')
 build_coverage_matrix('dalli', [2])
 build_coverage_matrix('karafka', min: '2.3.0')
+build_coverage_matrix('waterdrop', min: '2.8.8.rc1')
 build_coverage_matrix('devise', min: '3.2.1')
 
 appraise 'relational_db' do