Merge branch 'main' into add-conventional-commit-linters

open-telemetry · Jan 22, 2024 · 0f513a3 · 0f513a3
2 parents 121b9a8 + f26d4d7
commit 0f513a3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/instrumentation/sinatra/Appraisals b/instrumentation/sinatra/Appraisals
@@ -4,8 +4,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'sinatra-3.0.x' do
-  gem 'sinatra', '~> 3.0.0'
+appraise 'sinatra-4.x' do
+  gem 'sinatra', '~> 4.0'
+end
+
+appraise 'sinatra-3.x' do
+  gem 'sinatra', '~> 3.0'
 end
 
 appraise 'sinatra-2.x' do

diff --git a/instrumentation/sinatra/example/Gemfile b/instrumentation/sinatra/example/Gemfile
@@ -5,9 +5,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 source 'https://rubygems.org'
-gem 'puma'
 gem 'opentelemetry-api'
 gem 'opentelemetry-common'
 gem 'opentelemetry-instrumentation-sinatra'
 gem 'opentelemetry-sdk'
+gem 'puma'
+gem 'rackup'
 gem 'sinatra'
diff --git a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
-  spec.add_development_dependency 'rack-test', '~> 1.1.0'
+  spec.add_development_dependency 'rack-test', '~> 2.1'
   spec.add_development_dependency 'rubocop', '~> 1.60.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.20'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'