Merge branch 'master' into rachel.yang/baggage-telemetry

Author: p-datadog

appraisal/jruby-9.2.rb

@@ -264,6 +264,7 @@
 [2].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/jruby-9.3.rb

@@ -237,6 +237,7 @@
 [2, 3].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/jruby-9.4.rb

@@ -149,6 +149,7 @@
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/ruby-2.5.rb

@@ -281,6 +281,7 @@
 [2].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/ruby-2.6.rb

@@ -235,6 +235,7 @@
 [2, 3].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/ruby-2.7.rb

@@ -57,6 +57,7 @@
   gem 'mysql2', '< 1', platform: :ruby
   gem 'sprockets', '< 4'
   gem 'lograge', '~> 0.11'
+  gem 'nio4r', '>= 2.5.9' # NOTE: 2.5.8 has a compilation issues that were fixed
 end
 
 appraise 'rails6-postgres' do
@@ -237,6 +238,7 @@
 [2, 3].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/ruby-3.0.rb

@@ -162,6 +162,7 @@
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/ruby-3.1.rb

@@ -159,6 +159,7 @@
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/ruby-3.2.rb

@@ -204,6 +204,7 @@
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end

appraisal/ruby-3.3.rb

@@ -83,7 +83,7 @@
 appraise 'rails8-postgres-sidekiq' do
   gem 'rails', '~> 8.0.0'
   gem 'pg', '>= 1.1', platform: :ruby
-  # Note: Sidekiq 8 uses different timestamp formatting compared to prior versions. As long as
+  # NOTE: Sidekiq 8 uses different timestamp formatting compared to prior versions. As long as
   # versions <8 are supported, make sure there's some CI running both older and newer versions.
   gem 'sidekiq', '< 8'
   gem 'lograge', '~> 0.11'
@@ -206,6 +206,7 @@
 [2, 3, 4].each do |n|
   appraise "sinatra-#{n}" do
     gem 'sinatra', "~> #{n}"
+    gem 'sinatra-contrib', "~> #{n}"
     gem 'rack-contrib'
     gem 'rack-test' # Dev dependencies for testing rack-based code
   end