Merge branch 'main' into shared-http-attributes

.github/actions/test_gem/action.yml

@@ -66,7 +66,7 @@ runs:
     # ...but not for appraisals, sadly.
     - name: Install Ruby ${{ inputs.ruby }} with dependencies
       if: "${{ steps.setup.outputs.appraisals == 'false' }}"
-      uses: ruby/setup-ruby@v1.202.0
+      uses: ruby/setup-ruby@v1.203.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         working-directory: "${{ steps.setup.outputs.gem_dir }}"
@@ -77,7 +77,7 @@ runs:
     # If we're using appraisals, do it all manually.
     - name: Install Ruby ${{ inputs.ruby }} without dependencies
       if: "${{ steps.setup.outputs.appraisals == 'true' }}"
-      uses: ruby/setup-ruby@v1.202.0
+      uses: ruby/setup-ruby@v1.203.0
       with:
         ruby-version: "${{ inputs.ruby }}"
         bundler:  "latest"

.github/workflows/installation-tests.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v4
         # ATTENTION: Dependabot does not know how to update shared actions file.
         # If you see it update setup-ruby here also update it as part of actions/test_gem/action.yml
-      - uses: ruby/setup-ruby@v1.202.0
+      - uses: ruby/setup-ruby@v1.203.0
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}"

.github/workflows/release-hook-on-closed.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.202.0
+        uses: ruby/setup-ruby@v1.203.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

.github/workflows/release-hook-on-push.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.202.0
+        uses: ruby/setup-ruby@v1.203.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

.github/workflows/release-perform.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.202.0
+        uses: ruby/setup-ruby@v1.203.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

.github/workflows/release-please.yaml

@@ -50,7 +50,7 @@ jobs:
           chmod 0600 $HOME/.gem/credentials
           printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
 
-      - uses: ruby/setup-ruby@v1.202.0
+      - uses: ruby/setup-ruby@v1.203.0
         with:
           ruby-version: "3.0"
           bundler: latest

.github/workflows/release-request-weekly.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.202.0
+        uses: ruby/setup-ruby@v1.203.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

.github/workflows/release-request.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.202.0
+        uses: ruby/setup-ruby@v1.203.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

.github/workflows/release-retry.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Install Ruby ${{ env.ruby_version }}
-        uses: ruby/setup-ruby@v1.202.0
+        uses: ruby/setup-ruby@v1.203.0
         with:
           ruby-version: ${{ env.ruby_version }}
       - name: Checkout repo

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

instrumentation/active_model_serializers/example/rails_app.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'bundler/inline'
+
+gemfile(true) do
+  source 'https://rubygems.org'
+
+  gem 'rails'
+  gem 'active_model_serializers'
+  gem 'opentelemetry-api'
+  gem 'opentelemetry-common'
+  gem 'opentelemetry-instrumentation-active_model_serializers', path: '../'
+  gem 'opentelemetry-sdk'
+  gem 'opentelemetry-exporter-otlp'
+end
+
+ENV['OTEL_TRACES_EXPORTER'] ||= 'console'
+OpenTelemetry::SDK.configure do |c|
+  c.service_name = 'active_model_serializers_example'
+  c.use 'OpenTelemetry::Instrumentation::ActiveModelSerializers'
+end
+
+# no manual subscription trigger
+
+at_exit do
+  OpenTelemetry.tracer_provider.shutdown
+end
+
+# TraceRequestApp is a minimal Rails application inspired by the Rails
+# bug report template for Action Controller.
+# The configuration is compatible with Rails 6.0
+class TraceRequestApp < Rails::Application
+  config.root = __dir__
+  config.hosts << 'example.org'
+  credentials.secret_key_base = 'secret_key_base'
+
+  config.eager_load = false
+
+  config.logger = Logger.new($stdout)
+  Rails.logger  = config.logger
+end
+
+# Rails app initialization will pick up the instrumentation Railtie
+# and subscribe to Active Support notifications
+TraceRequestApp.initialize!
+
+ExampleAppTracer = OpenTelemetry.tracer_provider.tracer('example_app')
+
+class TestModel
+  include ActiveModel::API
+  include ActiveModel::Serialization
+
+  attr_accessor :name
+
+  def attributes
+    { 'name' => nil,
+      'screaming_name' => nil }
+  end
+
+  def screaming_name
+    ExampleAppTracer.in_span('screaming_name transform') do |span|
+      name.upcase
+    end
+  end
+end
+
+model = TestModel.new(name: 'test object')
+serialized_model = ActiveModelSerializers::SerializableResource.new(model).serializable_hash
+
+puts "\n*** The serialized object: #{serialized_model}"

instrumentation/active_model_serializers/example/standalone.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'bundler/inline'
+
+gemfile(true) do
+  source 'https://rubygems.org'
+
+  gem 'active_model_serializers'
+  gem 'opentelemetry-api'
+  gem 'opentelemetry-common'
+  gem 'opentelemetry-instrumentation-active_model_serializers', path: '../'
+  gem 'opentelemetry-sdk'
+  gem 'opentelemetry-exporter-otlp'
+end
+
+ENV['OTEL_TRACES_EXPORTER'] ||= 'console'
+OpenTelemetry::SDK.configure do |c|
+  c.service_name = 'active_model_serializers_example'
+  c.use_all
+end
+
+# without Rails and the Railtie automation, must manually trigger
+# instrumentation subscription after SDK is configured
+OpenTelemetry::Instrumentation::ActiveModelSerializers.subscribe
+
+at_exit do
+  OpenTelemetry.tracer_provider.shutdown
+end
+
+ExampleAppTracer = OpenTelemetry.tracer_provider.tracer('example_app')
+
+class TestModel
+  include ActiveModel::API
+  include ActiveModel::Serialization
+
+  attr_accessor :name
+
+  def attributes
+    { 'name' => nil,
+      'screaming_name' => nil }
+  end
+
+  def screaming_name
+    ExampleAppTracer.in_span('screaming_name transform') do |span|
+      name.upcase
+    end
+  end
+end
+
+model = TestModel.new(name: 'test object')
+serialized_model = ActiveModelSerializers::SerializableResource.new(model).serializable_hash
+
+puts "\n*** The serialized object: #{serialized_model}"