Skip to content

chore: start testing on ruby 4.0 release #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arjun-rajappa merged 3 commits into from
Jan 12, 2026
+15 −14
Merged

chore: start testing on ruby 4.0 release #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38aa6cd
chore: start testing on ruby 4.0 release
arjun-rajappa Jan 6, 2026
99c11d7
test: fix failing tests and lint
arjun-rajappa Jan 6, 2026
d330943
chore: refactor ternary statement to use min function
arjun-rajappa Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ workflows:
- "3.2"
- "3.3"
- "3.4"
- "3.5.0-preview1"
- "4.0"
libraries_ruby_31_32:
jobs:
- test_apprisal:
Expand All @@ -304,7 +304,7 @@ workflows:
ruby_version:
- "3.3"
- "3.4"
- "3.5.0-preview1"
- "4.0"
# Currently compiling the native extensions for `grpc`
# exceeds an internal RAM and/or CPU limit of CircleCI executor,
# and the job gets terminated with:
Expand All @@ -314,7 +314,7 @@ workflows:
# on https://rubygems.org/gems/grpc/versions
exclude:
- stack: base
ruby_version: "3.5.0-preview1"
ruby_version: "4.0"
gemfile: "./gemfiles/grpc_10.gemfile"
rails_ruby_31_35:
jobs:
Expand All @@ -335,7 +335,7 @@ workflows:
- "3.2"
- "3.3"
- "3.4"
- "3.5.0-preview1"
- "4.0"
rails8_ruby_33_35:
jobs:
- test_apprisal:
Expand Down Expand Up @@ -369,7 +369,7 @@ workflows:
- "3.1"
- "3.2"
- "3.3"
- "3.5.0-preview1"
- "4.0"
report_coverage:
jobs:
- report_coverage
1 change: 1 addition & 0 deletions instana.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency('sys-proctable', '>= 1.2.2')
spec.add_runtime_dependency('opentelemetry-api', '~> 1.4')
spec.add_runtime_dependency('opentelemetry-common')
spec.add_runtime_dependency('cgi')
spec.add_runtime_dependency('oj', '>=3.0.11') unless RUBY_PLATFORM =~ /java/i
end
16 changes: 8 additions & 8 deletions lib/instana/trace/span.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,14 @@ def add_stack(limit: 30, stack: Kernel.caller)

@attributes[:stack] = stack
.map do |call|
file, line, *method = call.split(':')

{
c: file,
n: line,
m: method.join(' ')
}
end.take(limit > 40 ? 40 : limit)
file, line, *method = call.split(':')

{
c: file,
n: line,
m: method.join(' ')
}
end.take([limit, 40].min)
end

# Log an error into the span
Expand Down
2 changes: 1 addition & 1 deletion test/instrumentation/rest_client_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class RestClientTest < Minitest::Test
def setup
# See https://github.com/rest-client/rest-client/issues/612
OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers] = OpenSSL::SSL::SSLContext.new.ciphers
OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ciphers] = OpenSSL::SSL::SSLContext.new.ciphers if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('4.0')
end

def teardown
Expand Down
Loading