From ee8696e9b27f84a98acd48fcc6c406e1e431d3d2 Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Thu, 29 May 2025 11:34:22 +0530 Subject: [PATCH 1/6] ci: start ruby 3.5 preview testing Signed-off-by: Arjun Rajappa --- .circleci/config.yml | 23 +++++++++++++---------- instana.gemspec | 2 ++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9d49e628..be38dee2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -265,10 +265,11 @@ workflows: - "3.2" - "3.3" - "3.4" + - "3.5" libraries_ruby_31_32: jobs: - test_apprisal: - name: "test_apprisal-ruby-<>-<>-<>" + name: "test_apprisal-<>-ruby-<>-<>" matrix: parameters: stack: @@ -277,10 +278,10 @@ workflows: ruby_version: - "3.1" - "3.2" - libraries_ruby_33_34: + libraries_ruby_33_35: jobs: - test_apprisal: - name: "test_apprisal-ruby-<>-<>-<>" + name: "test_apprisal-<>-ruby-<>-<>" matrix: parameters: stack: @@ -289,6 +290,7 @@ workflows: ruby_version: - "3.3" - "3.4" + - "3.5" # Currently compiling the native extensions for `grpc` # exceeds an internal RAM and/or CPU limit of CircleCI executor, # and the job gets terminated with: @@ -299,10 +301,10 @@ workflows: exclude: - stack: base gemfile: "./gemfiles/grpc_10.gemfile" - rails_ruby_31_34: + rails_ruby_31_35: jobs: - test_apprisal: - name: "test_apprisal-rails-ruby-<>-<>-<>" + name: "test_apprisal-rails-<>-ruby-<>-<>" matrix: parameters: stack: @@ -317,11 +319,12 @@ workflows: - "3.1" - "3.2" - "3.3" - - "3.4" - rails8_ruby_33_34: + - "3.4" + - "3.5" + rails8_ruby_33_35: jobs: - test_apprisal: - name: "test_apprisal-rails-8-ruby-<>-<>-<>" + name: "test_apprisal-rails-8-<>-ruby-<>-<>" matrix: parameters: stack: @@ -337,7 +340,7 @@ workflows: sequel: jobs: - test_apprisal: - name: "test_apprisal-rails-8-ruby-<>-<>-<>" + name: "test_apprisal-sequel-<>-ruby-<>-<>" matrix: parameters: stack: @@ -351,7 +354,7 @@ workflows: - "3.1" - "3.2" - "3.3" - - "3.4" + - "3.5" report_coverage: jobs: - report_coverage diff --git a/instana.gemspec b/instana.gemspec index 73774fe9..d24626f1 100644 --- a/instana.gemspec +++ b/instana.gemspec @@ -39,8 +39,10 @@ Gem::Specification.new do |spec| spec.add_development_dependency "minitest", "~> 5.20" spec.add_development_dependency "appraisal" spec.add_development_dependency "fakefs" + spec.add_development_dependency "irb" spec.add_runtime_dependency('base64', '>= 0.1') + spec.add_runtime_dependency('logger') spec.add_runtime_dependency('concurrent-ruby', '>= 1.1') spec.add_runtime_dependency('csv', '>= 0.1') spec.add_runtime_dependency('sys-proctable', '>= 1.2.2') From c7c62063840912b16b256b93403035248c9ab4f0 Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Thu, 29 May 2025 11:38:00 +0530 Subject: [PATCH 2/6] ci: start ruby 3.5 preview testing Signed-off-by: Arjun Rajappa --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index be38dee2..670f6416 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -265,7 +265,7 @@ workflows: - "3.2" - "3.3" - "3.4" - - "3.5" + - "3.5-preview1" libraries_ruby_31_32: jobs: - test_apprisal: @@ -290,7 +290,7 @@ workflows: ruby_version: - "3.3" - "3.4" - - "3.5" + - "3.5-preview1" # Currently compiling the native extensions for `grpc` # exceeds an internal RAM and/or CPU limit of CircleCI executor, # and the job gets terminated with: @@ -320,7 +320,7 @@ workflows: - "3.2" - "3.3" - "3.4" - - "3.5" + - "3.5-preview1" rails8_ruby_33_35: jobs: - test_apprisal: @@ -354,7 +354,7 @@ workflows: - "3.1" - "3.2" - "3.3" - - "3.5" + - "3.5-preview1" report_coverage: jobs: - report_coverage From 273da1b19fcd135d04b701c78a8aa224e141de57 Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Thu, 29 May 2025 11:39:55 +0530 Subject: [PATCH 3/6] ci: start ruby 3.5 preview testing Signed-off-by: Arjun Rajappa --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 670f6416..09d3fca5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -265,7 +265,7 @@ workflows: - "3.2" - "3.3" - "3.4" - - "3.5-preview1" + - "3.5.0-preview1" libraries_ruby_31_32: jobs: - test_apprisal: @@ -290,7 +290,7 @@ workflows: ruby_version: - "3.3" - "3.4" - - "3.5-preview1" + - "3.5.0-preview1" # Currently compiling the native extensions for `grpc` # exceeds an internal RAM and/or CPU limit of CircleCI executor, # and the job gets terminated with: @@ -320,7 +320,7 @@ workflows: - "3.2" - "3.3" - "3.4" - - "3.5-preview1" + - "3.5.0-preview1" rails8_ruby_33_35: jobs: - test_apprisal: @@ -354,7 +354,7 @@ workflows: - "3.1" - "3.2" - "3.3" - - "3.5-preview1" + - "3.5.0-preview1" report_coverage: jobs: - report_coverage From 08eb9b23751d24d51ddaa2439f70633e8a22858a Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Thu, 5 Jun 2025 11:23:29 +0530 Subject: [PATCH 4/6] chore: add benchmark gem as dependency as from ruby 3.5 it will not be included in default libraries Signed-off-by: Arjun Rajappa --- instana.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/instana.gemspec b/instana.gemspec index d24626f1..482ffd1e 100644 --- a/instana.gemspec +++ b/instana.gemspec @@ -40,6 +40,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "appraisal" spec.add_development_dependency "fakefs" spec.add_development_dependency "irb" + spec.add_development_dependency "benchmark" spec.add_runtime_dependency('base64', '>= 0.1') spec.add_runtime_dependency('logger') From e9e34762b4508878faa4f55dcd75e318b8dee1ed Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Thu, 5 Jun 2025 12:59:56 +0530 Subject: [PATCH 5/6] ci: remove testing of grpc on ruby 3.5 Signed-off-by: Arjun Rajappa --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 09d3fca5..3c089974 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -299,7 +299,7 @@ workflows: # TODO: Remove this exclusion as soon as pre-built binaries are available # on https://rubygems.org/gems/grpc/versions exclude: - - stack: base + - ruby_version: "3.5.0-preview1" gemfile: "./gemfiles/grpc_10.gemfile" rails_ruby_31_35: jobs: From 29067392e41dad96258cbf7ed60077b73e72cbe0 Mon Sep 17 00:00:00 2001 From: Arjun Rajappa Date: Thu, 5 Jun 2025 13:21:14 +0530 Subject: [PATCH 6/6] ci: remove testing of grpc on ruby 3.5 Signed-off-by: Arjun Rajappa --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c089974..cea9eb79 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -299,7 +299,8 @@ workflows: # TODO: Remove this exclusion as soon as pre-built binaries are available # on https://rubygems.org/gems/grpc/versions exclude: - - ruby_version: "3.5.0-preview1" + - stack: base + ruby_version: "3.5.0-preview1" gemfile: "./gemfiles/grpc_10.gemfile" rails_ruby_31_35: jobs: