Merge branch 'main' into dependabot/github_actions/DavidAnson/markdownlint-cli2-action-18

Author: arielvalentin

.github/actions/test_gem/action.yml

@@ -95,6 +95,7 @@ runs:
       run: |
         # 💎 Install dependencies and generate appraisals 💎
         bundle install --quiet --jobs=3 --retry=4
+        bundle exec appraisal clean
         bundle exec appraisal generate
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
 

.gitignore

@@ -12,6 +12,7 @@
 
 # Appraisals
 instrumentation/**/gemfiles
+instrumentation/**/tmp/**/*
 
 # Sqlite file for tests
 instrumentation/active_record/db
@@ -26,3 +27,4 @@ instrumentation/active_record/db
 .ruby-version
 
 tags
+!**/*/.gitkeep

Gemfile

@@ -8,4 +8,4 @@ source 'https://rubygems.org'
 
 gem 'rake', '~> 13.0'
 gem 'rubocop', '~> 1.68.0'
-gem 'rubocop-performance', '~> 1.21.0'
+gem 'rubocop-performance', '~> 1.23.0'

helpers/mysql/opentelemetry-helpers-mysql.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.68.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.22.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'

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

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.68.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.22.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
 

instrumentation/action_mailer/Appraisals

@@ -4,20 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'rails-6.1' do
-  gem 'rails', '~> 6.1.0'
-end
-
-appraise 'rails-7.0' do
-  gem 'rails', '~> 7.0.0'
-end
-
-appraise 'rails-7.1' do
-  gem 'rails', '~> 7.1.0'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "action_mailer-#{version}" do
+    gem 'rails', "~> #{version}"
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  appraise 'rails-7.2' do
-    gem 'rails', '~> 7.2.0'
+  %w[7.2.0].each do |version|
+    appraise "action_mailer-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'action_mailer-latest' do
+    gem 'rails'
   end
 end

instrumentation/action_mailer/opentelemetry-instrumentation-action_mailer.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.68.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.22.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.23.0'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'webmock', '~> 3.24.0'
   spec.add_development_dependency 'yard', '~> 0.9'

instrumentation/action_pack/Appraisals

@@ -4,20 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'rails-6.1' do
-  gem 'rails', '~> 6.1.0'
-end
-
-appraise 'rails-7.0' do
-  gem 'rails', '~> 7.0.0'
-end
-
-appraise 'rails-7.1' do
-  gem 'rails', '~> 7.1.0'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "rails-#{version}" do
+    gem 'rails', "~> #{version}"
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  appraise 'rails-7.2' do
-    gem 'rails', '~> 7.2.0'
+  %w[7.2.0].each do |version|
+    appraise "rails-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'rails-latest' do
+    gem 'rails'
   end
 end

instrumentation/action_pack/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-action_pack
 
+### v0.10.0 / 2024-11-19
+
+* ADDED: Use Semconv Naming For ActionPack
+
 ### v0.9.0 / 2024-01-09
 
 * BREAKING CHANGE: Use ActiveSupport instead of patches #703 

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionPack
-      VERSION = '0.9.0'
+      VERSION = '0.10.0'
     end
   end
 end