From 3e5fbb39f31a8af5c38072978ed3b5808067893a Mon Sep 17 00:00:00 2001 From: Sander Jans Date: Mon, 22 Jan 2024 16:33:50 +0100 Subject: [PATCH 1/2] chore: add appraisal for Sinatra 4. (#827) * chore: add appraisal for Sinatra 4. * chore: allow for latest minor version of rack-test. --- instrumentation/sinatra/Appraisals | 8 ++++++-- .../sinatra/opentelemetry-instrumentation-sinatra.gemspec | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/instrumentation/sinatra/Appraisals b/instrumentation/sinatra/Appraisals index f4ebf5e8a..837cb545c 100644 --- 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/opentelemetry-instrumentation-sinatra.gemspec b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec index a72253083..5fb8c0810 100644 --- 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' From f26d4d77ffd9908658bb970df3fddfa9020b55f8 Mon Sep 17 00:00:00 2001 From: Sander Jans Date: Mon, 22 Jan 2024 17:26:50 +0100 Subject: [PATCH 2/2] chore: add rackup to sinatra example Gemfile (#828) Co-authored-by: Sam <370182+plantfansam@users.noreply.github.com> --- instrumentation/sinatra/example/Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instrumentation/sinatra/example/Gemfile b/instrumentation/sinatra/example/Gemfile index 0ddf65b87..c6bb91d5d 100644 --- 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'