drop jruby 9.2, add ruby 3.3

DataDog · Aug 18, 2023 · 07f1038 · 07f1038
1 parent ccdd0c4
commit 07f1038
Show file tree

Hide file tree

Showing 22 changed files with 455 additions and 209 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -367,15 +367,15 @@ job_configuration:
     ruby_version: 'ruby-3.2.0'
     image: ghcr.io/datadog/dd-trace-rb/ruby:3.2.0-dd
     resource_class_to_use: medium+
+  - &config-3_3
+    <<: *filters_all_branches_and_tags
+    ruby_version: 'ruby-3.3.0'
+    image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
+    resource_class_to_use: medium+
   - &config-3_2-small
     <<: *config-3_2
     resource_class_to_use: small
     # ADD NEW RUBIES HERE
-  - &config-jruby-9_2 # More recent release of 9.2
-    <<: *filters_all_branches_and_tags
-    ruby_version: 'jruby-9.2.21.0'
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.2.21.0-dd
-    resource_class_to_use: medium+
   - &config-jruby-9_3
     <<: *filters_all_branches_and_tags
     ruby_version: 'jruby-9.3.9.0'
@@ -399,8 +399,8 @@ workflows:
       #       - test-3.0
       #       - test-3.1
       #       - test-3.2
+      #       - test-3.3
       #       # ADD NEW RUBIES HERE
-      #       - test-jruby-9.2
       #       - test-jruby-9.3
       # - orb/changelog:
       #     <<: *config-3_2-small
@@ -444,15 +444,15 @@ workflows:
           name: test-3.2
           requires:
             - build-3.2
-      # ADD NEW RUBIES HERE
       - orb/build:
-          <<: *config-jruby-9_2
-          name: build-jruby-9.2
+          <<: *config-3_3
+          name: build-3.3
       - orb/test:
-          <<: *config-jruby-9_2
-          name: test-jruby-9.2
+          <<: *config-3_3
+          name: test-3.3
           requires:
-            - build-jruby-9.2
+            - build-3.3
+      # ADD NEW RUBIES HERE
       - orb/build:
           <<: *config-jruby-9_3
           name: build-jruby-9.3
@@ -470,8 +470,8 @@ workflows:
       #       - test-3.0
       #       - test-3.1
       #       - test-3.2
+      #       - test-3.3
       #       # ADD NEW RUBIES HERE
-      #       - test-jruby-9.2
       #       - test-jruby-9.3
       # - "deploy release":
       #     <<: *filters_only_release_tags
@@ -481,6 +481,6 @@ workflows:
       #       - test-3.0
       #       - test-3.1
       #       - test-3.2
+      #       - test-3.3
       #       # ADD NEW RUBIES HERE
-      #       - test-jruby-9.2
       #       - test-jruby-9.3
diff --git a/Appraisals b/Appraisals
@@ -91,23 +91,9 @@ def self.with_minitest_gem(versions: 5)
   end
 end
 
-if ruby_version?("2.7")
-  with_minitest_gem
-  with_rspec_gem
-  with_cucumber_gem(versions: 3..7)
-elsif ruby_version?("3.0")
-  with_minitest_gem
-  with_rspec_gem
-  with_cucumber_gem(versions: 3..7)
-elsif ruby_version?("3.1")
-  with_minitest_gem
-  with_rspec_gem
-  with_cucumber_gem(versions: 3..7)
-elsif ruby_version?("3.2")
-  with_minitest_gem
-  with_rspec_gem
-  with_cucumber_gem(versions: 3..7)
-end
+with_minitest_gem
+with_rspec_gem
+with_cucumber_gem(versions: 3..7)
 
 ruby_runtime = "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
 

diff --git a/Gemfile-jruby-9.2 → Gemfile-3.3 b/Gemfile-jruby-9.2 → Gemfile-3.3
diff --git a/Rakefile b/Rakefile
@@ -79,19 +79,19 @@ end
 
 desc "CI task; it runs all tests for current version of Ruby"
 task :ci do
