From 4f853df48ffcd537d1606e07bdede78155c45e47 Mon Sep 17 00:00:00 2001
From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com>
Date: Tue, 22 Oct 2024 20:25:27 +0000
Subject: [PATCH 1/4] release: Release 2 gems

* opentelemetry-instrumentation-action_mailer 0.2.0 (was 0.1.0)
* opentelemetry-instrumentation-active_record 0.8.0 (was 0.7.4)
---
 instrumentation/action_mailer/CHANGELOG.md                  | 4 ++++
 .../opentelemetry/instrumentation/action_mailer/version.rb  | 2 +-
 instrumentation/active_record/CHANGELOG.md                  | 6 ++++++
 .../opentelemetry/instrumentation/active_record/version.rb  | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/instrumentation/action_mailer/CHANGELOG.md b/instrumentation/action_mailer/CHANGELOG.md
index 8f0fc70b8..00f95806c 100644
--- a/instrumentation/action_mailer/CHANGELOG.md
+++ b/instrumentation/action_mailer/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-action_mailer
 
+### v0.2.0 / 2024-10-22
+
+* ADDED: Subscribe to process.action_mailer notifications
+
 ### v0.1.0 / 2024-05-13
 
 Initial release.
diff --git a/instrumentation/action_mailer/lib/opentelemetry/instrumentation/action_mailer/version.rb b/instrumentation/action_mailer/lib/opentelemetry/instrumentation/action_mailer/version.rb
index 20756b5f2..ff958a4cc 100644
--- a/instrumentation/action_mailer/lib/opentelemetry/instrumentation/action_mailer/version.rb
+++ b/instrumentation/action_mailer/lib/opentelemetry/instrumentation/action_mailer/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionMailer
-      VERSION = '0.1.0'
+      VERSION = '0.2.0'
     end
   end
 end
diff --git a/instrumentation/active_record/CHANGELOG.md b/instrumentation/active_record/CHANGELOG.md
index e78491912..3ef8d2081 100644
--- a/instrumentation/active_record/CHANGELOG.md
+++ b/instrumentation/active_record/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Release History: opentelemetry-instrumentation-active_record
 
+### v0.8.0 / 2024-10-22
+
+* BREAKING CHANGE: Activerecord find_by_sql spans on Rails 7.0+
+
+* FIXED: Activerecord find_by_sql spans on Rails 7.0+
+
 ### v0.7.4 / 2024-08-19
 
 * FIXED: Use ActiveSupport from top-level namespace (NoMethodError on_load) 
diff --git a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/version.rb b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/version.rb
index 8726c55e3..1f42c3003 100644
--- a/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/version.rb
+++ b/instrumentation/active_record/lib/opentelemetry/instrumentation/active_record/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveRecord
-      VERSION = '0.7.4'
+      VERSION = '0.8.0'
     end
   end
 end

From 298d56289cbdc04102f165e4f8d1d6653fab88d2 Mon Sep 17 00:00:00 2001
From: Kayla Reopelle <kreopelle@newrelic.com>
Date: Tue, 22 Oct 2024 15:16:09 -0700
Subject: [PATCH 2/4] chore: Update rails and all gems

* Bump the version to include the new releases for active record and
action mailer
* Update the changelog entry for active record
---
 instrumentation/active_record/CHANGELOG.md    | 32 +++++++++----------
 instrumentation/all/CHANGELOG.md              |  8 +++++
 .../instrumentation/all/version.rb            |  2 +-
 .../opentelemetry-instrumentation-all.gemspec |  2 +-
 instrumentation/rails/CHANGELOG.md            |  8 +++++
 .../instrumentation/rails/version.rb          |  2 +-
 ...pentelemetry-instrumentation-rails.gemspec |  4 +--
 7 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/instrumentation/active_record/CHANGELOG.md b/instrumentation/active_record/CHANGELOG.md
index 3ef8d2081..fb4736e01 100644
--- a/instrumentation/active_record/CHANGELOG.md
+++ b/instrumentation/active_record/CHANGELOG.md
@@ -2,13 +2,13 @@
 
 ### v0.8.0 / 2024-10-22
 
-* BREAKING CHANGE: Activerecord find_by_sql spans on Rails 7.0+
+* BREAKING CHANGE: Rename Active Record find_by_sql spans to query
 
-* FIXED: Activerecord find_by_sql spans on Rails 7.0+
+* FIXED: Emit Active Record query spans for Rails 7.0+
 
 ### v0.7.4 / 2024-08-19
 
-* FIXED: Use ActiveSupport from top-level namespace (NoMethodError on_load) 
+* FIXED: Use ActiveSupport from top-level namespace (NoMethodError on_load)
 
 ### v0.7.3 / 2024-08-15
 
