Skip to content

Commit 717f1c3

Browse files
feat!: Drop Support for EoL Rails 6.1 (#1231)
* feat!: Drop Support for EoL Rails 6.1 This change removes support for Rails 6.1, which has reached EoL. Users must pin to previous versions of gems and will no longer receive features or bug fixes for instrumentations earlier than this release Fixes #1223 * squash: add missing dependency * squash: user newer AR versions * squash: remove post install warning * squash: load logger * squash: rubocop fix
1 parent b840de9 commit 717f1c3

File tree

24 files changed

+24
-44
lines changed

24 files changed

+24
-44
lines changed

POST_INSTALL_MESSAGE

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
Ruby 3.0 has reached EoL 2024-04-23. OTel Ruby Contrib gems will no longer accept new features or bug fixes for Ruby 3.0 after 2025-01-15. Please upgrade to Ruby 3.1 or higher to continue receiving updates.
2-
3-
Rails 6.1 has reached EoL 2024-10-01. OTel Ruby Contrib gems will no longer accept new features or bug fixes for Rails 6.1 after 2025-01-15. Please upgrade to Rails 7.0 or higher to continue receiving updates.

instrumentation/action_mailer/Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

7-
%w[6.1.0 7.0.0 7.1.0].each do |version|
7+
%w[7.0.0 7.1.0].each do |version|
88
appraise "action_mailer-#{version}" do
99
gem 'rails', "~> #{version}"
1010
end

instrumentation/action_mailer/lib/opentelemetry/instrumentation/action_mailer/instrumentation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module ActionMailer
5555
# })
5656
# end
5757
class Instrumentation < OpenTelemetry::Instrumentation::Base
58-
MINIMUM_VERSION = Gem::Version.new('6.1.0')
58+
MINIMUM_VERSION = Gem::Version.new('7')
5959
EMAIL_ATTRIBUTE = %w[email.to.address email.from.address email.cc.address email.bcc.address].freeze
6060

6161
install do |_config|

instrumentation/action_pack/Appraisals

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

7-
%w[6.1.0 7.0.0 7.1.0].each do |version|
8-
appraise "rails-#{version}" do
7+
%w[7.0.0 7.1.0].each do |version|
8+
appraise "action_pack-#{version}" do
99
gem 'rails', "~> #{version}"
1010
end
1111
end
1212

1313
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
1414
%w[7.2.0].each do |version|
15-
appraise "rails-#{version}" do
15+
appraise "action_pack-#{version}" do
1616
gem 'rails', "~> #{version}"
1717
end
1818
end
1919

20-
appraise 'rails-latest' do
20+
appraise 'action_pack-latest' do
2121
gem 'rails'
2222
end
2323
end

instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/instrumentation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module ActionPack
3333
# })
3434
# end
3535
class Instrumentation < OpenTelemetry::Instrumentation::Base
36-
MINIMUM_VERSION = Gem::Version.new('6.1.0')
36+
MINIMUM_VERSION = Gem::Version.new('7')
3737

3838
install do |_config|
3939
require_railtie

instrumentation/action_view/Appraisals

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

7-
%w[6.1.0 7.0.0 7.1.0].each do |version|
7+
%w[7.0.0 7.1.0].each do |version|
88
appraise "action_view-#{version}" do
99
gem 'rails', "~> #{version}"
1010
end
1111
end
1212

1313
if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
1414
%w[7.2.0].each do |version|
15-
appraise "rails-#{version}" do
15+
appraise "action_view-#{version}" do
1616
gem 'rails', "~> #{version}"
1717
end
1818
end
1919

20-
appraise 'rails-latest' do
20+
appraise 'action_view-latest' do
2121
gem 'rails'
2222
end
2323
end

instrumentation/action_view/lib/opentelemetry/instrumentation/action_view/instrumentation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module ActionView
4444
# })
4545
# end
4646
class Instrumentation < OpenTelemetry::Instrumentation::Base
47-
MINIMUM_VERSION = Gem::Version.new('6.1.0')
47+
MINIMUM_VERSION = Gem::Version.new('7')
4848
install do |_config|
4949
require_dependencies
5050
end

instrumentation/active_job/Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66

7-
%w[6.1.0 7.0.0 7.1.0].each do |version|
7+
%w[7.0.0 7.1.0].each do |version|
88
appraise "activejob-#{version}" do
99
gem 'activejob', "~> #{version}"
1010
end

instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/instrumentation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ module Instrumentation
99
module ActiveJob
1010
# The Instrumentation class contains logic to detect and install the ActiveJob instrumentation
1111
class Instrumentation < OpenTelemetry::Instrumentation::Base
12-
MINIMUM_VERSION = Gem::Version.new('6.1.0')
12+
MINIMUM_VERSION = Gem::Version.new('7')
1313

1414
install do |_config|
1515
require_dependencies

instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
2828
spec.add_dependency 'opentelemetry-api', '~> 1.0'
2929
spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.22.1'
3030

31-
spec.add_development_dependency 'activejob', '>= 6.1'
3231
spec.add_development_dependency 'appraisal', '~> 2.5'
3332
spec.add_development_dependency 'bundler', '~> 2.4'
3433
spec.add_development_dependency 'minitest', '~> 5.0'

0 commit comments

Comments
 (0)