-  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec rake spec:main"
+  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec rake spec:main"
 
   # RSpec
-  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec appraisal rspec-3 rake spec:rspec"
+  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec appraisal rspec-3 rake spec:rspec"
 
   # Cucumber
-  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec appraisal cucumber-3 rake spec:cucumber"
-  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec appraisal cucumber-4 rake spec:cucumber"
-  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec appraisal cucumber-5 rake spec:cucumber"
-  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec appraisal cucumber-6 rake spec:cucumber"
-  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec appraisal cucumber-7 rake spec:cucumber"
-  # declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec appraisal cucumber-8 rake spec:cucumber"
+  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec appraisal cucumber-3 rake spec:cucumber"
+  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec appraisal cucumber-4 rake spec:cucumber"
+  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec appraisal cucumber-5 rake spec:cucumber"
+  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec appraisal cucumber-6 rake spec:cucumber"
+  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec appraisal cucumber-7 rake spec:cucumber"
+  # declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec appraisal cucumber-8 rake spec:cucumber"
 
   # Minitest
-  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ jruby" => "bundle exec appraisal minitest-5 rake spec:minitest"
+  declare "✅ 2.7 / ✅ 3.0 / ✅ 3.1 / ✅ 3.2 / ✅ 3.3 / ✅ jruby" => "bundle exec appraisal minitest-5 rake spec:minitest"
 end
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -67,22 +67,23 @@ services:
       - extension-build-tmp:/app/tmp
       - bundle-3.2:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
-  # ADD NEW RUBIES HERE
-  datadog-ci-jruby-9.2:
-    image: ghcr.io/datadog/dd-trace-rb/jruby:9.2.21.0-dd
+  datadog-ci-3.3:
+    image: ghcr.io/datadog/dd-trace-rb/ruby:3.3.0-dd
     command: /bin/bash
     depends_on:
       - ddagent
     env_file: ./.env
     environment:
-      <<: *common-environment
-      BUNDLE_GEMFILE: /app/Gemfile-jruby-9.2
+      <<: *common-environment-3x
+      BUNDLE_GEMFILE: /app/Gemfile-3.3
     stdin_open: true
     tty: true
     volumes:
       - .:/app
-      - bundle-jruby-9.2:/usr/local/bundle
+      - extension-build-tmp:/app/tmp
+      - bundle-3.3:/usr/local/bundle
       - "ddagent_var_run:${TEST_DDAGENT_VAR_RUN}"
+  # ADD NEW RUBIES HERE
   datadog-ci-jruby-9.3:
     image: ghcr.io/datadog/dd-trace-rb/jruby:9.3.9.0-dd
     command: /bin/bash
@@ -140,6 +141,7 @@ volumes:
   bundle-3.0:
   bundle-3.1:
   bundle-3.2:
+  bundle-3.3:
   # ADD NEW RUBIES HERE
   bundle-jruby-9.2:
   bundle-jruby-9.3:

diff --git a/gemfiles/jruby_9.3.9.0_minitest_5.gemfile b/gemfiles/jruby_9.3.9.0_minitest_5.gemfile
@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "os"
+gem "climate_control"
+gem "rspec-collection_matchers"
+gem "rspec_junit_formatter"
+gem "appraisal"
+gem "standard", "<= 1.24.3"
+gem "yard"
+gem "webrick"
+gem "minitest", "~> 5"
+
+group :check do
+
+end
+
+gemspec path: "../"
diff --git a/gemfiles/jruby_9.2.21.0_rspec_3.gemfile.lock → ...les/jruby_9.3.9.0_minitest_5.gemfile.lock b/gemfiles/jruby_9.2.21.0_rspec_3.gemfile.lock → ...les/jruby_9.3.9.0_minitest_5.gemfile.lock
@@ -22,10 +22,13 @@ GEM
     debase-ruby_core_source (3.2.1)
     diff-lcs (1.5.0)
     ffi (1.15.5-java)