@@ -38,38 +38,38 @@
 
 ### v0.6.1 / 2023-06-05
 
-* FIXED: Base config options 
+* FIXED: Base config options
 
 ### v0.6.0 / 2023-04-17
 
-* BREAKING CHANGE: Drop support for EoL Ruby 2.7 
+* BREAKING CHANGE: Drop support for EoL Ruby 2.7
 
-* ADDED: Drop support for EoL Ruby 2.7 
+* ADDED: Drop support for EoL Ruby 2.7
 
 ### v0.5.0 / 2023-02-01
 
-* BREAKING CHANGE: Drop Rails 5 Support 
+* BREAKING CHANGE: Drop Rails 5 Support
 
-* ADDED: Drop Rails 5 Support 
+* ADDED: Drop Rails 5 Support
 
 ### v0.4.1 / 2023-01-14
 
-* DOCS: Fix gem homepage 
-* DOCS: More gem documentation fixes 
+* DOCS: Fix gem homepage
+* DOCS: More gem documentation fixes
 
 ### v0.4.0 / 2022-06-09
 
 * Upgrading Base dependency version
-* FIXED: Broken test file requirements 
+* FIXED: Broken test file requirements
 
 ### v0.3.0 / 2022-05-02
 
-* ADDED: Make ActiveRecord 7 compatible 
-* FIXED: RubyGems Fallback 
+* ADDED: Make ActiveRecord 7 compatible
+* FIXED: RubyGems Fallback
 
 ### v0.2.2 / 2021-12-01
 
-* FIXED: Add max supported version for active record 
+* FIXED: Add max supported version for active record
 
 ### v0.2.1 / 2021-09-29
 
@@ -77,8 +77,8 @@
 
 ### v0.2.0 / 2021-09-29
 
-* ADDED: Trace update_all and delete_all calls in ActiveRecord 
-* FIXED: Remove Active Record instantiation patch 
+* ADDED: Trace update_all and delete_all calls in ActiveRecord
+* FIXED: Remove Active Record instantiation patch
 
 ### v0.1.1 / 2021-08-12
 
diff --git a/instrumentation/all/CHANGELOG.md b/instrumentation/all/CHANGELOG.md
index 459ab7e2b..859591858 100644
--- a/instrumentation/all/CHANGELOG.md
+++ b/instrumentation/all/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-all
 
+### v0.67.0 / 2024-10-22
+
+* BREAKING CHANGE: Rename Active Record find_by_sql spans to query
+
+* FIXED: Emit Active Record query spans for Rails 7.0+
+
+* ADDED: Subscribe to process.action_mailer notifications
+
 ### v0.66.0 / 2024-10-08
 
 * ADDED: Integration with V3 telemetry provider for the aws-sdk
diff --git a/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb b/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb
index c05a4c33d..83c44deeb 100644
--- a/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb
+++ b/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module All
-      VERSION = '0.66.0'
+      VERSION = '0.67.0'
     end
   end
 end
diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
index bccb40e24..20bd4f537 100644
--- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec
+++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec
@@ -50,7 +50,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.8.0'
   spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.3.0'
   spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.24.0'
-  spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.31.0'
+  spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.32.0'
   spec.add_dependency 'opentelemetry-instrumentation-rake', '~> 0.2.1'
   spec.add_dependency 'opentelemetry-instrumentation-rdkafka', '~> 0.4.0'
   spec.add_dependency 'opentelemetry-instrumentation-redis', '~> 0.25.1'
diff --git a/instrumentation/rails/CHANGELOG.md b/instrumentation/rails/CHANGELOG.md
index f3a462ef8..01c318c61 100644
--- a/instrumentation/rails/CHANGELOG.md
+++ b/instrumentation/rails/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Release History: opentelemetry-instrumentation-rails
 
+### v0.32.0 / 2024-10-22
+
+* BREAKING CHANGE: Rename Active Record find_by_sql spans to query
+
+* FIXED: Emit Active Record query spans for Rails 7.0+
+
+* ADDED: Subscribe to process.action_mailer notifications
+
 ### v0.31.2 / 2024-08-15
 
 * FIXED: Rails instrumentation should load ActiveJob instrumentation
diff --git a/instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb b/instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb
index 490c785c4..f5ddd41cb 100644
--- a/instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb
+++ b/instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rails
-      VERSION = '0.31.2'
+      VERSION = '0.32.0'
     end
   end
 end
