Merge branch 'master' into report-wait-until

DataDog · Jan 8, 2025 · f2ad94f · f2ad94f
2 parents 1d1b6db + b86820e
commit f2ad94f
Show file tree

Hide file tree

Showing 1,126 changed files with 3,375 additions and 6,643 deletions.
diff --git a/Rakefile b/Rakefile
@@ -402,6 +402,7 @@ namespace :coverage do
   # Generates one report for each Ruby version
   task :report_per_ruby_version do
     require 'simplecov'
+    require_relative 'spec/support/simplecov_fix'
 
     versions = Dir["#{ENV.fetch('COVERAGE_DIR', 'coverage')}/versions/*"].map { |f| File.basename(f) }
     versions.map do |version|

diff --git a/gemfiles/jruby_9.2_activesupport.gemfile b/gemfiles/jruby_9.2_activesupport.gemfile
diff --git a/gemfiles/jruby_9.2_activesupport.gemfile.lock b/gemfiles/jruby_9.2_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.2_aws.gemfile b/gemfiles/jruby_9.2_aws.gemfile
diff --git a/gemfiles/jruby_9.2_aws.gemfile.lock b/gemfiles/jruby_9.2_aws.gemfile.lock
diff --git a/gemfiles/jruby_9.2_contrib.gemfile b/gemfiles/jruby_9.2_contrib.gemfile
diff --git a/gemfiles/jruby_9.2_contrib.gemfile.lock b/gemfiles/jruby_9.2_contrib.gemfile.lock
diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile b/gemfiles/jruby_9.2_contrib_old.gemfile
diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile.lock b/gemfiles/jruby_9.2_contrib_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2_core_old.gemfile b/gemfiles/jruby_9.2_core_old.gemfile
diff --git a/gemfiles/jruby_9.2_core_old.gemfile.lock b/gemfiles/jruby_9.2_core_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile b/gemfiles/jruby_9.2_elasticsearch_7.gemfile
diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock
diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile b/gemfiles/jruby_9.2_elasticsearch_8.gemfile
diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock
diff --git a/gemfiles/jruby_9.2_elasticsearch_latest.gemfile b/gemfiles/jruby_9.2_elasticsearch_latest.gemfile
diff --git a/gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock
diff --git a/gemfiles/jruby_9.2_graphql_2.0.gemfile b/gemfiles/jruby_9.2_graphql_2.0.gemfile
diff --git a/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock