Merge branch 'main' into patch-1

Author: ollym

.github/workflows/fossa.yml

@@ -10,6 +10,7 @@ permissions:
 
 jobs:
   fossa:
+    if: ${{ github.repository == 'open-telemetry/opentelemetry-ruby-contrib' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/release-please.yaml

@@ -17,7 +17,7 @@ jobs:
     name: Process Release
     runs-on: ubuntu-latest
     steps:
-      - uses: googleapis/release-please-action@v4.1.3
+      - uses: googleapis/release-please-action@v4.2.0
         id: prepare
         # with:
         #   token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }}

.instrumentation_generator/templates/Gemfile

@@ -14,4 +14,15 @@ gemspec
 
 group :test do
   gem 'opentelemetry-instrumentation-base', path: '../base'
+  gem 'appraisal', '~> 2.5'
+  gem 'bundler', '~> 2.4'
+  gem 'minitest', '~> 5.0'
+  gem 'opentelemetry-sdk', '~> 1.0'
+  gem 'opentelemetry-test-helpers', '~> 0.3'
+  gem 'rake', '~> 13.0'
+  gem 'rubocop', '~> 1.73.2'
+  gem 'rubocop-performance', '~> 1.24.0'
+  gem 'simplecov', '~> 0.17.1'
+  gem 'webmock', '~> 3.24'
+  gem 'yard', '~> 0.9'
 end

.instrumentation_generator/templates/gemspec.tt

@@ -28,18 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opentelemetry-api', '~> <%= opentelemetry_version %>'
   spec.add_dependency 'opentelemetry-instrumentation-base', '~> <%= instrumentation_base_version %>'
 
-  spec.add_development_dependency 'appraisal', '~> 2.5'
-  spec.add_development_dependency 'bundler', '~> 2.4'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0'
-  spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rubocop', '~> 1.70.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.19.1'
-  spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'webmock', '~> 3.24'
-  spec.add_development_dependency 'yard', '~> 0.9'
-
   if spec.respond_to?(:metadata)
     spec.metadata['changelog_uri'] = "https://rubydoc.info/gems/#{spec.name}/#{spec.version}/file/CHANGELOG.md"
     spec.metadata['source_code_uri'] = 'https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/<%= instrumentation_name %>'

.rubocop.yml

@@ -12,7 +12,7 @@ AllCops:
 Bundler/OrderedGems:
   Enabled: false
 Gemspec/DevelopmentDependencies:
-  Enabled: false
+  Enabled: true
 Gemspec/RequiredRubyVersion:
   Enabled: false
 Lint/ConstantDefinitionInBlock:
@@ -38,12 +38,6 @@ Metrics/PerceivedComplexity:
 Naming/FileName:
   Exclude:
     - '**/opentelemetry-*'
-### TODO: Enable this is a separate PR
-Naming/BlockForwarding:
-  Enabled: false
-Style/ArgumentsForwarding:
-  Enabled: false
-#######################
 Style/Documentation:
   Exclude:
     - "**/test/**/*"

CONTRIBUTING.md

@@ -387,34 +387,34 @@ This will then run a bulk update on all of the gems in the repository, and then
 
 ```console
 
-diff --git a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
+diff --git a/propagator/ottrace/Gemfile b/propagator/ottrace/Gemfile
 index 42c5ecba..74fcc743 100644
---- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
+--- a/propagator/ottrace/Gemfile
 +++ b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec
 @@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
-   spec.add_development_dependency 'bundler', '~> 2.4'
-   spec.add_development_dependency 'minitest', '~> 5.0'
-   spec.add_development_dependency 'rake', '~> 13.0'
--  spec.add_development_dependency 'rubocop', '~> 1.50.0'
-+  spec.add_development_dependency 'rubocop', '~> 1.56.1'
-   spec.add_development_dependency 'simplecov', '~> 0.22.0'
-   spec.add_development_dependency 'yard', '~> 0.9'
-   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
+   gem 'bundler', '~> 2.4'
+   gem 'minitest', '~> 5.0'
+   gem 'rake', '~> 13.0'
+-  gem 'rubocop', '~> 1.50.0'
++  gem 'rubocop', '~> 1.56.1'
+   gem 'simplecov', '~> 0.22.0'
+   gem 'yard', '~> 0.9'
+   gem 'yard-doctest', '~> 0.1.6'
 (1/1) Stage this hunk [y,n,q,a,d,e,?]? y
 
-diff --git a/propagator/xray/opentelemetry-propagator-xray.gemspec b/propagator/xray/opentelemetry-propagator-xray.gemspec
+diff --git a/propagator/xray/Gemfile b/propagator/xray/Gemfile
 index e29acbfc..85622d25 100644
---- a/propagator/xray/opentelemetry-propagator-xray.gemspec
-+++ b/propagator/xray/opentelemetry-propagator-xray.gemspec
+--- a/propagator/xray/Gemfile
++++ b/propagator/xray/Gemfile
 @@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
-   spec.add_development_dependency 'bundler', '~> 2.4'
-   spec.add_development_dependency 'minitest', '~> 5.0'
-   spec.add_development_dependency 'rake', '~> 13.0'
--  spec.add_development_dependency 'rubocop', '~> 1.50.0'
-+  spec.add_development_dependency 'rubocop', '~> 1.56.1'
-   spec.add_development_dependency 'simplecov', '~> 0.22.0'
-   spec.add_development_dependency 'yard', '~> 0.9'
-   spec.add_development_dependency 'yard-doctest', '~> 0.1.6'
+   gem 'bundler', '~> 2.4'
+   gem 'minitest', '~> 5.0'
+   gem 'rake', '~> 13.0'
+-  gem 'rubocop', '~> 1.50.0'
++  gem 'rubocop', '~> 1.56.1'
+   gem 'simplecov', '~> 0.22.0'
+   gem 'yard', '~> 0.9'
+   gem 'yard-doctest', '~> 0.1.6'
 (1/1) Stage this hunk [y,n,q,a,d,e,?]? y
 ```
 

Gemfile

@@ -7,5 +7,5 @@
 source 'https://rubygems.org'
 
 gem 'rake', '~> 13.0'
-gem 'rubocop', '~> 1.71.0'
-gem 'rubocop-performance', '~> 1.23.0'
+gem 'rubocop', '~> 1.73.2'
+gem 'rubocop-performance', '~> 1.24.0'

bin/update-dependencies

@@ -8,9 +8,9 @@ if [ -z "$2" ] ; then
   echo "gem version is required!" && exit 2;
 fi
 
-for gemspec in $(git ls-files \*.gemspec)
+for file in $(git ls-files \*Gemfile \*.gemspec)
 do
-  sed -i -E "s/'$1', '~> [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/'$1', '~> $2'/" "$gemspec"
+  sed -i -E "s/'$1', '~> [[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+'/'$1', '~> $2'/" "$file"
 done
 
 echo "Review your changes and commit"

helpers/mysql/Gemfile

@@ -9,6 +9,15 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'bundler', '~> 2.4'
+  gem 'minitest', '~> 5.0'
+  gem 'opentelemetry-test-helpers', '~> 0.3'
+  gem 'rake', '~> 13.0'
+  gem 'rubocop', '~> 1.73.2'
+  gem 'rubocop-performance', '~> 1.24.0'
+  gem 'simplecov', '~> 0.22.0'
+  gem 'yard', '~> 0.9'
+  gem 'yard-doctest', '~> 0.1.6'
   if RUBY_VERSION >= '3.4'
     gem 'base64'
     gem 'mutex_m'

helpers/mysql/README.md

@@ -16,7 +16,7 @@ Add the gem to your instrumentation's Gemfile:
 ```ruby
 # Gemfile
 
-group :test, :development do
+group :test do
   gem 'opentelemetry-helpers-mysql', path: '../../helpers/mysql'
 end
 ```