Update dependencies

Rakefile

@@ -47,7 +47,7 @@ TEST_METADATA = {
   },
   'autoinstrument' => {
     # The testcase depends on a sinatra app
-    'sinatra' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
+    'sinatra-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
   },
   'aws' => {
     'aws' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
@@ -236,7 +236,9 @@ TEST_METADATA = {
     'hanami-1' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ❌ 3.0 / ❌ 3.1 / ❌ 3.2 / ❌ 3.3 / ❌ jruby'
   },
   'sinatra' => {
-    'sinatra' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
+    'sinatra-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
+    'sinatra-3' => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
+    'sinatra-4' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
   },
   'redis' => {
     'redis-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
@@ -250,7 +252,9 @@ TEST_METADATA = {
     'rack-3' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
   },
   'appsec:sinatra' => {
-    'sinatra' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'
+    'sinatra-2' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
+    'sinatra-3' => '❌ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
+    'sinatra-4' => '❌ 2.5 / ❌ 2.6 / ❌ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby',
   },
   'appsec:devise' => {
     '' => '✅ 2.5 / ✅ 2.6 / ✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby'

appraisal/jruby-9.2.rb

@@ -1,9 +1,3 @@
-appraise 'hanami-1' do
-  gem 'rack'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
-  gem 'hanami', '~> 1'
-end
-
 appraise 'rails5-mysql2' do
   gem 'rails', '~> 5.2.1'
   gem 'activerecord-jdbcmysql-adapter', platform: :jruby
@@ -245,7 +239,6 @@
 
 [
   '2.0',
-  '1.13',
 ].each do |v|
   appraise "graphql-#{v}" do
     gem 'graphql', "~> #{v}.0"
@@ -260,14 +253,12 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
-end
-
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
+[2].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 [3, 4, 5].each do |n|

appraisal/jruby-9.3.rb

@@ -1,9 +1,3 @@
-appraise 'hanami-1' do
-  gem 'rack'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
-  gem 'hanami', '~> 1'
-end
-
 appraise 'rails5-mysql2' do
   gem 'rails', '~> 5.2.1'
   gem 'activerecord-jdbcmysql-adapter', platform: :jruby
@@ -231,14 +225,12 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra', '>= 3'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
-end
-
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
+[2, 3].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 [3, 4, 5].each do |n|

appraisal/jruby-9.4.rb

@@ -144,14 +144,12 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra', '>= 3'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
-end
-
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
+[2, 3, 4].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 appraise 'contrib-old' do

appraisal/ruby-2.5.rb

@@ -264,7 +264,6 @@
 
 [
   '2.0',
-  '1.13',
 ].each do |v|
   appraise "graphql-#{v}" do
     gem 'graphql', "~> #{v}.0"
@@ -279,14 +278,12 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
-end
-
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
+[2].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 [3, 4, 5].each do |n|

appraisal/ruby-2.6.rb

@@ -232,20 +232,18 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra', '>= 3'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
+[2, 3].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 appraise 'opentelemetry' do
   gem 'opentelemetry-sdk', '~> 1.1'
 end
 
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
-end
-
 [3, 4, 5].each do |n|
   appraise "redis-#{n}" do
     gem 'redis', "~> #{n}"

appraisal/ruby-2.7.rb

@@ -233,20 +233,19 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra', '>= 3'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
+# Sinatra 4 requires Ruby (>= 2.7.8), but current image with Ruby 2.7.6
+[2, 3].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 appraise 'opentelemetry' do
   gem 'opentelemetry-sdk', '~> 1.1'
 end
 
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
-end
-
 [3, 4, 5].each do |n|
   appraise "redis-#{n}" do
     gem 'redis', "~> #{n}"

appraisal/ruby-3.0.rb

@@ -153,20 +153,18 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra', '>= 3'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
+[2, 3, 4].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 appraise 'opentelemetry' do
   gem 'opentelemetry-sdk', '~> 1.1'
 end
 
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
-end
-
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0

appraisal/ruby-3.1.rb

@@ -153,20 +153,18 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra', '>= 3'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
+[2, 3, 4].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 appraise 'opentelemetry' do
   gem 'opentelemetry-sdk', '~> 1.1'
 end
 
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
-end
-
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0

appraisal/ruby-3.2.rb

@@ -153,20 +153,18 @@
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra', '>= 3'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
+[2, 3, 4].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 appraise 'opentelemetry' do
   gem 'opentelemetry-sdk', '~> 1.1'
 end
 
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
-end
-
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0

appraisal/ruby-3.3.rb

@@ -133,7 +133,6 @@
   '2.1',
   '2.0',
   '1.13',
-  '1.12',
 ].each do |v|
   appraise "graphql-#{v}" do
     gem 'graphql', "~> #{v}.0"
@@ -157,28 +156,26 @@
   end
 end
 
-[1, 2, 3].each do |n|
+[2, 3].each do |n|
   appraise "rack-#{n}" do
     gem 'rack', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end
 end
 
-appraise 'sinatra' do
-  gem 'sinatra', '>= 3'
-  gem 'rack-contrib'
-  gem 'rack-test' # Dev dependencies for testing rack-based code
+[2, 3, 4].each do |n|
+  appraise "sinatra-#{n}" do
+    gem 'sinatra', "~> #{n}"
+    gem 'rack-contrib'
+    gem 'rack-test' # Dev dependencies for testing rack-based code
+  end
 end
 
 appraise 'opentelemetry' do
   gem 'opentelemetry-sdk', '~> 1.1'
 end
 
-appraise 'opentracing' do
-  gem 'opentracing', '>= 0.4.1'
-end
-
 appraise 'contrib-old' do
   gem 'dalli', '< 3.0.0'
   gem 'presto-client', '>= 0.5.14' # Renamed to trino-client in >= 1.0