squash: 3.4 workaround

arielvalentin · arielvalentin · commit 736fd8aafa4f · 2025-01-29T22:51:35.000-06:00
diff --git a/helpers/mysql/Gemfile b/helpers/mysql/Gemfile
@@ -7,3 +7,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/helpers/sql-obfuscation/Gemfile b/helpers/sql-obfuscation/Gemfile
@@ -7,3 +7,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/helpers/sql/Gemfile b/helpers/sql/Gemfile
@@ -11,3 +11,7 @@ source 'https://rubygems.org'
 # then target specific versions in the Appraisals file.
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/instrumentation/action_mailer/Gemfile b/instrumentation/action_mailer/Gemfile
@@ -14,4 +14,5 @@ group :test do
   # Add jar-dependencies gem only if the Ruby runtime is JRuby
   # https://github.com/jruby/jruby/issues/7262
   gem 'jar-dependencies', '0.4.1', platforms: :jruby
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/action_pack/Gemfile b/instrumentation/action_pack/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../../instrumentation/base'
   gem 'opentelemetry-instrumentation-rack', path: '../../instrumentation/rack'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/action_view/Gemfile b/instrumentation/action_view/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_job/Gemfile b/instrumentation/active_job/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_model_serializers/Gemfile b/instrumentation/active_model_serializers/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_record/Gemfile b/instrumentation/active_record/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_storage/Gemfile b/instrumentation/active_storage/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/active_support/Gemfile b/instrumentation/active_support/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/all/Gemfile b/instrumentation/all/Gemfile
@@ -9,6 +9,8 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+
   Dir.entries('../../helpers')
      .select { |entry| File.directory?(File.join('../../helpers', entry)) }
      .reject { |entry| %w[. ..].include?(entry) } # rubocop:disable Performance/CollectionLiteralInLoop
diff --git a/instrumentation/aws_lambda/Gemfile b/instrumentation/aws_lambda/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'webrick', '~> 1.7'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/aws_sdk/Gemfile b/instrumentation/aws_sdk/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'webrick', '~> 1.7'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/base/Gemfile b/instrumentation/base/Gemfile
@@ -7,3 +7,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/instrumentation/bunny/Gemfile b/instrumentation/bunny/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/concurrent_ruby/Gemfile b/instrumentation/concurrent_ruby/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/dalli/Gemfile b/instrumentation/dalli/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/delayed_job/Gemfile b/instrumentation/delayed_job/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/ethon/Gemfile b/instrumentation/ethon/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/excon/Gemfile b/instrumentation/excon/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/faraday/Gemfile b/instrumentation/faraday/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/grape/Gemfile b/instrumentation/grape/Gemfile
@@ -16,4 +16,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
   gem 'builder'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/graphql/Gemfile b/instrumentation/graphql/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/grpc/Gemfile b/instrumentation/grpc/Gemfile
@@ -12,4 +12,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/gruf/Gemfile b/instrumentation/gruf/Gemfile
@@ -14,4 +14,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/http/Gemfile b/instrumentation/http/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/http_client/Gemfile b/instrumentation/http_client/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/httpx/Gemfile b/instrumentation/httpx/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug', platform: 'ruby'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/koala/Gemfile b/instrumentation/koala/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/lmdb/Gemfile b/instrumentation/lmdb/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/mongo/Gemfile b/instrumentation/mongo/Gemfile
@@ -8,4 +8,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'opentelemetry-instrumentation-base', path: '../base'
+group :test do
+  gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/instrumentation/mysql2/Gemfile b/instrumentation/mysql2/Gemfile
@@ -13,4 +13,5 @@ group :test, :development do
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-mysql', path: '../../helpers/mysql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/net_http/Gemfile b/instrumentation/net_http/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/pg/Gemfile b/instrumentation/pg/Gemfile
@@ -13,4 +13,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/que/Gemfile b/instrumentation/que/Gemfile
@@ -15,4 +15,5 @@ group :test do
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-pg', path: '../pg'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/racecar/Gemfile b/instrumentation/racecar/Gemfile
@@ -13,6 +13,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'activesupport', '~> 6' # used to test against JRuby which is only MRI 2.6 compatibile
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rack/Gemfile b/instrumentation/rack/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'rack-test', '~> 2.1.0'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rails/Gemfile b/instrumentation/rails/Gemfile
@@ -19,4 +19,5 @@ group :test, :development do
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
   gem 'opentelemetry-instrumentation-action_view', path: '../action_view'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rake/Gemfile b/instrumentation/rake/Gemfile
@@ -14,4 +14,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rdkafka/Gemfile b/instrumentation/rdkafka/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/redis/Gemfile b/instrumentation/redis/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/resque/Gemfile b/instrumentation/resque/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'activejob'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/restclient/Gemfile b/instrumentation/restclient/Gemfile
@@ -10,4 +10,5 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/rspec/Gemfile b/instrumentation/rspec/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'rspec', '~> 3.0'
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/ruby_kafka/Gemfile b/instrumentation/ruby_kafka/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/sidekiq/Gemfile b/instrumentation/sidekiq/Gemfile
@@ -12,4 +12,5 @@ group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-redis', path: '../redis'
   gem 'pry-byebug'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/sinatra/Gemfile b/instrumentation/sinatra/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/instrumentation/trilogy/Gemfile b/instrumentation/trilogy/Gemfile
@@ -14,4 +14,5 @@ group :test do
   gem 'opentelemetry-helpers-sql', path: '../../helpers/sql'
   gem 'opentelemetry-helpers-sql-obfuscation', path: '../../helpers/sql-obfuscation'
   gem 'opentelemetry-propagator-vitess', path: '../../propagator/vitess'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/processor/baggage/Gemfile b/processor/baggage/Gemfile
@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in opentelemetry-processor-baggage.gemspec
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/propagator/ottrace/Gemfile b/propagator/ottrace/Gemfile
@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in opentelemetry-propragator-ottrace.gemspec
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/propagator/vitess/Gemfile b/propagator/vitess/Gemfile
@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in opentelemetry-propragator-vitess.gemspec
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/propagator/xray/Gemfile b/propagator/xray/Gemfile
@@ -7,3 +7,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
+end
diff --git a/resources/azure/Gemfile b/resources/azure/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/resources/container/Gemfile b/resources/container/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
diff --git a/resources/google_cloud_platform/Gemfile b/resources/google_cloud_platform/Gemfile
@@ -11,4 +11,5 @@ gemspec
 group :development, :test do
   gem 'byebug' unless RUBY_PLATFORM == 'java'
   gem 'pry'
+  gem 'mutex_m' if RUBY_VERSION >= '3.4'
 end
