Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .ci/.exclude.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ exclude:

# rails-4.2 exclusions
# Only test on ruby 2.4
- VERSION: ruby:4.0
FRAMEWORK: rails-4.2
- VERSION: ruby:3.4
FRAMEWORK: rails-4.2
- VERSION: ruby:3.1
Expand All @@ -36,6 +38,7 @@ exclude:
FRAMEWORK: rails-4.2
- VERSION: elasticobservability/jruby:9.2-8-jdk
FRAMEWORK: rails-4.2

# sinatra-1.4 exclusions
- VERSION: ruby:3.1
FRAMEWORK: sinatra-1.4
Expand Down Expand Up @@ -136,3 +139,31 @@ exclude:
FRAMEWORK: rails-5.2
- VERSION: ruby:3.1
FRAMEWORK: rails-5.1

# Only test Ruby 4 with Rails >= 7.0
- VERSION: ruby:4.0
FRAMEWORK: rails-6.1
- VERSION: ruby:4.0
FRAMEWORK: rails-5.2
- VERSION: ruby:4.0
FRAMEWORK: rails-5.1
- VERSION: ruby:4.0
FRAMEWORK: rails-4.2

# Only test Rails 8.1 with Ruby >= 3.4
- VERSION: ruby:3.1
FRAMEWORK: rails-8.1
- VERSION: ruby:2.7
FRAMEWORK: rails-8.1
- VERSION: ruby:2.6
FRAMEWORK: rails-8.1
- VERSION: ruby:2.4
FRAMEWORK: rails-8.1
- VERSION: jruby:9.2
FRAMEWORK: rails-8.1
- VERSION: elasticobservability/jruby:9.2-13-jdk
FRAMEWORK: rails-8.1
- VERSION: elasticobservability/jruby:9.2-11-jdk
FRAMEWORK: rails-8.1
- VERSION: elasticobservability/jruby:9.2-8-jdk
FRAMEWORK: rails-8.1
1 change: 1 addition & 0 deletions .ci/.framework.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FRAMEWORK:
- rails-8.1
- rails-7.2
- rails-6.1
- rails-5.2
Expand Down
1 change: 1 addition & 0 deletions .ci/.ruby.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
VERSION:
- ruby:4.0
- ruby:3.4
- ruby:3.1
- ruby:2.7
Expand Down
5 changes: 2 additions & 3 deletions docs/reference/supported-technologies.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The Elastic APM Ruby Agent has built-in support for many frameworks and librarie

## Ruby [supported-technologies-ruby]

We follow Ruby’s own maintenance policy and officially support all currently maintained versions per [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/) < 4.0.
We follow Ruby’s own maintenance policy and officially support all currently maintained versions per [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/) < 5.0.


## Web Frameworks and Libraries [supported-technologies-web]
Expand All @@ -28,7 +28,7 @@ We test against all supported minor versions of Rails, Sinatra, and Grape.

### Ruby on Rails [supported-technologies-rails]

We currently support Rails >= 4.2 <= 7.2. This follows Rails' own [Security policy](https://rubyonrails.org/security/).
We currently support Rails >= 4.2 <= 8.1. This follows Rails' own [Security policy](https://rubyonrails.org/security/).

See [Getting started with Rails](/reference/getting-started-rails.md).

Expand Down Expand Up @@ -131,4 +131,3 @@ To instrument a server, add the `ElasticAPM::GRPC::ServerInterceptor`.
```ruby
GRPC::RpcServer.new(interceptors: [ElasticAPM::GRPC::ServerInterceptor.new])
```

2 changes: 1 addition & 1 deletion elastic-apm.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://github.com/elastic/apm-agent-ruby'
spec.metadata = { 'source_code_uri' => 'https://github.com/elastic/apm-agent-ruby' }
spec.license = 'Apache-2.0'
spec.required_ruby_version = ">= 2.3.0", "< 4.0"
spec.required_ruby_version = ">= 2.3.0", "< 5.0"

spec.files = `git ls-files -z`.split("\x0").reject do |f|
f.match(%r{^(test|spec|features)/})
Expand Down
Loading