+    json (2.6.3-java)
+    language_server-protocol (3.17.0.3)
     libdatadog (3.0.0.1.0)
     libddwaf (1.9.0.0.1-java)
       ffi (~> 1.0)
     method_source (1.0.0)
+    minitest (5.19.0)
     msgpack (1.7.2-java)
     os (1.1.4)
     parallel (1.23.0)
@@ -58,42 +61,45 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.25.0)
+    rubocop (1.44.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.13.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
     spoon (0.0.6)
       ffi
-    standard (1.7.0)
-      rubocop (= 1.25.0)
-      rubocop-performance (= 1.13.2)
+    standard (1.24.3)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (= 1.44.1)
+      rubocop-performance (= 1.15.2)
     thor (1.2.2)
     unicode-display_width (2.4.2)
     webrick (1.8.1)
     yard (0.9.34)
 
 PLATFORMS
-  universal-java-1.8
+  universal-java-11
 
 DEPENDENCIES
   appraisal
   climate_control
   datadog-ci!
+  minitest (~> 5)
   os
   pry
   rake
-  rspec (~> 3)
+  rspec
   rspec-collection_matchers
   rspec_junit_formatter
   standard (<= 1.24.3)

diff --git a/gemfiles/jruby_9.2.21.0_cucumber_3.gemfile → gemfiles/ruby_3.3.0_cucumber_3.gemfile b/gemfiles/jruby_9.2.21.0_cucumber_3.gemfile → gemfiles/ruby_3.3.0_cucumber_3.gemfile
diff --git a/...es/jruby_9.2.21.0_cucumber_3.gemfile.lock → gemfiles/ruby_3.3.0_cucumber_3.gemfile.lock b/...es/jruby_9.2.21.0_cucumber_3.gemfile.lock → gemfiles/ruby_3.3.0_cucumber_3.gemfile.lock
@@ -39,25 +39,26 @@ GEM
       msgpack
     debase-ruby_core_source (3.2.1)
     diff-lcs (1.5.0)
-    ffi (1.15.5-java)
+    ffi (1.15.5)
     gherkin (5.1.0)
-    libdatadog (3.0.0.1.0)
-    libddwaf (1.9.0.0.1-java)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    libdatadog (3.0.0.1.0-aarch64-linux)
+    libddwaf (1.9.0.0.1-aarch64-linux)
       ffi (~> 1.0)
     method_source (1.0.0)
-    msgpack (1.7.2-java)
+    msgpack (1.7.2)
     multi_json (1.15.0)
     multi_test (1.1.0)
     os (1.1.4)
     parallel (1.23.0)
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2-java)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-      spoon (~> 0.0)
-    racc (1.7.1-java)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.8.1)
@@ -79,33 +80,33 @@ GEM
     rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.25.0)
+    rubocop (1.44.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.13.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.15.2)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.13.0)
-    spoon (0.0.6)
-      ffi
-    standard (1.7.0)
-      rubocop (= 1.25.0)
-      rubocop-performance (= 1.13.2)
+    standard (1.24.3)
+      language_server-protocol (~> 3.17.0.2)
+      rubocop (= 1.44.1)
+      rubocop-performance (= 1.15.2)
     thor (1.2.2)
     unicode-display_width (2.4.2)
     webrick (1.8.1)
     yard (0.9.34)
 
 PLATFORMS
-  universal-java-1.8
+  aarch64-linux
 
 DEPENDENCIES
   appraisal
@@ -123,4 +124,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.26
+   2.4.19
diff --git a/gemfiles/jruby_9.2.21.0_cucumber_4.gemfile → gemfiles/ruby_3.3.0_cucumber_4.gemfile b/gemfiles/jruby_9.2.21.0_cucumber_4.gemfile → gemfiles/ruby_3.3.0_cucumber_4.gemfile