Merge branch 'main' into logger-instrumentation

Author: kaylareopelle

POST_INSTALL_MESSAGE

@@ -0,0 +1,3 @@
+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.
+
+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.

helpers/mysql/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-helpers-mysql
 
+### v0.1.2 / 2024-11-26
+
+* (No significant changes)
+
 ### v0.1.1 / 2024-06-18
 
 * FIXED: Relax otel common gem constraints

helpers/mysql/lib/opentelemetry/helpers/mysql/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module MySQL
-      VERSION = '0.1.1'
+      VERSION = '0.1.2'
     end
   end
 end

helpers/mysql/opentelemetry-helpers-mysql.gemspec

@@ -44,4 +44,6 @@ Gem::Specification.new do |spec|
     spec.metadata['bug_tracker_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues'
     spec.metadata['documentation_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}"
   end
+
+  spec.post_install_message = File.read(File.expand_path('../../POST_INSTALL_MESSAGE', __dir__))
 end

helpers/sql-obfuscation/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-helpers-sql-obfuscation
 
+### v0.2.1 / 2024-11-26
+
+* (No significant changes)
+
 ### v0.2.0 / 2024-09-12
 
 - BREAKING CHANGE: Return message when sql is over the obfuscation limit. Fixes a bug where sql statements with prepended comments that hit the obfuscation limit would be sent raw.

helpers/sql-obfuscation/lib/opentelemetry/helpers/sql_obfuscation/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Helpers
     module SqlObfuscation
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
     end
   end
 end

helpers/sql-obfuscation/opentelemetry-helpers-sql-obfuscation.gemspec

@@ -42,4 +42,6 @@ Gem::Specification.new do |spec|
     spec.metadata['bug_tracker_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues'
     spec.metadata['documentation_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}"
   end
+
+  spec.post_install_message = File.read(File.expand_path('../../POST_INSTALL_MESSAGE', __dir__))
 end

instrumentation/action_mailer/Gemfile

@@ -11,4 +11,7 @@ gemspec
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'opentelemetry-instrumentation-active_support', path: '../active_support'
+  # Add jar-dependencies gem only if the Ruby runtime is JRuby
+  # https://github.com/jruby/jruby/issues/7262
+  gem 'jar-dependencies', '0.4.1', platforms: :jruby
 end

instrumentation/active_model_serializers/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-active_model_serializers
 
+### v0.20.3 / 2024-12-04
+
+* FIXED: Use ActiveSupport::Notifications subscriber to serialize events.
+
 ### v0.20.2 / 2024-07-23
 
 * DOCS: Add cspell to CI