diff --git a/instrumentation/active_record/.github-ci.yml b/instrumentation/active_record/.github-ci.yml deleted file mode 100644 index 62a0ea00d8..0000000000 --- a/instrumentation/active_record/.github-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -env: - unsupported_interpreters: jruby diff --git a/instrumentation/active_record/Appraisals b/instrumentation/active_record/Appraisals index 8ab3b90b69..96ad7c2f00 100644 --- a/instrumentation/active_record/Appraisals +++ b/instrumentation/active_record/Appraisals @@ -4,21 +4,36 @@ # # 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].each do |version| appraise "activerecord-#{version}" do - gem 'sqlite3', '~> 1.4' + gem 'sqlite3', '~> 1.4', platform: :mri + gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby gem 'activerecord', "~> #{version}" end end -%w[8.0.0 8.1.0].each do |version| - appraise "activerecord-#{version}" do +if RUBY_ENGINE == 'ruby' + %w[8.0.0 8.1.0].each do |version| + appraise "activerecord-#{version}" do + gem 'sqlite3', '>= 2.1' + gem 'activerecord', "~> #{version}" + end + end + + appraise 'activerecord-latest' do gem 'sqlite3', '>= 2.1' - gem 'activerecord', "~> #{version}" + gem 'activerecord' end end -appraise 'activerecord-latest' do - gem 'sqlite3', '>= 2.1' - gem 'activerecord' +if RUBY_ENGINE == 'jruby' + %w[80.0.pre1].each do |version| + appraise "jruby_activerecord-#{version}" do + gem 'activerecord-jdbcsqlite3-adapter', "~> #{version}" + end + end + + appraise 'activerecord-latest' do + gem 'activerecord-jdbcsqlite3-adapter' + end end diff --git a/instrumentation/active_storage/.github-ci.yml b/instrumentation/active_storage/.github-ci.yml deleted file mode 100644 index 62a0ea00d8..0000000000 --- a/instrumentation/active_storage/.github-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -env: - unsupported_interpreters: jruby diff --git a/instrumentation/active_storage/Appraisals b/instrumentation/active_storage/Appraisals index 315edd0a14..e1b90f098e 100644 --- a/instrumentation/active_storage/Appraisals +++ b/instrumentation/active_storage/Appraisals @@ -4,24 +4,37 @@ # # 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].each do |version| appraise "activestorage-#{version}" do - gem 'sqlite3', '~> 1.4' + gem 'sqlite3', '~> 1.4', platform: :mri + gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby gem 'image_processing', '~> 1.2' gem 'rails', "~> #{version}" end end -%w[8.0.0 8.1.0].each do |version| - appraise "activestorage-#{version}" do +if RUBY_ENGINE == 'ruby' + %w[8.0.0 8.1.0].each do |version| + appraise "activestorage-#{version}" do + gem 'sqlite3', '>= 2.1' + gem 'image_processing', '~> 1.2' + gem 'rails', "~> #{version}" + end + end + + appraise 'activestorage-latest' do gem 'sqlite3', '>= 2.1' gem 'image_processing', '~> 1.2' - gem 'rails', "~> #{version}" + gem 'rails' end end -appraise 'activestorage-latest' do - gem 'sqlite3', '>= 2.1' - gem 'image_processing', '~> 1.2' - gem 'rails' +if RUBY_ENGINE == 'jruby' + %w[80.0.pre1].each do |version| + appraise "jruby_activestorage-#{version}" do + gem 'activerecord-jdbcsqlite3-adapter', '80.0.pre1' + gem 'image_processing', '~> 1.2' + gem 'rails', '~> 8.0.0' + end + end end diff --git a/instrumentation/active_storage/Gemfile b/instrumentation/active_storage/Gemfile index 2e24e5ffff..cf98e604a7 100644 --- a/instrumentation/active_storage/Gemfile +++ b/instrumentation/active_storage/Gemfile @@ -20,6 +20,7 @@ group :test do gem 'simplecov', '~> 0.22.0' gem 'webmock', '~> 3.26.0' gem 'yard', '~> 0.9.0' + gem 'rbs', '4.1.0.pre.2', platforms: :jruby gem 'opentelemetry-instrumentation-base', path: '../base' gem 'opentelemetry-instrumentation-active_support', path: '../active_support' if RUBY_VERSION >= '3.4' diff --git a/instrumentation/delayed_job/.github-ci.yml b/instrumentation/delayed_job/.github-ci.yml deleted file mode 100644 index 62a0ea00d8..0000000000 --- a/instrumentation/delayed_job/.github-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -env: - unsupported_interpreters: jruby diff --git a/instrumentation/delayed_job/Gemfile b/instrumentation/delayed_job/Gemfile index 0e9a3d4d55..19c5d1160a 100644 --- a/instrumentation/delayed_job/Gemfile +++ b/instrumentation/delayed_job/Gemfile @@ -19,7 +19,8 @@ group :test do gem 'webmock', '~> 3.26.0' gem 'yard', '~> 0.9.0' gem 'rspec-mocks', '~> 3.13.7' - gem 'sqlite3', '~> 2.9.0' + gem 'sqlite3', '~> 2.9.0', platform: :mri + gem 'jdbc-sqlite3', platform: :jruby gem 'opentelemetry-instrumentation-base', path: '../base' if RUBY_VERSION >= '3.4' gem 'base64' diff --git a/instrumentation/graphql/.github-ci.yml b/instrumentation/graphql/.github-ci.yml deleted file mode 100644 index 62a0ea00d8..0000000000 --- a/instrumentation/graphql/.github-ci.yml +++ /dev/null @@ -1,2 +0,0 @@ -env: - unsupported_interpreters: jruby diff --git a/instrumentation/graphql/Appraisals b/instrumentation/graphql/Appraisals index 52d9a9dd6e..13fb5f07a2 100644 --- a/instrumentation/graphql/Appraisals +++ b/instrumentation/graphql/Appraisals @@ -6,23 +6,25 @@ # Max compatible version of 2.0.x -(0..4).each do |minor_version| +(0..6).each do |minor_version| appraise "graphql-2.#{minor_version}.x" do gem 'graphql', "~> 2.#{minor_version}.0" end end -appraise 'graphql-c_parser-1.0.x' do - gem 'graphql', '< 2.3.1' - gem 'graphql-c_parser', '~> 1.0.0' -end +if RUBY_ENGINE == 'ruby' + appraise 'graphql-c_parser-1.0.x' do + gem 'graphql', '< 2.3.1' + gem 'graphql-c_parser', '~> 1.0.0' + end -appraise 'graphql-c_parser-1.x' do - gem 'graphql-c_parser', '~> 1.1' -end + appraise 'graphql-c_parser-1.x' do + gem 'graphql-c_parser', '~> 1.1' + end -appraise 'graphql-c_parser-latest' do - gem 'graphql-c_parser' + appraise 'graphql-c_parser-latest' do + gem 'graphql-c_parser' + end end appraise 'graphql-latest' do diff --git a/instrumentation/graphql/test/test_helper.rb b/instrumentation/graphql/test/test_helper.rb index 8ffe686339..c22dc66d25 100644 --- a/instrumentation/graphql/test/test_helper.rb +++ b/instrumentation/graphql/test/test_helper.rb @@ -7,6 +7,7 @@ require 'simplecov' require 'bundler/setup' Bundler.require(:default, :development, :test) +require 'graphql' require 'minitest/autorun' require 'webmock/minitest'