diff --git a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
index 3cd4e629d..914edc9ab 100644
--- a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
+++ b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec
@@ -26,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 3.0'
 
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
-  spec.add_dependency 'opentelemetry-instrumentation-action_mailer', '~> 0.1.0'
+  spec.add_dependency 'opentelemetry-instrumentation-action_mailer', '~> 0.2.0'
   spec.add_dependency 'opentelemetry-instrumentation-action_pack', '~> 0.9.0'
   spec.add_dependency 'opentelemetry-instrumentation-action_view', '~> 0.7.0'
   spec.add_dependency 'opentelemetry-instrumentation-active_job', '~> 0.7.0'
-  spec.add_dependency 'opentelemetry-instrumentation-active_record', '~> 0.7.0'
+  spec.add_dependency 'opentelemetry-instrumentation-active_record', '~> 0.8.0'
   spec.add_dependency 'opentelemetry-instrumentation-active_support', '~> 0.6.0'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> 0.22.1'
 

From 3dbf0e6baf6b750489bc72ff6af056b04a4d5b25 Mon Sep 17 00:00:00 2001
From: Kayla Reopelle <kreopelle@newrelic.com>
Date: Tue, 22 Oct 2024 15:47:54 -0700
Subject: [PATCH 3/4] chore: Add action mailer to Gemfile, alphabetize

---
 instrumentation/rails/Gemfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/instrumentation/rails/Gemfile b/instrumentation/rails/Gemfile
index 198c4eff8..2c08ce501 100644
--- a/instrumentation/rails/Gemfile
+++ b/instrumentation/rails/Gemfile
@@ -11,10 +11,11 @@ gemspec
 group :test, :development do
   gem 'pry-byebug'
   gem 'opentelemetry-instrumentation-base', path: '../base'
-  gem 'opentelemetry-instrumentation-action_pack', path: '../action_pack'
-  gem 'opentelemetry-instrumentation-action_view', path: '../action_view'
   gem 'opentelemetry-instrumentation-active_job', path: '../active_job'
+  gem 'opentelemetry-instrumentation-action_mailer', path: '../action_mailer'
+  gem 'opentelemetry-instrumentation-action_pack', path: '../action_pack'
   gem 'opentelemetry-instrumentation-active_record', path: '../active_record'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
+  gem 'opentelemetry-instrumentation-action_view', path: '../action_view'
   gem 'opentelemetry-instrumentation-rack', path: '../rack'
 end

From b4dbdc75eac281a1a95ad11dd957dbfa0eabcaa7 Mon Sep 17 00:00:00 2001
From: Kayla Reopelle <kreopelle@newrelic.com>
Date: Tue, 22 Oct 2024 16:09:41 -0700
Subject: [PATCH 4/4] chore: Remove newlines between bullets

---
 instrumentation/active_record/CHANGELOG.md | 1 -
 instrumentation/all/CHANGELOG.md           | 2 --
 instrumentation/rails/CHANGELOG.md         | 2 --
 3 files changed, 5 deletions(-)

diff --git a/instrumentation/active_record/CHANGELOG.md b/instrumentation/active_record/CHANGELOG.md
index fb4736e01..1d9746ce9 100644
--- a/instrumentation/active_record/CHANGELOG.md
+++ b/instrumentation/active_record/CHANGELOG.md
@@ -3,7 +3,6 @@
 ### v0.8.0 / 2024-10-22
 
 * BREAKING CHANGE: Rename Active Record find_by_sql spans to query
-
 * FIXED: Emit Active Record query spans for Rails 7.0+
 
 ### v0.7.4 / 2024-08-19
diff --git a/instrumentation/all/CHANGELOG.md b/instrumentation/all/CHANGELOG.md
index 859591858..2864061ee 100644
--- a/instrumentation/all/CHANGELOG.md
+++ b/instrumentation/all/CHANGELOG.md
@@ -3,9 +3,7 @@
 ### v0.67.0 / 2024-10-22
 
 * BREAKING CHANGE: Rename Active Record find_by_sql spans to query
-
 * FIXED: Emit Active Record query spans for Rails 7.0+
-
 * ADDED: Subscribe to process.action_mailer notifications
 
 ### v0.66.0 / 2024-10-08
diff --git a/instrumentation/rails/CHANGELOG.md b/instrumentation/rails/CHANGELOG.md
index 01c318c61..2ff3b0533 100644
--- a/instrumentation/rails/CHANGELOG.md
+++ b/instrumentation/rails/CHANGELOG.md
@@ -3,9 +3,7 @@
 ### v0.32.0 / 2024-10-22
 
 * BREAKING CHANGE: Rename Active Record find_by_sql spans to query
-
 * FIXED: Emit Active Record query spans for Rails 7.0+
-
 * ADDED: Subscribe to process.action_mailer notifications
 
 ### v0.31.2 / 2024-08-15