diff --git a/instrumentation/action_mailer/Appraisals b/instrumentation/action_mailer/Appraisals index 326eb680b..65c42e809 100644 --- a/instrumentation/action_mailer/Appraisals +++ b/instrumentation/action_mailer/Appraisals @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -%w[7.1.0 7.2.0 8.0.0].each do |version| +%w[7.1.0 7.2.0 8.0.0 8.1.0].each do |version| appraise "action_mailer-#{version}" do gem 'rails', "~> #{version}" end diff --git a/instrumentation/action_pack/Appraisals b/instrumentation/action_pack/Appraisals index e8311a799..8b85f0856 100644 --- a/instrumentation/action_pack/Appraisals +++ b/instrumentation/action_pack/Appraisals @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -%w[7.1.0 7.2.0 8.0.0].each do |version| +%w[7.1.0 7.2.0 8.0.0 8.1.0].each do |version| appraise "action_pack-#{version}" do gem 'rails', "~> #{version}" end diff --git a/instrumentation/action_view/Appraisals b/instrumentation/action_view/Appraisals index ca5e36e4d..e7d279e79 100644 --- a/instrumentation/action_view/Appraisals +++ b/instrumentation/action_view/Appraisals @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -%w[7.1.0 7.2.0 8.0.0].each do |version| +%w[7.1.0 7.2.0 8.0.0 8.1.0].each do |version| appraise "action_view-#{version}" do gem 'rails', "~> #{version}" end diff --git a/instrumentation/active_job/Appraisals b/instrumentation/active_job/Appraisals index df6679791..f462d8a04 100644 --- a/instrumentation/active_job/Appraisals +++ b/instrumentation/active_job/Appraisals @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -%w[7.1.0 7.2.0 8.0.0].each do |version| +%w[7.1.0 7.2.0 8.0.0 8.1.0].each do |version| appraise "activejob-#{version}" do gem 'activejob', "~> #{version}" end diff --git a/instrumentation/active_model_serializers/Appraisals b/instrumentation/active_model_serializers/Appraisals index a709833ce..bbb8b357a 100644 --- a/instrumentation/active_model_serializers/Appraisals +++ b/instrumentation/active_model_serializers/Appraisals @@ -4,6 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'active_model_serializers_0.10' do - gem 'active_model_serializers', '~> 0.10.0' +appraise 'active_model_serializers-latest' do + gem 'active_model_serializers' end diff --git a/instrumentation/active_record/Appraisals b/instrumentation/active_record/Appraisals index 18df3e8f5..8ab3b90b6 100644 --- a/instrumentation/active_record/Appraisals +++ b/instrumentation/active_record/Appraisals @@ -11,7 +11,7 @@ end end -%w[8.0.0].each do |version| +%w[8.0.0 8.1.0].each do |version| appraise "activerecord-#{version}" do gem 'sqlite3', '>= 2.1' gem 'activerecord', "~> #{version}" diff --git a/instrumentation/active_storage/Appraisals b/instrumentation/active_storage/Appraisals index 8c173b4bd..315edd0a1 100644 --- a/instrumentation/active_storage/Appraisals +++ b/instrumentation/active_storage/Appraisals @@ -12,7 +12,7 @@ end end -%w[8.0.0].each do |version| +%w[8.0.0 8.1.0].each do |version| appraise "activestorage-#{version}" do gem 'sqlite3', '>= 2.1' gem 'image_processing', '~> 1.2' diff --git a/instrumentation/active_support/Appraisals b/instrumentation/active_support/Appraisals index 06e3a4fe4..965dd7c36 100644 --- a/instrumentation/active_support/Appraisals +++ b/instrumentation/active_support/Appraisals @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -%w[7.1.0 7.2.0 8.0.0].each do |version| +%w[7.1.0 7.2.0 8.0.0 8.1.0].each do |version| appraise "activesupport-#{version}" do gem 'activesupport', "~> #{version}" end diff --git a/instrumentation/bunny/Appraisals b/instrumentation/bunny/Appraisals index a6810ee3f..6b6a46aa7 100644 --- a/instrumentation/bunny/Appraisals +++ b/instrumentation/bunny/Appraisals @@ -4,6 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'bunny-2' do - gem 'bunny', '~> 2' +appraise 'bunny-latest' do + gem 'bunny' end diff --git a/instrumentation/concurrent_ruby/Appraisals b/instrumentation/concurrent_ruby/Appraisals index 34b214900..b2c4df36d 100644 --- a/instrumentation/concurrent_ruby/Appraisals +++ b/instrumentation/concurrent_ruby/Appraisals @@ -1,9 +1,11 @@ # frozen_string_literal: true -appraise 'concurrent-ruby-1.1' do - gem 'concurrent-ruby', '~> 1.1.6' +%w[1.1.0 1.2.0 1.3.0].each do |version| + appraise "concurrent-ruby-#{version}" do + gem 'concurrent-ruby', "~> #{version}" + end end -appraise 'concurrent-ruby-1.0' do - gem 'concurrent-ruby', '~> 1.0.5' +appraise 'concurrent-ruby-latest' do + gem 'concurrent-ruby' end diff --git a/instrumentation/dalli/Appraisals b/instrumentation/dalli/Appraisals index 3b7d6a913..ceb31ad59 100644 --- a/instrumentation/dalli/Appraisals +++ b/instrumentation/dalli/Appraisals @@ -1,9 +1,11 @@ # frozen_string_literal: true -appraise 'dalli-2.7' do - gem 'dalli', '~> 2.7' +%w[2.7.0 3.2.0].each do |version| + appraise "dalli-#{version}" do + gem 'dalli', "~> #{version}" + end end -appraise 'dalli-3.0' do - gem 'dalli', '~> 3.0' +appraise 'dalli-latest' do + gem 'dalli' end diff --git a/instrumentation/ethon/Appraisals b/instrumentation/ethon/Appraisals index 20a318b4b..81ff88ae4 100644 --- a/instrumentation/ethon/Appraisals +++ b/instrumentation/ethon/Appraisals @@ -8,8 +8,8 @@ semconv_stability = %w[dup stable old] semconv_stability.each do |mode| - appraise "ethon-0.16.0-#{mode}" do - gem 'ethon', '~> 0.16.0' + appraise "ethon-0.18.0-#{mode}" do + gem 'ethon', '~> 0.18.0' end appraise "ethon-#{mode}" do diff --git a/instrumentation/excon/Appraisals b/instrumentation/excon/Appraisals index f365e1598..f23c850d5 100644 --- a/instrumentation/excon/Appraisals +++ b/instrumentation/excon/Appraisals @@ -7,7 +7,7 @@ # gem versions. For more information on the semantic convention modes, see: # https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/ -versions = %w[0.71 0.109] +versions = %w[1.3.1] semconv_stability = %w[dup stable old] semconv_stability.each do |mode| diff --git a/instrumentation/faraday/Appraisals b/instrumentation/faraday/Appraisals index 594dee720..c7e2ec666 100644 --- a/instrumentation/faraday/Appraisals +++ b/instrumentation/faraday/Appraisals @@ -9,7 +9,7 @@ # gem versions. For more information on the semantic convention modes, see: # https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/ -versions = %w[1.0 2.0] +versions = %w[1.10.0 2.14.0] semconv_stability = %w[old stable dup] semconv_stability.each do |mode| diff --git a/instrumentation/grape/Appraisals b/instrumentation/grape/Appraisals index 0ada7ab1e..04f807aac 100644 --- a/instrumentation/grape/Appraisals +++ b/instrumentation/grape/Appraisals @@ -4,15 +4,16 @@ # # SPDX-License-Identifier: Apache-2.0 +%w[2.0.0 2.1.0 2.2.0 2.3.0 2.4.0 3.0.0].each do |version| + appraise "grape-#{version}" do + gem 'grape', "~> #{version}" + end +end + appraise 'grape-1.x' do gem 'rack', '~> 2.0' gem 'grape', '~> 1.8' end - -appraise 'grape-2.0.x' do - gem 'grape', '~> 2.0.0' -end - appraise 'grape-latest' do gem 'grape' end diff --git a/instrumentation/grpc/Appraisals b/instrumentation/grpc/Appraisals index b4258703c..2a3b23f68 100644 --- a/instrumentation/grpc/Appraisals +++ b/instrumentation/grpc/Appraisals @@ -4,8 +4,8 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'grpc-1.68' do - gem 'grpc', '~> 1.68.0' +appraise 'grpc-1.76' do + gem 'grpc', '~> 1.76.0' end appraise 'grpc-latest' do diff --git a/instrumentation/http/Appraisals b/instrumentation/http/Appraisals index 3e908a481..d17907e2a 100644 --- a/instrumentation/http/Appraisals +++ b/instrumentation/http/Appraisals @@ -12,11 +12,7 @@ semconv_stability = %w[dup stable old] semconv_stability.each do |mode| - appraise "http-4.4.0-#{mode}" do - gem 'http', '~> 4.4.0' - end - - appraise "http-3.3.0-#{mode}" do - gem 'http', '~> 3.3.0' + appraise "http-latest-#{mode}" do + gem 'http' end end diff --git a/instrumentation/http_client/Appraisals b/instrumentation/http_client/Appraisals index 224f4cd95..b15776d50 100644 --- a/instrumentation/http_client/Appraisals +++ b/instrumentation/http_client/Appraisals @@ -15,8 +15,4 @@ semconv_stability.each do |mode| appraise "httpclient-latest-#{mode}" do gem 'httpclient' end - - appraise "httpclient-2.8-#{mode}" do - gem 'httpclient', '~> 2.8.0' - end end diff --git a/instrumentation/httpx/Appraisals b/instrumentation/httpx/Appraisals index b76f24e9c..20d78dacb 100644 --- a/instrumentation/httpx/Appraisals +++ b/instrumentation/httpx/Appraisals @@ -15,4 +15,8 @@ semconv_stability.each do |mode| appraise "httpx-1-#{mode}" do gem 'httpx', '~> 1.0' end + + appraise "httpx-latest-#{mode}" do + gem 'httpx' + end end diff --git a/instrumentation/koala/Appraisals b/instrumentation/koala/Appraisals index b22f9b684..8e42830b7 100644 --- a/instrumentation/koala/Appraisals +++ b/instrumentation/koala/Appraisals @@ -3,7 +3,7 @@ # Copyright The OpenTelemetry Authors # # SPDX-License-Identifier: Apache-2.0 -appraise 'koala-3' do - gem 'koala', '~> 3.0' - gem 'faraday', '< 2.0' +appraise 'koala-latest' do + gem 'koala' + gem 'faraday' end diff --git a/instrumentation/lmdb/Appraisals b/instrumentation/lmdb/Appraisals index 95a83b041..32ccd5367 100644 --- a/instrumentation/lmdb/Appraisals +++ b/instrumentation/lmdb/Appraisals @@ -4,10 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'lmdb-0.5' do - gem 'lmdb', '~> 0.5.0' -end - -appraise 'lmdb-0.4' do - gem 'lmdb', '~> 0.4.0' +appraise 'lmdb-latest' do + gem 'lmdb' end diff --git a/instrumentation/logger/Appraisals b/instrumentation/logger/Appraisals index 7663ffec3..7f122d09d 100644 --- a/instrumentation/logger/Appraisals +++ b/instrumentation/logger/Appraisals @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -%w[7.1.0 7.2.0 8.0.0].each do |version| +%w[7.1.0 7.2.0 8.0.0 8.1.0].each do |version| appraise "rails-#{version}" do gem 'rails', "~> #{version}" end diff --git a/instrumentation/mongo/Appraisals b/instrumentation/mongo/Appraisals index 1f2b50d35..5e38caadc 100644 --- a/instrumentation/mongo/Appraisals +++ b/instrumentation/mongo/Appraisals @@ -4,8 +4,8 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'mongo-2' do - gem 'mongo', '~> 2.13' +appraise 'mongo-latest' do + gem 'mongo' # TODO: bson 5.1.0 isn't compatible with JRuby as of 2025/06/17 gem 'bson', '< 5.1.0' if defined?(JRUBY_VERSION) diff --git a/instrumentation/mysql2/Appraisals b/instrumentation/mysql2/Appraisals index 71b5ab225..3d912d995 100644 --- a/instrumentation/mysql2/Appraisals +++ b/instrumentation/mysql2/Appraisals @@ -1,5 +1,5 @@ # frozen_string_literal: true -appraise 'mysql2-0.4.0' do +appraise 'mysql2-latest' do gem 'mysql2' end diff --git a/instrumentation/pg/Appraisals b/instrumentation/pg/Appraisals index 41840b368..a6452e170 100644 --- a/instrumentation/pg/Appraisals +++ b/instrumentation/pg/Appraisals @@ -1,11 +1,9 @@ # frozen_string_literal: true -appraise 'pg-1.3' do - gem 'pg', '~> 1.3.5' -end - -appraise 'pg-1.4' do - gem 'pg', '~> 1.4.5' +%w[1.6.0].each do |version| + appraise "pg-#{version}" do + gem 'pg', "~> #{version}" + end end appraise 'pg-latest' do diff --git a/instrumentation/que/Appraisals b/instrumentation/que/Appraisals index a3b7a215b..de61fd561 100644 --- a/instrumentation/que/Appraisals +++ b/instrumentation/que/Appraisals @@ -4,11 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'que-1.x' do - gem 'que', '~> 1.4' - gem 'activerecord', '~> 7.1.0' -end - appraise 'que-2.x' do gem 'que', '~> 2.4' gem 'activerecord', '~> 7.2.0' diff --git a/instrumentation/racecar/Appraisals b/instrumentation/racecar/Appraisals index fdef7f748..a715fd1b2 100644 --- a/instrumentation/racecar/Appraisals +++ b/instrumentation/racecar/Appraisals @@ -4,10 +4,19 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'racecar-2.7' do - gem 'racecar', '~> 2.7.0' +%w[2.8.0].each do |version| + appraise "racecar-#{version}" do + gem 'racecar', "~> #{version}" + end end -appraise 'racecar-2.8' do - gem 'racecar', '~> 2.8.2' -end +# TODO: CI failing racecar 2.11+ +# %w[2.9.0 2.10.0 2.11.0 2.12.0].each do |version| +# appraise "racecar-#{version}" do +# gem 'racecar', "~> #{version}" +# end +# end + +# appraise 'racecar-latest' do +# gem 'racecar' +# end diff --git a/instrumentation/rack/Appraisals b/instrumentation/rack/Appraisals index 7ec5ed4df..d1e11e23c 100644 --- a/instrumentation/rack/Appraisals +++ b/instrumentation/rack/Appraisals @@ -10,25 +10,16 @@ # https://opentelemetry.io/docs/specs/semconv/non-normative/http-migration/ semconv_stability = %w[stable old dup] +gem_versions = %w[2.2.0 3.0.0 3.1.0 3.2.0] semconv_stability.each do |mode| - appraise "rack-latest-#{mode}" do - gem 'rack' - end - - appraise "rack-3.0-#{mode}" do - gem 'rack', '~> 3.0.0' - end - - appraise "rack-2.2.x-#{mode}" do - gem 'rack', '~> 2.2.0' - end - - appraise "rack-2.1-#{mode}" do - gem 'rack', '~> 2.1.2' + gem_versions.each do |version| + appraise "rack-#{version}-#{mode}" do + gem 'rack', "~> #{version}" + end end - appraise "rack-2.0-#{mode}" do - gem 'rack', '~> 2.0.8' + appraise "rack-latest-#{mode}" do + gem 'rack' end end diff --git a/instrumentation/rails/Appraisals b/instrumentation/rails/Appraisals index 7663ffec3..7f122d09d 100644 --- a/instrumentation/rails/Appraisals +++ b/instrumentation/rails/Appraisals @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -%w[7.1.0 7.2.0 8.0.0].each do |version| +%w[7.1.0 7.2.0 8.0.0 8.1.0].each do |version| appraise "rails-#{version}" do gem 'rails', "~> #{version}" end diff --git a/instrumentation/rdkafka/Appraisals b/instrumentation/rdkafka/Appraisals index 812b966f1..7d112b9ff 100644 --- a/instrumentation/rdkafka/Appraisals +++ b/instrumentation/rdkafka/Appraisals @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: Apache-2.0 -%w[0.18.0 0.19.0 0.20.0 0.21.0].each do |version| +%w[0.18.0 0.24.0].each do |version| appraise "rdkafka-#{version}" do gem 'rdkafka', "~> #{version}" end diff --git a/instrumentation/redis/Appraisals b/instrumentation/redis/Appraisals index abb68fa4b..0e5a397e9 100644 --- a/instrumentation/redis/Appraisals +++ b/instrumentation/redis/Appraisals @@ -8,3 +8,7 @@ end appraise 'redis-5.x' do gem 'redis', '~> 5.0' end + +appraise 'redis-latest' do + gem 'redis' +end diff --git a/instrumentation/resque/Appraisals b/instrumentation/resque/Appraisals index 363843531..6dd300b2d 100644 --- a/instrumentation/resque/Appraisals +++ b/instrumentation/resque/Appraisals @@ -4,11 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'resque-2.0' do - gem 'resque', '~> 2.0.0' -end - -appraise 'resque-1.27' do - gem 'resque', '~> 1.27.0' - gem 'redis', '3.3.5' +appraise 'resque-latest' do + gem 'resque' end diff --git a/instrumentation/restclient/Appraisals b/instrumentation/restclient/Appraisals index 649adb4c5..847754cdc 100644 --- a/instrumentation/restclient/Appraisals +++ b/instrumentation/restclient/Appraisals @@ -8,11 +8,7 @@ semconv_stability = %w[dup stable old] semconv_stability.each do |mode| - appraise "rest-client-2.1_#{mode}" do - gem 'rest-client', '~> 2.1.0' - end - - appraise "rest-client-2.0_#{mode}" do - gem 'rest-client', '~> 2.0.0' + appraise "rest-client-latest_#{mode}" do + gem 'rest-client' end end diff --git a/instrumentation/ruby_kafka/Appraisals b/instrumentation/ruby_kafka/Appraisals index 856f68b3a..eeeb44c88 100644 --- a/instrumentation/ruby_kafka/Appraisals +++ b/instrumentation/ruby_kafka/Appraisals @@ -4,8 +4,6 @@ # # SPDX-License-Identifier: Apache-2.0 -(3..5).each do |i| - appraise "ruby-kafka-1.#{i}.x" do - gem 'ruby-kafka', "~> 1.#{i}.0" - end +appraise 'ruby-kafka-latest' do + gem 'ruby-kafka' end diff --git a/instrumentation/sidekiq/Appraisals b/instrumentation/sidekiq/Appraisals index e25192eca..adf500265 100644 --- a/instrumentation/sidekiq/Appraisals +++ b/instrumentation/sidekiq/Appraisals @@ -1,30 +1,15 @@ # frozen_string_literal: true if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.2.0') + appraise 'sidekiq-latest' do + gem 'sidekiq' + end + appraise 'sidekiq-8.0' do gem 'sidekiq', '~> 8.0' end end -appraise 'sidekiq-7.0' do - gem 'sidekiq', '~> 7.0' -end - -appraise 'sidekiq-6.5' do - gem 'sidekiq', '>= 6.5', '< 7.0' -end - -appraise 'sidekiq-6.0' do - gem 'sidekiq', '>= 6.0', '< 6.5' - gem 'redis', '< 4.8' -end - -appraise 'sidekiq-5.2' do - gem 'sidekiq', '~> 5.2' - gem 'redis', '< 4.8' -end - -appraise 'sidekiq-4.2' do - gem 'sidekiq', '~> 4.2' - gem 'redis', '< 4.8' +appraise 'sidekiq-7.3' do + gem 'sidekiq', '~> 7.3' end diff --git a/instrumentation/sinatra/Appraisals b/instrumentation/sinatra/Appraisals index 20cb43082..9e6ecfb14 100644 --- a/instrumentation/sinatra/Appraisals +++ b/instrumentation/sinatra/Appraisals @@ -9,7 +9,7 @@ # When the migration is complete, we should revert testing with different stability # modes. For more information see CHANGELOG: HTTP semantic convention stability semconv_stability = %w[dup stable old] -sinatra_versions = %w[4.1 3.0 2.1] +sinatra_versions = %w[4.2.0 4.1.0 4.0.0 3.2.0] semconv_stability.each do |mode| sinatra_versions.each do |version| diff --git a/instrumentation/trilogy/Appraisals b/instrumentation/trilogy/Appraisals index 8da0a5d7f..8e330defb 100644 --- a/instrumentation/trilogy/Appraisals +++ b/instrumentation/trilogy/Appraisals @@ -4,6 +4,10 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'trilogy-2' do - gem 'trilogy', '~> 2.3' +appraise 'trilogy-2.9' do + gem 'trilogy', '~> 2.9.0' +end + +appraise 'trilogy-latest' do + gem 'trilogy' end