From 1fa08103b4bad30ff94e27ba013de390684cc029 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:48:04 -0500 Subject: [PATCH 01/37] chore(deps-dev): update rubocop to ~> 1.59.0 in all gems (#760) * chore(deps): update rubocop requirement from ~> 1.58.0 to ~> 1.59.0 Updates the requirements on [rubocop](https://github.com/rubocop/rubocop) to permit the latest version. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.58.0...v1.59.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:production ... Signed-off-by: dependabot[bot] * chore(deps-dev): also update rubocop to ~> 1.59.0 in all the gemspecs --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Robb Kidd --- Gemfile | 2 +- .../opentelemetry-instrumentation-action_pack.gemspec | 2 +- .../opentelemetry-instrumentation-action_view.gemspec | 2 +- .../active_job/opentelemetry-instrumentation-active_job.gemspec | 2 +- ...entelemetry-instrumentation-active_model_serializers.gemspec | 2 +- .../opentelemetry-instrumentation-active_record.gemspec | 2 +- .../opentelemetry-instrumentation-active_support.gemspec | 2 +- instrumentation/all/opentelemetry-instrumentation-all.gemspec | 2 +- .../aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec | 2 +- instrumentation/base/opentelemetry-instrumentation-base.gemspec | 2 +- .../bunny/opentelemetry-instrumentation-bunny.gemspec | 2 +- .../opentelemetry-instrumentation-concurrent_ruby.gemspec | 2 +- .../dalli/opentelemetry-instrumentation-dalli.gemspec | 2 +- .../opentelemetry-instrumentation-delayed_job.gemspec | 2 +- .../ethon/opentelemetry-instrumentation-ethon.gemspec | 2 +- .../excon/opentelemetry-instrumentation-excon.gemspec | 2 +- .../faraday/opentelemetry-instrumentation-faraday.gemspec | 2 +- .../grape/opentelemetry-instrumentation-grape.gemspec | 2 +- .../graphql/opentelemetry-instrumentation-graphql.gemspec | 2 +- instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec | 2 +- instrumentation/http/opentelemetry-instrumentation-http.gemspec | 2 +- .../opentelemetry-instrumentation-http_client.gemspec | 2 +- .../httpx/opentelemetry-instrumentation-httpx.gemspec | 2 +- .../koala/opentelemetry-instrumentation-koala.gemspec | 2 +- instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec | 2 +- .../mongo/opentelemetry-instrumentation-mongo.gemspec | 2 +- .../mysql2/opentelemetry-instrumentation-mysql2.gemspec | 2 +- .../net_http/opentelemetry-instrumentation-net_http.gemspec | 2 +- instrumentation/pg/opentelemetry-instrumentation-pg.gemspec | 2 +- instrumentation/que/opentelemetry-instrumentation-que.gemspec | 2 +- .../racecar/opentelemetry-instrumentation-racecar.gemspec | 2 +- instrumentation/rack/opentelemetry-instrumentation-rack.gemspec | 2 +- .../rails/opentelemetry-instrumentation-rails.gemspec | 2 +- instrumentation/rake/opentelemetry-instrumentation-rake.gemspec | 2 +- .../rdkafka/opentelemetry-instrumentation-rdkafka.gemspec | 2 +- .../redis/opentelemetry-instrumentation-redis.gemspec | 2 +- .../resque/opentelemetry-instrumentation-resque.gemspec | 2 +- .../restclient/opentelemetry-instrumentation-restclient.gemspec | 2 +- .../rspec/opentelemetry-instrumentation-rspec.gemspec | 2 +- .../ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec | 2 +- .../sidekiq/opentelemetry-instrumentation-sidekiq.gemspec | 2 +- .../sinatra/opentelemetry-instrumentation-sinatra.gemspec | 2 +- .../trilogy/opentelemetry-instrumentation-trilogy.gemspec | 2 +- propagator/ottrace/opentelemetry-propagator-ottrace.gemspec | 2 +- propagator/xray/opentelemetry-propagator-xray.gemspec | 2 +- resources/azure/opentelemetry-resource-detector-azure.gemspec | 2 +- .../container/opentelemetry-resource-detector-container.gemspec | 2 +- ...pentelemetry-resource-detector-google_cloud_platform.gemspec | 2 +- 48 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Gemfile b/Gemfile index 593f654cdc..bc32156cce 100644 --- a/Gemfile +++ b/Gemfile @@ -7,5 +7,5 @@ source 'https://rubygems.org' gem 'rake', '~> 13.0' -gem 'rubocop', '~> 1.58.0' +gem 'rubocop', '~> 1.59.0' gem 'rubocop-performance', '~> 1.19.1' diff --git a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec index eccdf81a61..136e13b787 100644 --- a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec +++ b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rails', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec index ae3b8d2097..b77471a888 100644 --- a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec +++ b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rails', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec index 2039a15767..aa5cc0afcc 100644 --- a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec +++ b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec b/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec index f27de220ca..e05d9767d7 100644 --- a/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec +++ b/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec index 001334973c..32cd0b0be5 100644 --- a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec +++ b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec index 0725d2221d..febb6d0fec 100644 --- a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec +++ b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry-byebug' spec.add_development_dependency 'rails', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec index e544a750b3..95e8c667b7 100644 --- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec +++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec @@ -65,7 +65,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.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec index bd1ce75a15..7b3d31e1a0 100644 --- a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec +++ b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry' spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/base/opentelemetry-instrumentation-base.gemspec b/instrumentation/base/opentelemetry-instrumentation-base.gemspec index ba6ff4563e..e0ab420f9e 100644 --- a/instrumentation/base/opentelemetry-instrumentation-base.gemspec +++ b/instrumentation/base/opentelemetry-instrumentation-base.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.22.0' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec b/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec index c502ce30b2..0f3a71779d 100644 --- a/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec +++ b/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec b/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec index c5831665d1..3961a3e737 100644 --- a/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec +++ b/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec b/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec index 1ee0aeec8e..a1d3572002 100644 --- a/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec +++ b/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec index d92561f641..fb59b5af5c 100644 --- a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec +++ b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'sqlite3' diff --git a/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec b/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec index 7feb678d6b..ee7958b7d7 100644 --- a/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec +++ b/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec index 79534f7d44..01ad635bd5 100644 --- a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec +++ b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec index 9744b96769..d09424d235 100644 --- a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec +++ b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec index 08162fda13..401c37fde0 100644 --- a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec +++ b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rack-test' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec b/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec index b3f06ed7b8..7a78d43a2b 100644 --- a/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec +++ b/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec b/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec index 70b299c9f5..b37cbcbeb1 100644 --- a/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec +++ b/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0' spec.add_development_dependency 'opentelemetry-test-helpers' spec.add_development_dependency 'rake', '~> 12.3.3' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/http/opentelemetry-instrumentation-http.gemspec b/instrumentation/http/opentelemetry-instrumentation-http.gemspec index 68442db16a..fb9418fd6b 100644 --- a/instrumentation/http/opentelemetry-instrumentation-http.gemspec +++ b/instrumentation/http/opentelemetry-instrumentation-http.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 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec b/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec index 9beb7fbb97..e6931eb866 100644 --- a/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec +++ b/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec b/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec index 296177a315..87e8e9686f 100644 --- a/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec +++ b/instrumentation/httpx/opentelemetry-instrumentation-httpx.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 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec b/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec index a3b5ae2617..abd3e5c548 100644 --- a/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec +++ b/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec @@ -37,7 +37,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 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec b/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec index fbc70cbbe9..1686d30be0 100644 --- a/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec +++ b/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec b/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec index 60ebed8cbd..a02eb74c85 100644 --- a/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec +++ b/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry' spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec b/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec index 710cb3a728..5c865e0d01 100644 --- a/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec +++ b/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'pry' spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec b/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec index 3f8c366e2d..86eee49ae4 100644 --- a/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec +++ b/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '~> 13.0.1' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec b/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec index d77bedd761..2fff2f502d 100644 --- a/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec +++ b/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pg', '>= 1.1.0' spec.add_development_dependency 'pry' spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/que/opentelemetry-instrumentation-que.gemspec b/instrumentation/que/opentelemetry-instrumentation-que.gemspec index 1ce51a70a6..1573d3d80e 100644 --- a/instrumentation/que/opentelemetry-instrumentation-que.gemspec +++ b/instrumentation/que/opentelemetry-instrumentation-que.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pg', '~> 1.1' spec.add_development_dependency 'que' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec b/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec index 142715ecda..f581e6b825 100644 --- a/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec +++ b/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'racecar', '~> 2.7' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec b/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec index 36fca16bb2..1f1c459133 100644 --- a/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec +++ b/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rack-test' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec index 4ceaf44cd5..c54ed61fcc 100644 --- a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec +++ b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec @@ -41,7 +41,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rack-test', '~> 2.1.0' spec.add_development_dependency 'rails', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.22.0' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec b/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec index 3cf76962e7..d261937e70 100644 --- a/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec +++ b/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.0' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '>= 0.9.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec b/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec index fbafb7a96e..9ff04f2368 100644 --- a/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec +++ b/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rdkafka', '>= 0.12' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec b/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec index 491456f174..c9d8ac82f6 100644 --- a/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec +++ b/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'redis', '~> 4.1' spec.add_development_dependency 'redis-client', '~> 0.7' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec b/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec index 61172db991..8cf44b8353 100644 --- a/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec +++ b/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec @@ -35,7 +35,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 'resque' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec b/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec index 7d392fadfa..e1661c2fdb 100644 --- a/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec +++ b/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rest-client', '~> 2.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec b/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec index 4e3089ec96..8d8573c6ca 100644 --- a/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec +++ b/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec @@ -35,7 +35,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 'rspec', '~> 3.10.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec b/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec index 884799779c..89d3e7ca72 100644 --- a/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec +++ b/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'ruby-kafka' spec.add_development_dependency 'simplecov', '~> 0.17.1' diff --git a/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec b/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec index 0aabd6b60e..267c518419 100644 --- a/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec +++ b/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'sidekiq' spec.add_development_dependency 'simplecov', '~> 0.17.1' diff --git a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec index e5f71d8d5c..80c5b3febf 100644 --- a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec +++ b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rack-test', '~> 1.1.0' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'sinatra' diff --git a/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec b/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec index 600c965980..d9c1320d6e 100644 --- a/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec +++ b/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' - spec.add_development_dependency 'rubocop', '~> 1.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'trilogy', '>= 2.0', '< 3.0' diff --git a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec index 14cdee8983..142cc81659 100644 --- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec +++ 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.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.22.0' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/propagator/xray/opentelemetry-propagator-xray.gemspec b/propagator/xray/opentelemetry-propagator-xray.gemspec index daddd3e79d..f21f144943 100644 --- a/propagator/xray/opentelemetry-propagator-xray.gemspec +++ b/propagator/xray/opentelemetry-propagator-xray.gemspec @@ -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.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.22.0' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/resources/azure/opentelemetry-resource-detector-azure.gemspec b/resources/azure/opentelemetry-resource-detector-azure.gemspec index 002cdfde11..0df2ff7a15 100644 --- a/resources/azure/opentelemetry-resource-detector-azure.gemspec +++ b/resources/azure/opentelemetry-resource-detector-azure.gemspec @@ -30,7 +30,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.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17' spec.add_development_dependency 'webmock', '~> 3.19.1' diff --git a/resources/container/opentelemetry-resource-detector-container.gemspec b/resources/container/opentelemetry-resource-detector-container.gemspec index 5137d2600e..fad77611ad 100644 --- a/resources/container/opentelemetry-resource-detector-container.gemspec +++ b/resources/container/opentelemetry-resource-detector-container.gemspec @@ -30,7 +30,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.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec b/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec index 0fa9f9dd00..2c498e18da 100644 --- a/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec +++ b/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec @@ -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.58.0' + spec.add_development_dependency 'rubocop', '~> 1.59.0' spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' spec.add_development_dependency 'simplecov', '~> 0.17' spec.add_development_dependency 'webmock', '~> 3.19.1' From 3d0f818c06a2b246425c114b41bec260b9274bc0 Mon Sep 17 00:00:00 2001 From: Francis Bogsanyi Date: Fri, 15 Dec 2023 18:09:37 -0500 Subject: [PATCH 02/37] fix: Backport Rack proxy event to middleware (#764) --- .../rack/middlewares/tracer_middleware.rb | 2 ++ .../rack/middlewares/tracer_middleware_test.rb | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/tracer_middleware.rb b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/tracer_middleware.rb index 353d5192f7..608728ac6c 100644 --- a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/tracer_middleware.rb +++ b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/tracer_middleware.rb @@ -77,6 +77,8 @@ def call(env) tracer.in_span(request_span_name, attributes: request_span_attributes(env: env), kind: request_span_kind) do |request_span| + request_start_time = OpenTelemetry::Instrumentation::Rack::Util::QueueTime.get_request_start(env) + request_span.add_event('http.proxy.request.started', timestamp: request_start_time) unless request_start_time.nil? OpenTelemetry::Instrumentation::Rack.with_span(request_span) do @app.call(env).tap do |status, headers, response| set_attributes_after_request(request_span, status, headers, response) diff --git a/instrumentation/rack/test/opentelemetry/instrumentation/rack/middlewares/tracer_middleware_test.rb b/instrumentation/rack/test/opentelemetry/instrumentation/rack/middlewares/tracer_middleware_test.rb index 9deb47183b..89c68c328b 100644 --- a/instrumentation/rack/test/opentelemetry/instrumentation/rack/middlewares/tracer_middleware_test.rb +++ b/instrumentation/rack/test/opentelemetry/instrumentation/rack/middlewares/tracer_middleware_test.rb @@ -25,6 +25,7 @@ let(:exporter) { EXPORTER } let(:finished_spans) { exporter.finished_spans } let(:first_span) { exporter.finished_spans.first } + let(:proxy_event) { first_span.events&.first } let(:default_config) { {} } let(:config) { default_config } @@ -84,6 +85,15 @@ end end + describe 'given request proxy headers' do + let(:env) { Hash('HTTP_X_REQUEST_START' => '1677723466') } + + it 'records an event' do + _(proxy_event.name).must_equal 'http.proxy.request.started' + _(proxy_event.timestamp).must_equal 1_677_723_466_000_000_000 + end + end + describe 'config[:untraced_endpoints]' do describe 'when an array is passed in' do let(:config) { { untraced_endpoints: ['/ping'] } } From 6cab34db34285b51b7dc1d3e32049e05323395f5 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 15:28:29 -0600 Subject: [PATCH 03/37] chore: update codeowners --- CODEOWNERS | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 8c2435bb42..0276cc2eaf 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -12,22 +12,22 @@ # https://help.github.com/en/articles/about-code-owners # -* @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle @open-telemetry/ruby-contrib-approvers +* @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -resources/container/ @scbjans @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +resources/container/ @scbjans @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -instrumentation/aws_sdk/ @NathanielRN @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +instrumentation/aws_sdk/ @NathanielRN @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -instrumentation/grape/ @muripic @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +instrumentation/grape/ @muripic @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -instrumentation/graphql/ @swalkinshaw @rmosolgo @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +instrumentation/graphql/ @swalkinshaw @rmoslogo @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -instrumentation/httpx/ @HoneyryderChuck @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +instrumentation/httpx/ @HoneyryderChuck @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -instrumentation/mongo/ @johnnyshields @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +instrumentation/mongo/ @johnnyshields @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -instrumentation/racecar/ @chrisholmes @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +instrumentation/racecar/ @chrisholmes @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -instrumentation/rspec/ @chrisholmes @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +instrumentation/rspec/ @chrisholmes @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle -instrumentation/que/ @indrekj @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd +instrumentation/que/ @indrekj @open-telemetry/ruby-contrib-maintainers @open-telemetry/ruby-contrib-approvers @fbogsany @mwear @robertlaurin @dazuma @ericmustin @arielvalentin @ahayworth @plantfansam @robbkidd @simi @kaylareopelle From 2586b759c66ad1892bd8c6a75bd6cb9dc0e090fb Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 15:30:17 -0600 Subject: [PATCH 04/37] chore: Add Tests for GraphQL C Parser (#773) Graphql 2.2 introduces an optional C implementation of the Parser as well as optimizations to the pure Ruby parser that result in changes to what is captured during instrumentation. Users of the pure Ruby implementation will no longer see graphql.lex spans emitted as a part of their traces and will instead need to switch to using the C Parser in order to explicitly see time spent in the lexer. This PR introduces updates to the test suite to add coverage for the C Parser and changes to the Ruby implementation. There are no underlying changes in the instrumentation itself. --- instrumentation/graphql/Appraisals | 35 +++++++++++++++---- .../graphql/tracers/graphql_trace_test.rb | 4 ++- .../graphql/tracers/graphql_tracer_test.rb | 3 +- instrumentation/graphql/test/test_helper.rb | 9 +++++ 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/instrumentation/graphql/Appraisals b/instrumentation/graphql/Appraisals index d478f591ba..05298c160c 100644 --- a/instrumentation/graphql/Appraisals +++ b/instrumentation/graphql/Appraisals @@ -4,18 +4,39 @@ # # SPDX-License-Identifier: Apache-2.0 -appraise 'graphql-1.13' do +# Max compatible version of 1.x +appraise 'graphql-1.x' do gem 'graphql', '~> 1.13' end -appraise 'graphql-2.0.17' do - gem 'graphql', '2.0.17' -end - +# A bug was introduced in 2.0.18 that was fixed in 2.0.19 appraise 'graphql-2.0.18' do gem 'graphql', '2.0.18' end -appraise 'graphql-2.x' do - gem 'graphql', '>= 2.0.18', '< 3.0.0' +# Max compatible version of 2.0.x +appraise 'graphql-2.0' do + gem 'graphql', '~> 2.0.27' +end + +# Max compatible version of 2.1.x +appraise 'graphql-2.1' do + gem 'graphql', '~> 2.1.8' +end + +appraise 'graphql-c_parser-2.2.x' do + gem 'graphql', '~> 2.2.1' + gem 'graphql-c_parser', '~> 1.0.7' +end + +appraise 'graphql-2.2.x' do + gem 'graphql', '~> 2.2.1', '< 3.0.0' +end + +appraise 'graphql-c_parser-latest' do + gem 'graphql-c_parser' +end + +appraise 'graphql-latest' do + gem 'graphql' end diff --git a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb index 59de004736..4ae7fb15e1 100644 --- a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb +++ b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_trace_test.rb @@ -54,6 +54,8 @@ 'graphql.execute_multiplex' ] + expected_spans.delete('graphql.lex') unless trace_lex_supported? + expected_result = { 'simpleField' => 'Hello.', 'resolvedField' => { 'originalValue' => 'testing=1', 'uppercasedValue' => 'TESTING=1' } @@ -103,7 +105,7 @@ it 'traces the provided schemas' do SomeOtherGraphQLAppSchema.execute('query SimpleQuery{ __typename }') - _(spans.size).must_equal(8) + _(spans.select { |s| s.name.start_with?('graphql.') }).wont_be(:empty?) end it 'does not trace all schemas' do diff --git a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_tracer_test.rb b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_tracer_test.rb index 35e5e4b0d6..0813c22c07 100644 --- a/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_tracer_test.rb +++ b/instrumentation/graphql/test/instrumentation/graphql/tracers/graphql_tracer_test.rb @@ -53,6 +53,7 @@ 'graphql.execute_query_lazy', 'graphql.execute_multiplex' ] + expected_spans.delete('graphql.lex') unless trace_lex_supported? expected_result = { 'simpleField' => 'Hello.', @@ -102,7 +103,7 @@ it 'traces the provided schemas' do SomeOtherGraphQLAppSchema.execute('query SimpleQuery{ __typename }') - _(spans.size).must_equal(8) + _(spans.select { |s| s.name.start_with?('graphql.') }).wont_be(:empty?) end it 'does not trace all schemas' do diff --git a/instrumentation/graphql/test/test_helper.rb b/instrumentation/graphql/test/test_helper.rb index 75f349b28b..b25005d166 100644 --- a/instrumentation/graphql/test/test_helper.rb +++ b/instrumentation/graphql/test/test_helper.rb @@ -125,3 +125,12 @@ def uses_platform_interfaces? def gem_version Gem::Version.new(GraphQL::VERSION) end + +# When tracing, is the parser expected to call `lex` before `parse` +def trace_lex_supported? + return @trace_lex_supported if defined?(@trace_lex_supported) + + # In GraphQL 2.2, the default parser was changed such that `lex` is no longer called + @trace_lex_supported = Gem::Requirement.new('< 2.2').satisfied_by?(Gem::Version.new(GraphQL::VERSION)) \ + || (defined?(GraphQL::CParser) == 'constant') +end From fd5b9a7ea0c22400b219221fe224ec4463786fd6 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 16:31:15 -0600 Subject: [PATCH 05/37] chore: Experiment with GCP Release Please (#729) * chore: Experiment with GCP Release Please An experiment to replace toys. https://github.com/google-github-actions/release-please-action/tree/main * squash: fixes from PR feedback * squash: Give otel bot the credit * squash: pin to v4.0.2 * squash: add steps to execute the release * squash: fix output * squash: release one at a time --- .github/workflows/release-please.yaml | 63 ++++++ .release-please-manifest.json | 49 +++++ release-please-config.json | 298 ++++++++++++++++++++++++++ 3 files changed, 410 insertions(+) create mode 100644 .github/workflows/release-please.yaml create mode 100644 .release-please-manifest.json create mode 100644 release-please-config.json diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml new file mode 100644 index 0000000000..deecbdfbaf --- /dev/null +++ b/.github/workflows/release-please.yaml @@ -0,0 +1,63 @@ +--- +name: Release Please + +on: + workflow_dispatch: + push: + branches: + - main + +permissions: + contents: write + pull-requests: write + +jobs: + release: + name: Process Release + runs-on: ubuntu-latest + steps: + - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e + id: release + with: + command: manifest + outputs: + releases_created: ${{ steps.release.outputs.releases_created }} + paths_released: ${{ steps.release.outputs.paths_released }} + + publish: + needs: release + name: Publish Gems + runs-on: ubuntu-latest + if: ${{ needs.release.outputs.releases_created }} + + strategy: + fail-fast: false + matrix: + path: ${{ fromJson(needs.release.outputs.paths_released) }} + max-parallel: 1 + + steps: + - name: Checkout repository + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + + - name: Setup Ruby + uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 + with: + ruby-version: 3.0.0 + + - name: Configure RubyGems + env: + GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_API_KEY}}" + + run: | + mkdir -p $HOME/.gem + touch $HOME/.gem/credentials + chmod 0600 $HOME/.gem/credentials + printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials + + - name: Release Gem + working-directory: ${{ matrix.path }} + run: | + bundle install + bundle exec rake --trace build + bundle exec rake --trace release:rubygem_push diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000000..7adc63ff67 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,49 @@ +{ + "instrumentation/gruf": "0.1.1", + "instrumentation/grape": "0.1.6", + "instrumentation/racecar": "0.3.0", + "instrumentation/rake": "0.2.1", + "instrumentation/rdkafka": "0.4.2", + "instrumentation/trilogy": "0.57.0", + "instrumentation/active_support": "0.5.1", + "instrumentation/action_view": "0.7.0", + "instrumentation/action_pack": "0.8.0", + "instrumentation/active_job": "0.7.1", + "instrumentation/resque": "0.5.0", + "instrumentation/bunny": "0.21.1", + "instrumentation/base": "0.22.3", + "instrumentation/active_record": "0.7.0", + "instrumentation/aws_sdk": "0.5.0", + "instrumentation/lmdb": "0.22.1", + "instrumentation/http": "0.23.2", + "instrumentation/graphql": "0.27.0", + "instrumentation/http_client": "0.22.3", + "instrumentation/httpx": "0.1.1", + "instrumentation/koala": "0.20.2", + "instrumentation/active_model_serializers": "0.20.1", + "instrumentation/concurrent_ruby": "0.21.2", + "instrumentation/dalli": "0.25.0", + "instrumentation/delayed_job": "0.22.1", + "instrumentation/ethon": "0.21.3", + "instrumentation/excon": "0.22.0", + "instrumentation/faraday": "0.23.4", + "instrumentation/mongo": "0.22.2", + "instrumentation/mysql2": "0.25.0", + "instrumentation/net_http": "0.22.4", + "instrumentation/pg": "0.26.1", + "instrumentation/que": "0.7.1", + "instrumentation/rack": "0.23.5", + "instrumentation/rails": "0.29.1", + "instrumentation/redis": "0.25.3", + "instrumentation/restclient": "0.22.3", + "instrumentation/rspec": "0.3.2", + "instrumentation/ruby_kafka": "0.21.0", + "instrumentation/sidekiq": "0.25.0", + "instrumentation/sinatra": "0.23.2", + "instrumentation/all": "0.54.0", + "propagator/ottrace": "0.21.2", + "propagator/xray": "0.22.1", + "resources/azure": "0.1.0", + "resources/container": "0.1.1", + "resources/google_cloud_platform": "0.1.0" +} diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000000..0932de2486 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,298 @@ +{ + "bump-minor-pre-major": true, + "bump-patch-for-minor-pre-major": true, + "draft": false, + "include-component-in-tag": true, + "include-v-in-tag": true, + "prerelease": false, + "release-type": "ruby", + "separate-pull-requests": false, + "sequential-calls": true, + "signoff": "OpenTelemetry Bot ", + "skip-github-release": false, + "tag-separator": " ", + "packages": [ + { + "instrumentation/gruf": { + "package-name": "opentelemetry-instrumentation-gruf", + "version-file": "lib/instrumentation/gruf/version.rb" + } + }, + { + "instrumentation/grape": { + "package-name": "opentelemetry-instrumentation-grape", + "version-file": "lib/instrumentation/grape/version.rb" + } + }, + { + "instrumentation/racecar": { + "package-name": "opentelemetry-instrumentation-racecar", + "version-file": "lib/instrumentation/racecar/version.rb" + } + }, + { + "instrumentation/rake": { + "package-name": "opentelemetry-instrumentation-rake", + "version-file": "lib/instrumentation/rake/version.rb" + } + }, + { + "instrumentation/rdkafka": { + "package-name": "opentelemetry-instrumentation-rdkafka", + "version-file": "lib/instrumentation/rdkafka/version.rb" + } + }, + { + "instrumentation/trilogy": { + "package-name": "opentelemetry-instrumentation-trilogy", + "version-file": "lib/instrumentation/trilogy/version.rb" + } + }, + { + "instrumentation/active_support": { + "package-name": "opentelemetry-instrumentation-active_support", + "version-file": "lib/instrumentation/active_support/version.rb" + } + }, + { + "instrumentation/action_view": { + "package-name": "opentelemetry-instrumentation-action_view", + "version-file": "lib/instrumentation/action_view/version.rb" + } + }, + { + "instrumentation/action_pack": { + "package-name": "opentelemetry-instrumentation-action_pack", + "version-file": "lib/instrumentation/action_pack/version.rb" + } + }, + { + "instrumentation/active_job": { + "package-name": "opentelemetry-instrumentation-active_job", + "version-file": "lib/instrumentation/active_job/version.rb" + } + }, + { + "instrumentation/resque": { + "package-name": "opentelemetry-instrumentation-resque", + "version-file": "lib/instrumentation/resque/version.rb" + } + }, + { + "instrumentation/bunny": { + "package-name": "opentelemetry-instrumentation-bunny", + "version-file": "lib/instrumentation/bunny/version.rb" + } + }, + { + "instrumentation/base": { + "package-name": "opentelemetry-instrumentation-base", + "version-file": "lib/opentelemetry/instrumentation/version.rb" + } + }, + { + "instrumentation/active_record": { + "package-name": "opentelemetry-instrumentation-active_record", + "version-file": "lib/instrumentation/active_record/version.rb" + } + }, + { + "instrumentation/aws_sdk": { + "package-name": "opentelemetry-instrumentation-aws_sdk", + "version-file": "lib/instrumentation/aws_sdk/version.rb" + } + }, + { + "instrumentation/lmdb": { + "package-name": "opentelemetry-instrumentation-lmdb", + "version-file": "lib/instrumentation/lmdb/version.rb" + } + }, + { + "instrumentation/http": { + "package-name": "opentelemetry-instrumentation-http", + "version-file": "lib/instrumentation/http/version.rb" + } + }, + { + "instrumentation/graphql": { + "package-name": "opentelemetry-instrumentation-graphql", + "version-file": "lib/instrumentation/graphql/version.rb" + } + }, + { + "instrumentation/http_client": { + "package-name": "opentelemetry-instrumentation-http_client", + "version-file": "lib/instrumentation/http_client/version.rb" + } + }, + { + "instrumentation/httpx": { + "package-name": "opentelemetry-instrumentation-httpx", + "version-file": "lib/instrumentation/httpx/version.rb" + } + }, + { + "instrumentation/koala": { + "package-name": "opentelemetry-instrumentation-koala", + "version-file": "lib/instrumentation/koala/version.rb" + } + }, + { + "instrumentation/active_model_serializers": { + "package-name": "opentelemetry-instrumentation-active_model_serializers", + "version-file": "lib/instrumentation/active_model_serializers/version.rb" + } + }, + { + "instrumentation/concurrent_ruby": { + "package-name": "opentelemetry-instrumentation-concurrent_ruby", + "version-file": "lib/instrumentation/concurrent_ruby/version.rb" + } + }, + { + "instrumentation/dalli": { + "package-name": "opentelemetry-instrumentation-dalli", + "version-file": "lib/instrumentation/dalli/version.rb" + } + }, + { + "instrumentation/delayed_job": { + "package-name": "opentelemetry-instrumentation-delayed_job", + "version-file": "lib/instrumentation/delayed_job/version.rb" + } + }, + { + "instrumentation/ethon": { + "package-name": "opentelemetry-instrumentation-ethon", + "version-file": "lib/instrumentation/ethon/version.rb" + } + }, + { + "instrumentation/excon": { + "package-name": "opentelemetry-instrumentation-excon", + "version-file": "lib/instrumentation/excon/version.rb" + } + }, + { + "instrumentation/faraday": { + "package-name": "opentelemetry-instrumentation-faraday", + "version-file": "lib/instrumentation/faraday/version.rb" + } + }, + { + "instrumentation/mongo": { + "package-name": "opentelemetry-instrumentation-mongo", + "version-file": "lib/instrumentation/mongo/version.rb" + } + }, + { + "instrumentation/mysql2": { + "package-name": "opentelemetry-instrumentation-mysql2", + "version-file": "lib/instrumentation/mysql2/version.rb" + } + }, + { + "instrumentation/net_http": { + "package-name": "opentelemetry-instrumentation-net_http", + "version-file": "lib/opentelemetry/instrumentation/net/http/version.rb" + } + }, + { + "instrumentation/pg": { + "package-name": "opentelemetry-instrumentation-pg", + "version-file": "lib/instrumentation/pg/version.rb" + } + }, + { + "instrumentation/que": { + "package-name": "opentelemetry-instrumentation-que", + "version-file": "lib/instrumentation/que/version.rb" + } + }, + { + "instrumentation/rack": { + "package-name": "opentelemetry-instrumentation-rack", + "version-file": "lib/instrumentation/rack/version.rb" + } + }, + { + "instrumentation/rails": { + "package-name": "opentelemetry-instrumentation-rails", + "version-file": "lib/instrumentation/rails/version.rb" + } + }, + { + "instrumentation/redis": { + "package-name": "opentelemetry-instrumentation-redis", + "version-file": "lib/instrumentation/redis/version.rb" + } + }, + { + "instrumentation/restclient": { + "package-name": "opentelemetry-instrumentation-restclient", + "version-file": "lib/instrumentation/restclient/version.rb" + } + }, + { + "instrumentation/rspec": { + "package-name": "opentelemetry-instrumentation-rspec", + "version-file": "lib/instrumentation/rspec/version.rb" + } + }, + { + "instrumentation/ruby_kafka": { + "package-name": "opentelemetry-instrumentation-ruby_kafka", + "version-file": "lib/instrumentation/ruby_kafka/version.rb" + } + }, + { + "instrumentation/sidekiq": { + "package-name": "opentelemetry-instrumentation-sidekiq", + "version-file": "lib/instrumentation/sidekiq/version.rb" + } + }, + { + "instrumentation/sinatra": { + "package-name": "opentelemetry-instrumentation-sinatra", + "version-file": "lib/instrumentation/sinatra/version.rb" + } + }, + { + "instrumentation/all": { + "package-name": "opentelemetry-instrumentation-all", + "version-file": "lib/instrumentation/all/version.rb" + } + }, + { + "propagator/ottrace": { + "package-name": "opentelemetry-propagator-ottrace", + "version-file": "lib/propagator/ottrace/version.rb" + } + }, + { + "propagator/xray": { + "package-name": "opentelemetry-propagator-xray", + "version-file": "lib/propagator/xray/version.rb" + } + }, + { + "resources/azure": { + "package-name": "opentelemetry-resources-azure", + "version-file": "lib/opentelemetry/resource/detector/azure/version.rb" + } + }, + { + "resources/container": { + "package-name": "opentelemetry-resources-container", + "version-file": "lib/opentelemetry/resource/detector/container/version.rb" + } + }, + { + "resources/google_cloud_platform": { + "package-name": "opentelemetry-resources-google_cloud_platform", + "version-file": "lib/opentelemetry/resource/detector/google_cloud_platform/version.rb" + } + } + ] +} From d4faa616f61a934c2a9f2a9877e401c7e400c2c9 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 16:33:29 -0600 Subject: [PATCH 06/37] chore: fix actions definition --- .github/workflows/release-please.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index deecbdfbaf..66b592a790 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -32,9 +32,9 @@ jobs: strategy: fail-fast: false + max-parallel: 1 matrix: path: ${{ fromJson(needs.release.outputs.paths_released) }} - max-parallel: 1 steps: - name: Checkout repository From a6438b9004761a108c9d64e31ee41c4e3005e5cd Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 16:40:40 -0600 Subject: [PATCH 07/37] chore: Fixes for release-please --- .github/workflows/release-please.yaml | 2 - .release-please-manifest.json | 94 +++++++++++++-------------- 2 files changed, 47 insertions(+), 49 deletions(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index 66b592a790..97407c522c 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -18,8 +18,6 @@ jobs: steps: - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e id: release - with: - command: manifest outputs: releases_created: ${{ steps.release.outputs.releases_created }} paths_released: ${{ steps.release.outputs.paths_released }} diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 7adc63ff67..e43e403475 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,49 +1,49 @@ { - "instrumentation/gruf": "0.1.1", - "instrumentation/grape": "0.1.6", - "instrumentation/racecar": "0.3.0", - "instrumentation/rake": "0.2.1", - "instrumentation/rdkafka": "0.4.2", - "instrumentation/trilogy": "0.57.0", - "instrumentation/active_support": "0.5.1", - "instrumentation/action_view": "0.7.0", - "instrumentation/action_pack": "0.8.0", - "instrumentation/active_job": "0.7.1", - "instrumentation/resque": "0.5.0", - "instrumentation/bunny": "0.21.1", - "instrumentation/base": "0.22.3", - "instrumentation/active_record": "0.7.0", - "instrumentation/aws_sdk": "0.5.0", - "instrumentation/lmdb": "0.22.1", - "instrumentation/http": "0.23.2", - "instrumentation/graphql": "0.27.0", - "instrumentation/http_client": "0.22.3", - "instrumentation/httpx": "0.1.1", - "instrumentation/koala": "0.20.2", - "instrumentation/active_model_serializers": "0.20.1", - "instrumentation/concurrent_ruby": "0.21.2", - "instrumentation/dalli": "0.25.0", - "instrumentation/delayed_job": "0.22.1", - "instrumentation/ethon": "0.21.3", - "instrumentation/excon": "0.22.0", - "instrumentation/faraday": "0.23.4", - "instrumentation/mongo": "0.22.2", - "instrumentation/mysql2": "0.25.0", - "instrumentation/net_http": "0.22.4", - "instrumentation/pg": "0.26.1", - "instrumentation/que": "0.7.1", - "instrumentation/rack": "0.23.5", - "instrumentation/rails": "0.29.1", - "instrumentation/redis": "0.25.3", - "instrumentation/restclient": "0.22.3", - "instrumentation/rspec": "0.3.2", - "instrumentation/ruby_kafka": "0.21.0", - "instrumentation/sidekiq": "0.25.0", - "instrumentation/sinatra": "0.23.2", - "instrumentation/all": "0.54.0", - "propagator/ottrace": "0.21.2", - "propagator/xray": "0.22.1", - "resources/azure": "0.1.0", - "resources/container": "0.1.1", - "resources/google_cloud_platform": "0.1.0" + "opentelmentry-instrumentation-gruf": "0.1.1", + "opentelmentry-instrumentation-grape": "0.1.6", + "opentelmentry-instrumentation-racecar": "0.3.0", + "opentelmentry-instrumentation-rake": "0.2.1", + "opentelmentry-instrumentation-rdkafka": "0.4.2", + "opentelmentry-instrumentation-trilogy": "0.57.0", + "opentelmentry-instrumentation-active_support": "0.5.1", + "opentelmentry-instrumentation-action_view": "0.7.0", + "opentelmentry-instrumentation-action_pack": "0.8.0", + "opentelmentry-instrumentation-active_job": "0.7.1", + "opentelmentry-instrumentation-resque": "0.5.0", + "opentelmentry-instrumentation-bunny": "0.21.1", + "opentelmentry-instrumentation-base": "0.22.3", + "opentelmentry-instrumentation-active_record": "0.7.0", + "opentelmentry-instrumentation-aws_sdk": "0.5.0", + "opentelmentry-instrumentation-lmdb": "0.22.1", + "opentelmentry-instrumentation-http": "0.23.2", + "opentelmentry-instrumentation-graphql": "0.27.0", + "opentelmentry-instrumentation-http_client": "0.22.3", + "opentelmentry-instrumentation-httpx": "0.1.1", + "opentelmentry-instrumentation-koala": "0.20.2", + "opentelmentry-instrumentation-active_model_serializers": "0.20.1", + "opentelmentry-instrumentation-concurrent_ruby": "0.21.2", + "opentelmentry-instrumentation-dalli": "0.25.0", + "opentelmentry-instrumentation-delayed_job": "0.22.1", + "opentelmentry-instrumentation-ethon": "0.21.3", + "opentelmentry-instrumentation-excon": "0.22.0", + "opentelmentry-instrumentation-faraday": "0.23.4", + "opentelmentry-instrumentation-mongo": "0.22.2", + "opentelmentry-instrumentation-mysql2": "0.25.0", + "opentelmentry-instrumentation-net_http": "0.22.4", + "opentelmentry-instrumentation-pg": "0.26.1", + "opentelmentry-instrumentation-que": "0.7.1", + "opentelmentry-instrumentation-rack": "0.23.5", + "opentelmentry-instrumentation-rails": "0.29.1", + "opentelmentry-instrumentation-redis": "0.25.3", + "opentelmentry-instrumentation-restclient": "0.22.3", + "opentelmentry-instrumentation-rspec": "0.3.2", + "opentelmentry-instrumentation-ruby_kafka": "0.21.0", + "opentelmentry-instrumentation-sidekiq": "0.25.0", + "opentelmentry-instrumentation-sinatra": "0.23.2", + "opentelmentry-instrumentation-all": "0.54.0", + "opentelemetry-propagator-ottrace": "0.21.2", + "opentelemetry-propagator-xray": "0.22.1", + "opentelemetry-resource-detector-azure": "0.1.0", + "opentelemetry-resource-detector-container": "0.1.1", + "opentelemetry-resource-detector-google_cloud_platform": "0.1.0" } From 4a6e5dcc2b43aeada5fb5a265b4df525cbc491d3 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 16:55:35 -0600 Subject: [PATCH 08/37] chore: use objects not arrays --- .github/workflows/release-please.yaml | 3 +++ release-please-config.json | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index 97407c522c..a8e93d774f 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -18,6 +18,9 @@ jobs: steps: - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e id: release + config-file: release-please-config.json + manifest-file: .release-please-manifest.json + outputs: releases_created: ${{ steps.release.outputs.releases_created }} paths_released: ${{ steps.release.outputs.paths_released }} diff --git a/release-please-config.json b/release-please-config.json index 0932de2486..990162efb7 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,7 +1,7 @@ { "bump-minor-pre-major": true, "bump-patch-for-minor-pre-major": true, - "draft": false, + "draft": true, "include-component-in-tag": true, "include-v-in-tag": true, "prerelease": false, @@ -11,7 +11,7 @@ "signoff": "OpenTelemetry Bot ", "skip-github-release": false, "tag-separator": " ", - "packages": [ + "packages": { { "instrumentation/gruf": { "package-name": "opentelemetry-instrumentation-gruf", @@ -294,5 +294,5 @@ "version-file": "lib/opentelemetry/resource/detector/google_cloud_platform/version.rb" } } - ] + } } From 3a5ab8a35a7669aa4f4f3985c11a8220d6eb19c6 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 16:57:21 -0600 Subject: [PATCH 09/37] chore: Remove invalid config --- .github/workflows/release-please.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index a8e93d774f..a8da8927a9 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -18,8 +18,6 @@ jobs: steps: - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e id: release - config-file: release-please-config.json - manifest-file: .release-please-manifest.json outputs: releases_created: ${{ steps.release.outputs.releases_created }} From f796af488b4a7e7f817621fef5bfeeaf5692e145 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 17:08:25 -0600 Subject: [PATCH 10/37] chore: Remove nested objects in config --- release-please-config.json | 468 +++++++++++++++---------------------- 1 file changed, 187 insertions(+), 281 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index 990162efb7..d68d6b1876 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -12,287 +12,193 @@ "skip-github-release": false, "tag-separator": " ", "packages": { - { - "instrumentation/gruf": { - "package-name": "opentelemetry-instrumentation-gruf", - "version-file": "lib/instrumentation/gruf/version.rb" - } - }, - { - "instrumentation/grape": { - "package-name": "opentelemetry-instrumentation-grape", - "version-file": "lib/instrumentation/grape/version.rb" - } - }, - { - "instrumentation/racecar": { - "package-name": "opentelemetry-instrumentation-racecar", - "version-file": "lib/instrumentation/racecar/version.rb" - } - }, - { - "instrumentation/rake": { - "package-name": "opentelemetry-instrumentation-rake", - "version-file": "lib/instrumentation/rake/version.rb" - } - }, - { - "instrumentation/rdkafka": { - "package-name": "opentelemetry-instrumentation-rdkafka", - "version-file": "lib/instrumentation/rdkafka/version.rb" - } - }, - { - "instrumentation/trilogy": { - "package-name": "opentelemetry-instrumentation-trilogy", - "version-file": "lib/instrumentation/trilogy/version.rb" - } - }, - { - "instrumentation/active_support": { - "package-name": "opentelemetry-instrumentation-active_support", - "version-file": "lib/instrumentation/active_support/version.rb" - } - }, - { - "instrumentation/action_view": { - "package-name": "opentelemetry-instrumentation-action_view", - "version-file": "lib/instrumentation/action_view/version.rb" - } - }, - { - "instrumentation/action_pack": { - "package-name": "opentelemetry-instrumentation-action_pack", - "version-file": "lib/instrumentation/action_pack/version.rb" - } - }, - { - "instrumentation/active_job": { - "package-name": "opentelemetry-instrumentation-active_job", - "version-file": "lib/instrumentation/active_job/version.rb" - } - }, - { - "instrumentation/resque": { - "package-name": "opentelemetry-instrumentation-resque", - "version-file": "lib/instrumentation/resque/version.rb" - } - }, - { - "instrumentation/bunny": { - "package-name": "opentelemetry-instrumentation-bunny", - "version-file": "lib/instrumentation/bunny/version.rb" - } - }, - { - "instrumentation/base": { - "package-name": "opentelemetry-instrumentation-base", - "version-file": "lib/opentelemetry/instrumentation/version.rb" - } - }, - { - "instrumentation/active_record": { - "package-name": "opentelemetry-instrumentation-active_record", - "version-file": "lib/instrumentation/active_record/version.rb" - } - }, - { - "instrumentation/aws_sdk": { - "package-name": "opentelemetry-instrumentation-aws_sdk", - "version-file": "lib/instrumentation/aws_sdk/version.rb" - } - }, - { - "instrumentation/lmdb": { - "package-name": "opentelemetry-instrumentation-lmdb", - "version-file": "lib/instrumentation/lmdb/version.rb" - } - }, - { - "instrumentation/http": { - "package-name": "opentelemetry-instrumentation-http", - "version-file": "lib/instrumentation/http/version.rb" - } - }, - { - "instrumentation/graphql": { - "package-name": "opentelemetry-instrumentation-graphql", - "version-file": "lib/instrumentation/graphql/version.rb" - } - }, - { - "instrumentation/http_client": { - "package-name": "opentelemetry-instrumentation-http_client", - "version-file": "lib/instrumentation/http_client/version.rb" - } - }, - { - "instrumentation/httpx": { - "package-name": "opentelemetry-instrumentation-httpx", - "version-file": "lib/instrumentation/httpx/version.rb" - } - }, - { - "instrumentation/koala": { - "package-name": "opentelemetry-instrumentation-koala", - "version-file": "lib/instrumentation/koala/version.rb" - } - }, - { - "instrumentation/active_model_serializers": { - "package-name": "opentelemetry-instrumentation-active_model_serializers", - "version-file": "lib/instrumentation/active_model_serializers/version.rb" - } - }, - { - "instrumentation/concurrent_ruby": { - "package-name": "opentelemetry-instrumentation-concurrent_ruby", - "version-file": "lib/instrumentation/concurrent_ruby/version.rb" - } - }, - { - "instrumentation/dalli": { - "package-name": "opentelemetry-instrumentation-dalli", - "version-file": "lib/instrumentation/dalli/version.rb" - } - }, - { - "instrumentation/delayed_job": { - "package-name": "opentelemetry-instrumentation-delayed_job", - "version-file": "lib/instrumentation/delayed_job/version.rb" - } - }, - { - "instrumentation/ethon": { - "package-name": "opentelemetry-instrumentation-ethon", - "version-file": "lib/instrumentation/ethon/version.rb" - } - }, - { - "instrumentation/excon": { - "package-name": "opentelemetry-instrumentation-excon", - "version-file": "lib/instrumentation/excon/version.rb" - } - }, - { - "instrumentation/faraday": { - "package-name": "opentelemetry-instrumentation-faraday", - "version-file": "lib/instrumentation/faraday/version.rb" - } - }, - { - "instrumentation/mongo": { - "package-name": "opentelemetry-instrumentation-mongo", - "version-file": "lib/instrumentation/mongo/version.rb" - } - }, - { - "instrumentation/mysql2": { - "package-name": "opentelemetry-instrumentation-mysql2", - "version-file": "lib/instrumentation/mysql2/version.rb" - } - }, - { - "instrumentation/net_http": { - "package-name": "opentelemetry-instrumentation-net_http", - "version-file": "lib/opentelemetry/instrumentation/net/http/version.rb" - } - }, - { - "instrumentation/pg": { - "package-name": "opentelemetry-instrumentation-pg", - "version-file": "lib/instrumentation/pg/version.rb" - } - }, - { - "instrumentation/que": { - "package-name": "opentelemetry-instrumentation-que", - "version-file": "lib/instrumentation/que/version.rb" - } - }, - { - "instrumentation/rack": { - "package-name": "opentelemetry-instrumentation-rack", - "version-file": "lib/instrumentation/rack/version.rb" - } - }, - { - "instrumentation/rails": { - "package-name": "opentelemetry-instrumentation-rails", - "version-file": "lib/instrumentation/rails/version.rb" - } - }, - { - "instrumentation/redis": { - "package-name": "opentelemetry-instrumentation-redis", - "version-file": "lib/instrumentation/redis/version.rb" - } - }, - { - "instrumentation/restclient": { - "package-name": "opentelemetry-instrumentation-restclient", - "version-file": "lib/instrumentation/restclient/version.rb" - } - }, - { - "instrumentation/rspec": { - "package-name": "opentelemetry-instrumentation-rspec", - "version-file": "lib/instrumentation/rspec/version.rb" - } - }, - { - "instrumentation/ruby_kafka": { - "package-name": "opentelemetry-instrumentation-ruby_kafka", - "version-file": "lib/instrumentation/ruby_kafka/version.rb" - } - }, - { - "instrumentation/sidekiq": { - "package-name": "opentelemetry-instrumentation-sidekiq", - "version-file": "lib/instrumentation/sidekiq/version.rb" - } - }, - { - "instrumentation/sinatra": { - "package-name": "opentelemetry-instrumentation-sinatra", - "version-file": "lib/instrumentation/sinatra/version.rb" - } - }, - { - "instrumentation/all": { - "package-name": "opentelemetry-instrumentation-all", - "version-file": "lib/instrumentation/all/version.rb" - } - }, - { - "propagator/ottrace": { - "package-name": "opentelemetry-propagator-ottrace", - "version-file": "lib/propagator/ottrace/version.rb" - } - }, - { - "propagator/xray": { - "package-name": "opentelemetry-propagator-xray", - "version-file": "lib/propagator/xray/version.rb" - } - }, - { - "resources/azure": { - "package-name": "opentelemetry-resources-azure", - "version-file": "lib/opentelemetry/resource/detector/azure/version.rb" - } - }, - { - "resources/container": { - "package-name": "opentelemetry-resources-container", - "version-file": "lib/opentelemetry/resource/detector/container/version.rb" - } - }, - { - "resources/google_cloud_platform": { - "package-name": "opentelemetry-resources-google_cloud_platform", - "version-file": "lib/opentelemetry/resource/detector/google_cloud_platform/version.rb" - } + "instrumentation/gruf": { + "package-name": "opentelemetry-instrumentation-gruf", + "version-file": "lib/instrumentation/gruf/version.rb" + }, + "instrumentation/grape": { + "package-name": "opentelemetry-instrumentation-grape", + "version-file": "lib/instrumentation/grape/version.rb" + }, + "instrumentation/racecar": { + "package-name": "opentelemetry-instrumentation-racecar", + "version-file": "lib/instrumentation/racecar/version.rb" + }, + "instrumentation/rake": { + "package-name": "opentelemetry-instrumentation-rake", + "version-file": "lib/instrumentation/rake/version.rb" + }, + "instrumentation/rdkafka": { + "package-name": "opentelemetry-instrumentation-rdkafka", + "version-file": "lib/instrumentation/rdkafka/version.rb" + }, + "instrumentation/trilogy": { + "package-name": "opentelemetry-instrumentation-trilogy", + "version-file": "lib/instrumentation/trilogy/version.rb" + }, + "instrumentation/active_support": { + "package-name": "opentelemetry-instrumentation-active_support", + "version-file": "lib/instrumentation/active_support/version.rb" + }, + "instrumentation/action_view": { + "package-name": "opentelemetry-instrumentation-action_view", + "version-file": "lib/instrumentation/action_view/version.rb" + }, + "instrumentation/action_pack": { + "package-name": "opentelemetry-instrumentation-action_pack", + "version-file": "lib/instrumentation/action_pack/version.rb" + }, + "instrumentation/active_job": { + "package-name": "opentelemetry-instrumentation-active_job", + "version-file": "lib/instrumentation/active_job/version.rb" + }, + "instrumentation/resque": { + "package-name": "opentelemetry-instrumentation-resque", + "version-file": "lib/instrumentation/resque/version.rb" + }, + "instrumentation/bunny": { + "package-name": "opentelemetry-instrumentation-bunny", + "version-file": "lib/instrumentation/bunny/version.rb" + }, + "instrumentation/base": { + "package-name": "opentelemetry-instrumentation-base", + "version-file": "lib/opentelemetry/instrumentation/version.rb" + }, + "instrumentation/active_record": { + "package-name": "opentelemetry-instrumentation-active_record", + "version-file": "lib/instrumentation/active_record/version.rb" + }, + "instrumentation/aws_sdk": { + "package-name": "opentelemetry-instrumentation-aws_sdk", + "version-file": "lib/instrumentation/aws_sdk/version.rb" + }, + "instrumentation/lmdb": { + "package-name": "opentelemetry-instrumentation-lmdb", + "version-file": "lib/instrumentation/lmdb/version.rb" + }, + "instrumentation/http": { + "package-name": "opentelemetry-instrumentation-http", + "version-file": "lib/instrumentation/http/version.rb" + }, + "instrumentation/graphql": { + "package-name": "opentelemetry-instrumentation-graphql", + "version-file": "lib/instrumentation/graphql/version.rb" + }, + "instrumentation/http_client": { + "package-name": "opentelemetry-instrumentation-http_client", + "version-file": "lib/instrumentation/http_client/version.rb" + }, + "instrumentation/httpx": { + "package-name": "opentelemetry-instrumentation-httpx", + "version-file": "lib/instrumentation/httpx/version.rb" + }, + "instrumentation/koala": { + "package-name": "opentelemetry-instrumentation-koala", + "version-file": "lib/instrumentation/koala/version.rb" + }, + "instrumentation/active_model_serializers": { + "package-name": "opentelemetry-instrumentation-active_model_serializers", + "version-file": "lib/instrumentation/active_model_serializers/version.rb" + }, + "instrumentation/concurrent_ruby": { + "package-name": "opentelemetry-instrumentation-concurrent_ruby", + "version-file": "lib/instrumentation/concurrent_ruby/version.rb" + }, + "instrumentation/dalli": { + "package-name": "opentelemetry-instrumentation-dalli", + "version-file": "lib/instrumentation/dalli/version.rb" + }, + "instrumentation/delayed_job": { + "package-name": "opentelemetry-instrumentation-delayed_job", + "version-file": "lib/instrumentation/delayed_job/version.rb" + }, + "instrumentation/ethon": { + "package-name": "opentelemetry-instrumentation-ethon", + "version-file": "lib/instrumentation/ethon/version.rb" + }, + "instrumentation/excon": { + "package-name": "opentelemetry-instrumentation-excon", + "version-file": "lib/instrumentation/excon/version.rb" + }, + "instrumentation/faraday": { + "package-name": "opentelemetry-instrumentation-faraday", + "version-file": "lib/instrumentation/faraday/version.rb" + }, + "instrumentation/mongo": { + "package-name": "opentelemetry-instrumentation-mongo", + "version-file": "lib/instrumentation/mongo/version.rb" + }, + "instrumentation/mysql2": { + "package-name": "opentelemetry-instrumentation-mysql2", + "version-file": "lib/instrumentation/mysql2/version.rb" + }, + "instrumentation/net_http": { + "package-name": "opentelemetry-instrumentation-net_http", + "version-file": "lib/opentelemetry/instrumentation/net/http/version.rb" + }, + "instrumentation/pg": { + "package-name": "opentelemetry-instrumentation-pg", + "version-file": "lib/instrumentation/pg/version.rb" + }, + "instrumentation/que": { + "package-name": "opentelemetry-instrumentation-que", + "version-file": "lib/instrumentation/que/version.rb" + }, + "instrumentation/rack": { + "package-name": "opentelemetry-instrumentation-rack", + "version-file": "lib/instrumentation/rack/version.rb" + }, + "instrumentation/rails": { + "package-name": "opentelemetry-instrumentation-rails", + "version-file": "lib/instrumentation/rails/version.rb" + }, + "instrumentation/redis": { + "package-name": "opentelemetry-instrumentation-redis", + "version-file": "lib/instrumentation/redis/version.rb" + }, + "instrumentation/restclient": { + "package-name": "opentelemetry-instrumentation-restclient", + "version-file": "lib/instrumentation/restclient/version.rb" + }, + "instrumentation/rspec": { + "package-name": "opentelemetry-instrumentation-rspec", + "version-file": "lib/instrumentation/rspec/version.rb" + }, + "instrumentation/ruby_kafka": { + "package-name": "opentelemetry-instrumentation-ruby_kafka", + "version-file": "lib/instrumentation/ruby_kafka/version.rb" + }, + "instrumentation/sidekiq": { + "package-name": "opentelemetry-instrumentation-sidekiq", + "version-file": "lib/instrumentation/sidekiq/version.rb" + }, + "instrumentation/sinatra": { + "package-name": "opentelemetry-instrumentation-sinatra", + "version-file": "lib/instrumentation/sinatra/version.rb" + }, + "instrumentation/all": { + "package-name": "opentelemetry-instrumentation-all", + "version-file": "lib/instrumentation/all/version.rb" + }, + "propagator/ottrace": { + "package-name": "opentelemetry-propagator-ottrace", + "version-file": "lib/propagator/ottrace/version.rb" + }, + "propagator/xray": { + "package-name": "opentelemetry-propagator-xray", + "version-file": "lib/propagator/xray/version.rb" + }, + "resources/azure": { + "package-name": "opentelemetry-resources-azure", + "version-file": "lib/opentelemetry/resource/detector/azure/version.rb" + }, + "resources/container": { + "package-name": "opentelemetry-resources-container", + "version-file": "lib/opentelemetry/resource/detector/container/version.rb" + }, + "resources/google_cloud_platform": { + "package-name": "opentelemetry-resources-google_cloud_platform", + "version-file": "lib/opentelemetry/resource/detector/google_cloud_platform/version.rb" } } } From 29806206fe53c3b5b35746a5ea1f0ce1591efa07 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 17:21:53 -0600 Subject: [PATCH 11/37] chore: Prerelease config --- release-please-config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index d68d6b1876..48a0d8c0e2 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -4,7 +4,7 @@ "draft": true, "include-component-in-tag": true, "include-v-in-tag": true, - "prerelease": false, + "prerelease": true, "release-type": "ruby", "separate-pull-requests": false, "sequential-calls": true, @@ -14,7 +14,7 @@ "packages": { "instrumentation/gruf": { "package-name": "opentelemetry-instrumentation-gruf", - "version-file": "lib/instrumentation/gruf/version.rb" + "version-file": "instrumentation/gruf/lib/instrumentation/gruf/version.rb" }, "instrumentation/grape": { "package-name": "opentelemetry-instrumentation-grape", From 9e0faccc272c86998e20086d483e85525e8fa1d3 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 17:29:35 -0600 Subject: [PATCH 12/37] chore: Fix release version paths --- release-please-config.json | 90 +++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index 48a0d8c0e2..e2f9b8bd16 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -14,51 +14,51 @@ "packages": { "instrumentation/gruf": { "package-name": "opentelemetry-instrumentation-gruf", - "version-file": "instrumentation/gruf/lib/instrumentation/gruf/version.rb" + "version-file": "lib/opentelemetry/instrumentation/gruf/version.rb" }, "instrumentation/grape": { "package-name": "opentelemetry-instrumentation-grape", - "version-file": "lib/instrumentation/grape/version.rb" + "version-file": "lib/opentelemetry/instrumentation/grape/version.rb" }, "instrumentation/racecar": { "package-name": "opentelemetry-instrumentation-racecar", - "version-file": "lib/instrumentation/racecar/version.rb" + "version-file": "lib/opentelemetry/instrumentation/racecar/version.rb" }, "instrumentation/rake": { "package-name": "opentelemetry-instrumentation-rake", - "version-file": "lib/instrumentation/rake/version.rb" + "version-file": "lib/opentelemetry/instrumentation/rake/version.rb" }, "instrumentation/rdkafka": { "package-name": "opentelemetry-instrumentation-rdkafka", - "version-file": "lib/instrumentation/rdkafka/version.rb" + "version-file": "lib/opentelemetry/instrumentation/rdkafka/version.rb" }, "instrumentation/trilogy": { "package-name": "opentelemetry-instrumentation-trilogy", - "version-file": "lib/instrumentation/trilogy/version.rb" + "version-file": "lib/opentelemetry/instrumentation/trilogy/version.rb" }, "instrumentation/active_support": { "package-name": "opentelemetry-instrumentation-active_support", - "version-file": "lib/instrumentation/active_support/version.rb" + "version-file": "lib/opentelemetry/instrumentation/active_support/version.rb" }, "instrumentation/action_view": { "package-name": "opentelemetry-instrumentation-action_view", - "version-file": "lib/instrumentation/action_view/version.rb" + "version-file": "lib/opentelemetry/instrumentation/action_view/version.rb" }, "instrumentation/action_pack": { "package-name": "opentelemetry-instrumentation-action_pack", - "version-file": "lib/instrumentation/action_pack/version.rb" + "version-file": "lib/opentelemetry/instrumentation/action_pack/version.rb" }, "instrumentation/active_job": { "package-name": "opentelemetry-instrumentation-active_job", - "version-file": "lib/instrumentation/active_job/version.rb" + "version-file": "lib/opentelemetry/instrumentation/active_job/version.rb" }, "instrumentation/resque": { "package-name": "opentelemetry-instrumentation-resque", - "version-file": "lib/instrumentation/resque/version.rb" + "version-file": "lib/opentelemetry/instrumentation/resque/version.rb" }, "instrumentation/bunny": { "package-name": "opentelemetry-instrumentation-bunny", - "version-file": "lib/instrumentation/bunny/version.rb" + "version-file": "lib/opentelemetry/instrumentation/bunny/version.rb" }, "instrumentation/base": { "package-name": "opentelemetry-instrumentation-base", @@ -66,71 +66,71 @@ }, "instrumentation/active_record": { "package-name": "opentelemetry-instrumentation-active_record", - "version-file": "lib/instrumentation/active_record/version.rb" + "version-file": "lib/opentelemetry/instrumentation/active_record/version.rb" }, "instrumentation/aws_sdk": { "package-name": "opentelemetry-instrumentation-aws_sdk", - "version-file": "lib/instrumentation/aws_sdk/version.rb" + "version-file": "lib/opentelemetry/instrumentation/aws_sdk/version.rb" }, "instrumentation/lmdb": { "package-name": "opentelemetry-instrumentation-lmdb", - "version-file": "lib/instrumentation/lmdb/version.rb" + "version-file": "lib/opentelemetry/instrumentation/lmdb/version.rb" }, "instrumentation/http": { "package-name": "opentelemetry-instrumentation-http", - "version-file": "lib/instrumentation/http/version.rb" + "version-file": "lib/opentelemetry/instrumentation/http/version.rb" }, "instrumentation/graphql": { "package-name": "opentelemetry-instrumentation-graphql", - "version-file": "lib/instrumentation/graphql/version.rb" + "version-file": "lib/opentelemetry/instrumentation/graphql/version.rb" }, "instrumentation/http_client": { "package-name": "opentelemetry-instrumentation-http_client", - "version-file": "lib/instrumentation/http_client/version.rb" + "version-file": "lib/opentelemetry/instrumentation/http_client/version.rb" }, "instrumentation/httpx": { "package-name": "opentelemetry-instrumentation-httpx", - "version-file": "lib/instrumentation/httpx/version.rb" + "version-file": "lib/opentelemetry/instrumentation/httpx/version.rb" }, "instrumentation/koala": { "package-name": "opentelemetry-instrumentation-koala", - "version-file": "lib/instrumentation/koala/version.rb" + "version-file": "lib/opentelemetry/instrumentation/koala/version.rb" }, "instrumentation/active_model_serializers": { "package-name": "opentelemetry-instrumentation-active_model_serializers", - "version-file": "lib/instrumentation/active_model_serializers/version.rb" + "version-file": "lib/opentelemetry/instrumentation/active_model_serializers/version.rb" }, "instrumentation/concurrent_ruby": { "package-name": "opentelemetry-instrumentation-concurrent_ruby", - "version-file": "lib/instrumentation/concurrent_ruby/version.rb" + "version-file": "lib/opentelemetry/instrumentation/concurrent_ruby/version.rb" }, "instrumentation/dalli": { "package-name": "opentelemetry-instrumentation-dalli", - "version-file": "lib/instrumentation/dalli/version.rb" + "version-file": "lib/opentelemetry/instrumentation/dalli/version.rb" }, "instrumentation/delayed_job": { "package-name": "opentelemetry-instrumentation-delayed_job", - "version-file": "lib/instrumentation/delayed_job/version.rb" + "version-file": "lib/opentelemetry/instrumentation/delayed_job/version.rb" }, "instrumentation/ethon": { "package-name": "opentelemetry-instrumentation-ethon", - "version-file": "lib/instrumentation/ethon/version.rb" + "version-file": "lib/opentelemetry/instrumentation/ethon/version.rb" }, "instrumentation/excon": { "package-name": "opentelemetry-instrumentation-excon", - "version-file": "lib/instrumentation/excon/version.rb" + "version-file": "lib/opentelemetry/instrumentation/excon/version.rb" }, "instrumentation/faraday": { "package-name": "opentelemetry-instrumentation-faraday", - "version-file": "lib/instrumentation/faraday/version.rb" + "version-file": "lib/opentelemetry/instrumentation/faraday/version.rb" }, "instrumentation/mongo": { "package-name": "opentelemetry-instrumentation-mongo", - "version-file": "lib/instrumentation/mongo/version.rb" + "version-file": "lib/opentelemetry/instrumentation/mongo/version.rb" }, "instrumentation/mysql2": { "package-name": "opentelemetry-instrumentation-mysql2", - "version-file": "lib/instrumentation/mysql2/version.rb" + "version-file": "lib/opentelemetry/instrumentation/mysql2/version.rb" }, "instrumentation/net_http": { "package-name": "opentelemetry-instrumentation-net_http", @@ -138,66 +138,66 @@ }, "instrumentation/pg": { "package-name": "opentelemetry-instrumentation-pg", - "version-file": "lib/instrumentation/pg/version.rb" + "version-file": "lib/opentelemetry/instrumentation/pg/version.rb" }, "instrumentation/que": { "package-name": "opentelemetry-instrumentation-que", - "version-file": "lib/instrumentation/que/version.rb" + "version-file": "lib/opentelemetry/instrumentation/que/version.rb" }, "instrumentation/rack": { "package-name": "opentelemetry-instrumentation-rack", - "version-file": "lib/instrumentation/rack/version.rb" + "version-file": "lib/opentelemetry/instrumentation/rack/version.rb" }, "instrumentation/rails": { "package-name": "opentelemetry-instrumentation-rails", - "version-file": "lib/instrumentation/rails/version.rb" + "version-file": "lib/opentelemetry/instrumentation/rails/version.rb" }, "instrumentation/redis": { "package-name": "opentelemetry-instrumentation-redis", - "version-file": "lib/instrumentation/redis/version.rb" + "version-file": "lib/opentelemetry/instrumentation/redis/version.rb" }, "instrumentation/restclient": { "package-name": "opentelemetry-instrumentation-restclient", - "version-file": "lib/instrumentation/restclient/version.rb" + "version-file": "lib/opentelemetry/instrumentation/restclient/version.rb" }, "instrumentation/rspec": { "package-name": "opentelemetry-instrumentation-rspec", - "version-file": "lib/instrumentation/rspec/version.rb" + "version-file": "lib/opentelemetry/instrumentation/rspec/version.rb" }, "instrumentation/ruby_kafka": { "package-name": "opentelemetry-instrumentation-ruby_kafka", - "version-file": "lib/instrumentation/ruby_kafka/version.rb" + "version-file": "lib/opentelemetry/instrumentation/ruby_kafka/version.rb" }, "instrumentation/sidekiq": { "package-name": "opentelemetry-instrumentation-sidekiq", - "version-file": "lib/instrumentation/sidekiq/version.rb" + "version-file": "lib/opentelemetry/instrumentation/sidekiq/version.rb" }, "instrumentation/sinatra": { "package-name": "opentelemetry-instrumentation-sinatra", - "version-file": "lib/instrumentation/sinatra/version.rb" + "version-file": "lib/opentelemetry/instrumentation/sinatra/version.rb" }, "instrumentation/all": { "package-name": "opentelemetry-instrumentation-all", - "version-file": "lib/instrumentation/all/version.rb" + "version-file": "lib/opentelemetry/instrumentation/all/version.rb" }, "propagator/ottrace": { "package-name": "opentelemetry-propagator-ottrace", - "version-file": "lib/propagator/ottrace/version.rb" + "version-file": "lib/opentelemetry/propagator/ottrace/version.rb" }, "propagator/xray": { "package-name": "opentelemetry-propagator-xray", - "version-file": "lib/propagator/xray/version.rb" + "version-file": "lib/opentelemetry/propagator/xray/version.rb" }, "resources/azure": { - "package-name": "opentelemetry-resources-azure", + "package-name": "opentelemetry-resource-detector-azure", "version-file": "lib/opentelemetry/resource/detector/azure/version.rb" }, "resources/container": { - "package-name": "opentelemetry-resources-container", + "package-name": "opentelemetry-resource-detector-container", "version-file": "lib/opentelemetry/resource/detector/container/version.rb" }, "resources/google_cloud_platform": { - "package-name": "opentelemetry-resources-google_cloud_platform", + "package-name": "opentelemetry-resource-detector-google_cloud_platform", "version-file": "lib/opentelemetry/resource/detector/google_cloud_platform/version.rb" } } From 26dc334cfeca537eff2f7a93780824c701c6b907 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 17:35:11 -0600 Subject: [PATCH 13/37] chore: try again --- .release-please-manifest.json | 94 +++++++++++++++++------------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index e43e403475..7adc63ff67 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,49 +1,49 @@ { - "opentelmentry-instrumentation-gruf": "0.1.1", - "opentelmentry-instrumentation-grape": "0.1.6", - "opentelmentry-instrumentation-racecar": "0.3.0", - "opentelmentry-instrumentation-rake": "0.2.1", - "opentelmentry-instrumentation-rdkafka": "0.4.2", - "opentelmentry-instrumentation-trilogy": "0.57.0", - "opentelmentry-instrumentation-active_support": "0.5.1", - "opentelmentry-instrumentation-action_view": "0.7.0", - "opentelmentry-instrumentation-action_pack": "0.8.0", - "opentelmentry-instrumentation-active_job": "0.7.1", - "opentelmentry-instrumentation-resque": "0.5.0", - "opentelmentry-instrumentation-bunny": "0.21.1", - "opentelmentry-instrumentation-base": "0.22.3", - "opentelmentry-instrumentation-active_record": "0.7.0", - "opentelmentry-instrumentation-aws_sdk": "0.5.0", - "opentelmentry-instrumentation-lmdb": "0.22.1", - "opentelmentry-instrumentation-http": "0.23.2", - "opentelmentry-instrumentation-graphql": "0.27.0", - "opentelmentry-instrumentation-http_client": "0.22.3", - "opentelmentry-instrumentation-httpx": "0.1.1", - "opentelmentry-instrumentation-koala": "0.20.2", - "opentelmentry-instrumentation-active_model_serializers": "0.20.1", - "opentelmentry-instrumentation-concurrent_ruby": "0.21.2", - "opentelmentry-instrumentation-dalli": "0.25.0", - "opentelmentry-instrumentation-delayed_job": "0.22.1", - "opentelmentry-instrumentation-ethon": "0.21.3", - "opentelmentry-instrumentation-excon": "0.22.0", - "opentelmentry-instrumentation-faraday": "0.23.4", - "opentelmentry-instrumentation-mongo": "0.22.2", - "opentelmentry-instrumentation-mysql2": "0.25.0", - "opentelmentry-instrumentation-net_http": "0.22.4", - "opentelmentry-instrumentation-pg": "0.26.1", - "opentelmentry-instrumentation-que": "0.7.1", - "opentelmentry-instrumentation-rack": "0.23.5", - "opentelmentry-instrumentation-rails": "0.29.1", - "opentelmentry-instrumentation-redis": "0.25.3", - "opentelmentry-instrumentation-restclient": "0.22.3", - "opentelmentry-instrumentation-rspec": "0.3.2", - "opentelmentry-instrumentation-ruby_kafka": "0.21.0", - "opentelmentry-instrumentation-sidekiq": "0.25.0", - "opentelmentry-instrumentation-sinatra": "0.23.2", - "opentelmentry-instrumentation-all": "0.54.0", - "opentelemetry-propagator-ottrace": "0.21.2", - "opentelemetry-propagator-xray": "0.22.1", - "opentelemetry-resource-detector-azure": "0.1.0", - "opentelemetry-resource-detector-container": "0.1.1", - "opentelemetry-resource-detector-google_cloud_platform": "0.1.0" + "instrumentation/gruf": "0.1.1", + "instrumentation/grape": "0.1.6", + "instrumentation/racecar": "0.3.0", + "instrumentation/rake": "0.2.1", + "instrumentation/rdkafka": "0.4.2", + "instrumentation/trilogy": "0.57.0", + "instrumentation/active_support": "0.5.1", + "instrumentation/action_view": "0.7.0", + "instrumentation/action_pack": "0.8.0", + "instrumentation/active_job": "0.7.1", + "instrumentation/resque": "0.5.0", + "instrumentation/bunny": "0.21.1", + "instrumentation/base": "0.22.3", + "instrumentation/active_record": "0.7.0", + "instrumentation/aws_sdk": "0.5.0", + "instrumentation/lmdb": "0.22.1", + "instrumentation/http": "0.23.2", + "instrumentation/graphql": "0.27.0", + "instrumentation/http_client": "0.22.3", + "instrumentation/httpx": "0.1.1", + "instrumentation/koala": "0.20.2", + "instrumentation/active_model_serializers": "0.20.1", + "instrumentation/concurrent_ruby": "0.21.2", + "instrumentation/dalli": "0.25.0", + "instrumentation/delayed_job": "0.22.1", + "instrumentation/ethon": "0.21.3", + "instrumentation/excon": "0.22.0", + "instrumentation/faraday": "0.23.4", + "instrumentation/mongo": "0.22.2", + "instrumentation/mysql2": "0.25.0", + "instrumentation/net_http": "0.22.4", + "instrumentation/pg": "0.26.1", + "instrumentation/que": "0.7.1", + "instrumentation/rack": "0.23.5", + "instrumentation/rails": "0.29.1", + "instrumentation/redis": "0.25.3", + "instrumentation/restclient": "0.22.3", + "instrumentation/rspec": "0.3.2", + "instrumentation/ruby_kafka": "0.21.0", + "instrumentation/sidekiq": "0.25.0", + "instrumentation/sinatra": "0.23.2", + "instrumentation/all": "0.54.0", + "propagator/ottrace": "0.21.2", + "propagator/xray": "0.22.1", + "resources/azure": "0.1.0", + "resources/container": "0.1.1", + "resources/google_cloud_platform": "0.1.0" } From 2cf1eba2bbf35a9a0819cb95967d309b82d62e75 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 17:41:32 -0600 Subject: [PATCH 14/37] chore: Block matrix from running if no release were created --- .github/workflows/release-please.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index a8da8927a9..b2b90b3693 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -34,6 +34,7 @@ jobs: max-parallel: 1 matrix: path: ${{ fromJson(needs.release.outputs.paths_released) }} + if: ${{ needs.release.outputs.releases_created }} steps: - name: Checkout repository From f2865aeb26a85ce0a22c997042994c8e6cc32f39 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 17:51:34 -0600 Subject: [PATCH 15/37] chore: try https://github.com/orgs/community/discussions/27096 --- .github/workflows/release-please.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index b2b90b3693..b264dfb4c0 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -27,14 +27,13 @@ jobs: needs: release name: Publish Gems runs-on: ubuntu-latest - if: ${{ needs.release.outputs.releases_created }} + if: ${{ needs.release.outputs.paths_released != '[]'}} strategy: fail-fast: false max-parallel: 1 matrix: path: ${{ fromJson(needs.release.outputs.paths_released) }} - if: ${{ needs.release.outputs.releases_created }} steps: - name: Checkout repository From d3fc5413e3494c09207625cc5b6d578346baff1d Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 22 Dec 2023 17:54:46 -0600 Subject: [PATCH 16/37] chore: remove superflous action config --- .github/workflows/release-please.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index b264dfb4c0..a05c3b71a3 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -20,7 +20,6 @@ jobs: id: release outputs: - releases_created: ${{ steps.release.outputs.releases_created }} paths_released: ${{ steps.release.outputs.paths_released }} publish: From 562f6490653fc862e68a3c05efd4fc574d694e20 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Sat, 23 Dec 2023 10:21:43 -0600 Subject: [PATCH 17/37] feat(rack)! Use Rack Events By Default (#709) * feat(rack)! Use Rack Events By Default I have been running the `Rack::Events` based instrumentation in our production workloads since 2023-10-23. There is no noticeable difference in performance, however applications using `Rack::BodyProxy` to stream responses will notice a slight increase in latency since it will include timings writing response output to the socket. * squash: fix invalid HTTP responses in tests * squash: Remove redundant test * squash: Update rack error description * Update instrumentation.rb Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com> --------- Co-authored-by: Kayla Reopelle (she/her) <87386821+kaylareopelle@users.noreply.github.com> --- .../action_pack/test/test_helpers/app_config.rb | 4 +--- .../test_helpers/middlewares/redirect_middleware.rb | 2 +- .../opentelemetry/instrumentation/grape_test.rb | 4 ++-- instrumentation/rack/example/trace_demonstration.rb | 2 +- .../rack/example/trace_demonstration2.rb | 2 +- .../rack/example/trace_demonstration3.rb | 2 +- .../instrumentation/rack/instrumentation.rb | 4 ++-- .../rack/middlewares/event_handler.rb | 2 +- .../instrumentation/rack/instrumentation_test.rb | 2 +- .../instrumentation/rails/instrumentation_test.rb | 13 ------------- 10 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 instrumentation/rails/test/instrumentation/opentelemetry/instrumentation/rails/instrumentation_test.rb diff --git a/instrumentation/action_pack/test/test_helpers/app_config.rb b/instrumentation/action_pack/test/test_helpers/app_config.rb index 8874d61e25..f00733ad44 100644 --- a/instrumentation/action_pack/test/test_helpers/app_config.rb +++ b/instrumentation/action_pack/test/test_helpers/app_config.rb @@ -48,9 +48,7 @@ def initialize_app(use_exceptions_app: false, remove_rack_tracer_middleware: fal private def remove_rack_middleware(application) - application.middleware.delete( - OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware - ) + application.middleware.delete(Rack::Events) end def add_exceptions_app(application) diff --git a/instrumentation/action_pack/test/test_helpers/middlewares/redirect_middleware.rb b/instrumentation/action_pack/test/test_helpers/middlewares/redirect_middleware.rb index c531fe3dda..da843c704e 100644 --- a/instrumentation/action_pack/test/test_helpers/middlewares/redirect_middleware.rb +++ b/instrumentation/action_pack/test/test_helpers/middlewares/redirect_middleware.rb @@ -10,7 +10,7 @@ def initialize(app, _options = {}) end def call(env) - return [307, {}, 'Temporary Redirect'] if should_redirect?(env) + return [307, { 'Location' => '/ok', 'Content-Type' => 'text/plain' }, ['Temporary Redirect']] if should_redirect?(env) @app.call(env) end diff --git a/instrumentation/grape/test/opentelemetry/instrumentation/grape_test.rb b/instrumentation/grape/test/opentelemetry/instrumentation/grape_test.rb index 0e7ab4850b..f9d6744cd6 100644 --- a/instrumentation/grape/test/opentelemetry/instrumentation/grape_test.rb +++ b/instrumentation/grape/test/opentelemetry/instrumentation/grape_test.rb @@ -272,7 +272,7 @@ class RaisedErrorAPI < Grape::API it 'sets span status to error' do _(span.name).must_equal expected_span_name _(span.status.code).must_equal OpenTelemetry::Trace::Status::ERROR - _(span.status.description).must_equal "Unhandled exception of type: #{expected_error_type}" + _(span.status.description).must_equal expected_error_type end it 'records the exception event' do @@ -316,7 +316,7 @@ class ErrorInFilterAPI < Grape::API it 'sets span status to error' do _(span.name).must_equal expected_span_name _(span.status.code).must_equal OpenTelemetry::Trace::Status::ERROR - _(span.status.description).must_equal "Unhandled exception of type: #{expected_error_type}" + _(span.status.description).must_equal expected_error_type end it 'records the exception event' do diff --git a/instrumentation/rack/example/trace_demonstration.rb b/instrumentation/rack/example/trace_demonstration.rb index e6253f57cf..02fc8a7128 100644 --- a/instrumentation/rack/example/trace_demonstration.rb +++ b/instrumentation/rack/example/trace_demonstration.rb @@ -18,7 +18,7 @@ builder = Rack::Builder.app do # integration should be automatic in web frameworks (like rails), # but for a plain Rack application, enable it in your config.ru, e.g., - use OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware + use ::Rack::Events, [OpenTelemetry::Instrumentation::Rack::Middlewares::EventHandler.new] app = ->(_env) { [200, { 'Content-Type' => 'text/plain' }, ['All responses are OK']] } run app diff --git a/instrumentation/rack/example/trace_demonstration2.rb b/instrumentation/rack/example/trace_demonstration2.rb index c6ac649e9e..66941cfb07 100644 --- a/instrumentation/rack/example/trace_demonstration2.rb +++ b/instrumentation/rack/example/trace_demonstration2.rb @@ -24,7 +24,7 @@ end # integrate instrumentation explicitly: -builder.use OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware +builder.use ::Rack::Events, [OpenTelemetry::Instrumentation::Rack::Middlewares::EventHandler.new] # demonstrate tracing (span output to console): puts Rack::MockRequest.new(builder).get('/') diff --git a/instrumentation/rack/example/trace_demonstration3.rb b/instrumentation/rack/example/trace_demonstration3.rb index a444ecfebe..38226a72a1 100644 --- a/instrumentation/rack/example/trace_demonstration3.rb +++ b/instrumentation/rack/example/trace_demonstration3.rb @@ -19,7 +19,7 @@ builder = Rack::Builder.app do # integration should be automatic in web frameworks (like rails), # but for a plain Rack application, enable it in your config.ru, e.g., - use OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware + use ::Rack::Events, [OpenTelemetry::Instrumentation::Rack::Middlewares::EventHandler.new] app = ->(_env) { [200, { 'Content-Type' => 'text/plain' }, ['All responses are OK']] } run app diff --git a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/instrumentation.rb b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/instrumentation.rb index 35be3a5199..91e1f9f330 100644 --- a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/instrumentation.rb +++ b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/instrumentation.rb @@ -28,8 +28,8 @@ class Instrumentation < OpenTelemetry::Instrumentation::Base option :url_quantization, default: nil, validate: :callable option :untraced_requests, default: nil, validate: :callable option :response_propagators, default: [], validate: :array - # This option is only valid for applicaitons using Rack 2.0 or greater - option :use_rack_events, default: false, validate: :boolean + # This option is only valid for applications using Rack 2.0 or greater + option :use_rack_events, default: true, validate: :boolean # Temporary Helper for Sinatra and ActionPack middleware to use during installation # diff --git a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb index 80096c77f1..74bdb90052 100644 --- a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb +++ b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb @@ -90,7 +90,7 @@ def on_error(request, _, error) return unless span.recording? span.record_exception(error) - span.status = OpenTelemetry::Trace::Status.error + span.status = OpenTelemetry::Trace::Status.error(error.class.name) rescue StandardError => e OpenTelemetry.handle_error(exception: e) end diff --git a/instrumentation/rack/test/opentelemetry/instrumentation/rack/instrumentation_test.rb b/instrumentation/rack/test/opentelemetry/instrumentation/rack/instrumentation_test.rb index 3e95292451..2a0cf5d6dd 100644 --- a/instrumentation/rack/test/opentelemetry/instrumentation/rack/instrumentation_test.rb +++ b/instrumentation/rack/test/opentelemetry/instrumentation/rack/instrumentation_test.rb @@ -32,7 +32,7 @@ _(instrumentation.config[:url_quantization]).must_be_nil _(instrumentation.config[:untraced_requests]).must_be_nil _(instrumentation.config[:response_propagators]).must_be_empty - _(instrumentation.config[:use_rack_events]).must_equal false + _(instrumentation.config[:use_rack_events]).must_equal true end end diff --git a/instrumentation/rails/test/instrumentation/opentelemetry/instrumentation/rails/instrumentation_test.rb b/instrumentation/rails/test/instrumentation/opentelemetry/instrumentation/rails/instrumentation_test.rb deleted file mode 100644 index bae64a5b66..0000000000 --- a/instrumentation/rails/test/instrumentation/opentelemetry/instrumentation/rails/instrumentation_test.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -# Copyright The OpenTelemetry Authors -# -# SPDX-License-Identifier: Apache-2.0 - -require 'test_helper' - -describe OpenTelemetry::Instrumentation::Rails::Instrumentation do - it 'adds the rack tracing middleware' do - _(DEFAULT_RAILS_APP.config.middleware).must_include OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware - end -end From 586b0fb137d430e2b826f3814723dd61c8d82ff1 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Tue, 2 Jan 2024 14:41:46 -0600 Subject: [PATCH 18/37] ci: Use Org OTel Bot Token (#789) The Org Level OTel Bot Token likely a PAT, which will allow PRs opened by GH actions to trigger subsequent actions workflows. This will fix the problem where CI jobs do not run when the bot opens a PR for release requests. --- .github/workflows/release-hook-on-closed.yml | 2 +- .github/workflows/release-hook-on-push.yml | 2 +- .github/workflows/release-perform.yml | 2 +- .github/workflows/release-please.yaml | 2 ++ .github/workflows/release-request.yml | 2 +- .github/workflows/release-retry.yml | 2 +- .github/workflows/stale.yaml | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml index 6a80f4146b..decb167038 100644 --- a/.github/workflows/release-hook-on-closed.yml +++ b/.github/workflows/release-hook-on-closed.yml @@ -21,7 +21,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Process release request env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} run: | toys release _onclosed --verbose \ "--enable-releases=${{ secrets.ENABLE_RELEASES }}" \ diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml index d3a85043de..c7a5c0b920 100644 --- a/.github/workflows/release-hook-on-push.yml +++ b/.github/workflows/release-hook-on-push.yml @@ -22,7 +22,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Update open releases env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} run: | toys release _onpush --verbose \ < /dev/null diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml index 60ebeaee57..44e888c211 100644 --- a/.github/workflows/release-perform.yml +++ b/.github/workflows/release-perform.yml @@ -31,7 +31,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Perform release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} run: | toys release perform --yes --verbose \ "--enable-releases=${{ secrets.ENABLE_RELEASES }}" \ diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index a05c3b71a3..38b327ccc0 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -18,6 +18,8 @@ jobs: steps: - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e id: release + with: + token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} outputs: paths_released: ${{ steps.release.outputs.paths_released }} diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml index 00997a9ba2..72396aecc3 100644 --- a/.github/workflows/release-request.yml +++ b/.github/workflows/release-request.yml @@ -25,7 +25,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Open release pull request env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} run: | toys release request --yes --verbose \ "--gems=${{ github.event.inputs.gems }}" \ diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml index 381987aec7..c6fffa61d5 100644 --- a/.github/workflows/release-retry.yml +++ b/.github/workflows/release-retry.yml @@ -28,7 +28,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Retry release env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} run: | toys release retry --yes --verbose \ "--enable-releases=${{ secrets.ENABLE_RELEASES }}" \ diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index 5357eb6900..82b7e5c62d 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/stale@v9 name: Clean up stale issues and PRs with: - repo-token: ${{ secrets.GITHUB_TOKEN }} + repo-token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} stale-issue-message: "👋 This issue has been marked as stale because it has been open with no activity. You can: comment on the issue or remove the stale label to hold stale off for a while, add the `keep` label to hold stale off permanently, or do nothing. If you do nothing this issue will be closed eventually by the stale bot." stale-issue-label: "stale" exempt-issue-labels: "keep" From 294c20003d803d1046f37d5d45973cc75546a974 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Tue, 2 Jan 2024 18:20:37 -0600 Subject: [PATCH 19/37] Revert "ci: Use Org OTel Bot Token (#789)" (#790) This reverts commit 586b0fb137d430e2b826f3814723dd61c8d82ff1. --- .github/workflows/release-hook-on-closed.yml | 2 +- .github/workflows/release-hook-on-push.yml | 2 +- .github/workflows/release-perform.yml | 2 +- .github/workflows/release-please.yaml | 2 -- .github/workflows/release-request.yml | 2 +- .github/workflows/release-retry.yml | 2 +- .github/workflows/stale.yaml | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml index decb167038..6a80f4146b 100644 --- a/.github/workflows/release-hook-on-closed.yml +++ b/.github/workflows/release-hook-on-closed.yml @@ -21,7 +21,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Process release request env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | toys release _onclosed --verbose \ "--enable-releases=${{ secrets.ENABLE_RELEASES }}" \ diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml index c7a5c0b920..d3a85043de 100644 --- a/.github/workflows/release-hook-on-push.yml +++ b/.github/workflows/release-hook-on-push.yml @@ -22,7 +22,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Update open releases env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | toys release _onpush --verbose \ < /dev/null diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml index 44e888c211..60ebeaee57 100644 --- a/.github/workflows/release-perform.yml +++ b/.github/workflows/release-perform.yml @@ -31,7 +31,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Perform release env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | toys release perform --yes --verbose \ "--enable-releases=${{ secrets.ENABLE_RELEASES }}" \ diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index 38b327ccc0..a05c3b71a3 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -18,8 +18,6 @@ jobs: steps: - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e id: release - with: - token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} outputs: paths_released: ${{ steps.release.outputs.paths_released }} diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml index 72396aecc3..00997a9ba2 100644 --- a/.github/workflows/release-request.yml +++ b/.github/workflows/release-request.yml @@ -25,7 +25,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Open release pull request env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | toys release request --yes --verbose \ "--gems=${{ github.event.inputs.gems }}" \ diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml index c6fffa61d5..381987aec7 100644 --- a/.github/workflows/release-retry.yml +++ b/.github/workflows/release-retry.yml @@ -28,7 +28,7 @@ jobs: run: "gem install --no-document toys -v 0.15.3" - name: Retry release env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | toys release retry --yes --verbose \ "--enable-releases=${{ secrets.ENABLE_RELEASES }}" \ diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index 82b7e5c62d..5357eb6900 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/stale@v9 name: Clean up stale issues and PRs with: - repo-token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: "👋 This issue has been marked as stale because it has been open with no activity. You can: comment on the issue or remove the stale label to hold stale off for a while, add the `keep` label to hold stale off permanently, or do nothing. If you do nothing this issue will be closed eventually by the stale bot." stale-issue-label: "stale" exempt-issue-labels: "keep" From 9924715543587333617befc7ee1de1b27aa5d058 Mon Sep 17 00:00:00 2001 From: "Ben Sheldon [he/him]" Date: Thu, 4 Jan 2024 20:22:37 -0800 Subject: [PATCH 20/37] Trilogy: only set `db.instance.id` attribute if there is a value (#792) --- .../lib/opentelemetry/instrumentation/trilogy/patches/client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/patches/client.rb b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/patches/client.rb index c155a7a401..4a74c44803 100644 --- a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/patches/client.rb +++ b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/patches/client.rb @@ -91,7 +91,7 @@ def client_attributes(sql = nil) attributes[::OpenTelemetry::SemanticConventions::Trace::DB_NAME] = database_name if database_name attributes[::OpenTelemetry::SemanticConventions::Trace::DB_USER] = database_user if database_user attributes[::OpenTelemetry::SemanticConventions::Trace::PEER_SERVICE] = config[:peer_service] unless config[:peer_service].nil? - attributes['db.instance.id'] = @connected_host if defined?(@connected_host) + attributes['db.instance.id'] = @connected_host unless @connected_host.nil? if sql case config[:db_statement] From 8b790a1d4b5801bafe71b654bc8a933af21f76c7 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Thu, 4 Jan 2024 23:55:30 -0600 Subject: [PATCH 21/37] fix: Trilogy only set db.instance.id attribute if there is a value (#792) --- instrumentation/trilogy/README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/instrumentation/trilogy/README.md b/instrumentation/trilogy/README.md index 10259f6281..4bbd0be7ac 100644 --- a/instrumentation/trilogy/README.md +++ b/instrumentation/trilogy/README.md @@ -51,6 +51,19 @@ OpenTelemetry::Instrumentation::Trilogy.with_attributes('pizzatoppings' => 'mush end ``` +## Semantic Conventions + +This instrumentation generally uses [Database semantic conventions](https://opentelemetry.io/docs/specs/semconv/database/database-spans/). + +| Attribute Name | Type | Notes | +| - | - | - | +| `db.instance.id` | String | The name of the DB host executing the query e.g. `SELECT @@hostname` | +| `db.name` | String | The name of the database from connection_options | +| `db.statement` | String | SQL statement being executed | +| `db.user` | String | The username from connection_options | +| `db.system` | String | `mysql` | +| `net.peer.name` | String | The name of the remote host from connection_options | + ## How can I get involved? The `opentelemetry-instrumentation-trilogy` gem source is [on github][repo-github], along with related gems including `opentelemetry-api` and `opentelemetry-sdk`. From 3b33f193ce1a62011ddab50c9f1dcf60311db752 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 00:09:52 -0600 Subject: [PATCH 22/37] ci: OTel Bot Token Redux --- .github/workflows/release-please.yaml | 3 ++- release-please-config.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index a05c3b71a3..2747be09fb 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -18,7 +18,8 @@ jobs: steps: - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e id: release - + with: + token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} outputs: paths_released: ${{ steps.release.outputs.paths_released }} diff --git a/release-please-config.json b/release-please-config.json index e2f9b8bd16..022572d773 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -8,7 +8,7 @@ "release-type": "ruby", "separate-pull-requests": false, "sequential-calls": true, - "signoff": "OpenTelemetry Bot ", + "signoff": "OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com>", "skip-github-release": false, "tag-separator": " ", "packages": { From f7f46037bdda286a25763a31ae5236c947f060ed Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 00:33:55 -0600 Subject: [PATCH 23/37] feat!: Use Rack Events By Default --- instrumentation/rack/README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/instrumentation/rack/README.md b/instrumentation/rack/README.md index f154e504fc..1c66728299 100644 --- a/instrumentation/rack/README.md +++ b/instrumentation/rack/README.md @@ -42,6 +42,23 @@ OpenTelemetry::SDK.configure do |c| c.use_all end ``` + +## Rack Middleware vs Rack Events + +Since `v0.24.0`, this instrumentation uses `Rake::Events` as opposed to `Middleware` to support Requests that use Buffered Response Bodies. + +If your application does not support `Rack::Events`, you may disable it by setting `use_rack_events: false`, e.g. + +```ruby +OpenTelemetry::SDK.configure do |c| + c.use 'OpenTelemetry::Instrumentation::Rack', use_rack_events: false +end +``` + +This will switch to using `Rack::Middleware` by default in dependent instrumentations. + +See [#342](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/342) for more details. + ## Controlling span name cardinality By default we will set the rack span name to match the format "HTTP #{method}" (ie. HTTP GET). There are different ways to control span names with this instrumentation. From f332782d97842979b5effea292a11a2203a55268 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 09:18:59 -0600 Subject: [PATCH 24/37] ci: Revert token again --- .github/workflows/release-please.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index 2747be09fb..a05c3b71a3 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -18,8 +18,7 @@ jobs: steps: - uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e id: release - with: - token: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + outputs: paths_released: ${{ steps.release.outputs.paths_released }} From 9d8788b8b27f4492eba9d6f60cafcee95ecad148 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:19:38 -0600 Subject: [PATCH 25/37] chore: release main (#793) * chore: release main * feat: Update Trilogy and Rack --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Ariel Valentin --- .release-please-manifest.json | 4 ++-- .../opentelemetry-instrumentation-all.gemspec | 4 ++-- instrumentation/rack/CHANGELOG.md | 16 ++++++++++++++++ .../instrumentation/rack/version.rb | 2 +- instrumentation/trilogy/CHANGELOG.md | 16 ++++++++++++++++ .../instrumentation/trilogy/version.rb | 2 +- 6 files changed, 38 insertions(+), 6 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 7adc63ff67..0ff91bc999 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -4,7 +4,7 @@ "instrumentation/racecar": "0.3.0", "instrumentation/rake": "0.2.1", "instrumentation/rdkafka": "0.4.2", - "instrumentation/trilogy": "0.57.0", + "instrumentation/trilogy": "0.58.0", "instrumentation/active_support": "0.5.1", "instrumentation/action_view": "0.7.0", "instrumentation/action_pack": "0.8.0", @@ -32,7 +32,7 @@ "instrumentation/net_http": "0.22.4", "instrumentation/pg": "0.26.1", "instrumentation/que": "0.7.1", - "instrumentation/rack": "0.23.5", + "instrumentation/rack": "0.24.0", "instrumentation/rails": "0.29.1", "instrumentation/redis": "0.25.3", "instrumentation/restclient": "0.22.3", diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec index 95e8c667b7..b538d6fd16 100644 --- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec +++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec @@ -48,7 +48,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-instrumentation-pg', '~> 0.26.0' spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.7.0' spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.3.0' - spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.23.1' + spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.24.0' spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.29.0' spec.add_dependency 'opentelemetry-instrumentation-rake', '~> 0.2.1' spec.add_dependency 'opentelemetry-instrumentation-rdkafka', '~> 0.4.0' @@ -58,7 +58,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-instrumentation-ruby_kafka', '~> 0.21.0' spec.add_dependency 'opentelemetry-instrumentation-sidekiq', '~> 0.25.0' spec.add_dependency 'opentelemetry-instrumentation-sinatra', '~> 0.23.1' - spec.add_dependency 'opentelemetry-instrumentation-trilogy', '~> 0.57.0' + spec.add_dependency 'opentelemetry-instrumentation-trilogy', '~> 0.58.0' spec.add_development_dependency 'active_model_serializers' spec.add_development_dependency 'activesupport' diff --git a/instrumentation/rack/CHANGELOG.md b/instrumentation/rack/CHANGELOG.md index 3df214395a..c45674ed54 100644 --- a/instrumentation/rack/CHANGELOG.md +++ b/instrumentation/rack/CHANGELOG.md @@ -1,5 +1,21 @@ # Release History: opentelemetry-instrumentation-rack +## [0.24.0](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-rack/v0.23.5...opentelemetry-instrumentation-rack/v0.24.0) (2024-01-05) + + +### ⚠ BREAKING CHANGES + +* Use Rack Events By Default + +### Features + +* Use Rack Events By Default ([f7f4603](https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/f7f46037bdda286a25763a31ae5236c947f060ed)) + + +### Bug Fixes + +* Backport Rack proxy event to middleware ([#764](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/764)) ([3d0f818](https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/3d0f818c06a2b246425c114b41bec260b9274bc0)) + ### v0.23.5 / 2023-11-23 * CHANGED: Applied Rubocop Performance Recommendations [#727](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/727) diff --git a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb index 07c864bd7a..0c1c489ccd 100644 --- a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb +++ b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb @@ -7,7 +7,7 @@ module OpenTelemetry module Instrumentation module Rack - VERSION = '0.23.5' + VERSION = '0.24.0' end end end diff --git a/instrumentation/trilogy/CHANGELOG.md b/instrumentation/trilogy/CHANGELOG.md index 1cd9e405d7..9910fce63d 100644 --- a/instrumentation/trilogy/CHANGELOG.md +++ b/instrumentation/trilogy/CHANGELOG.md @@ -1,5 +1,21 @@ # Release History: opentelemetry-instrumentation-trilogy +## [0.58.0](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-trilogy/v0.57.0...opentelemetry-instrumentation-trilogy/v0.58.0) (2024-01-05) + + +### ⚠ BREAKING CHANGES + +* change db.mysql.instance.address to db.instance.id ([#758](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/758)) + +### Features + +* change db.mysql.instance.address to db.instance.id ([#758](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/758)) ([73fa809](https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/73fa809867dd08c1e3fde7413d88538e0df748bf)) + + +### Bug Fixes + +* Trilogy only set db.instance.id attribute if there is a value ([#792](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/792)) ([8b790a1](https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/8b790a1d4b5801bafe71b654bc8a933af21f76c7)) + ### v0.57.0 / 2023-10-27 * ADDED: Instrument connect and ping diff --git a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb index a88022366b..98cb68e0db 100644 --- a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb +++ b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb @@ -7,7 +7,7 @@ module OpenTelemetry module Instrumentation module Trilogy - VERSION = '0.57.0' + VERSION = '0.58.0' end end end From d8f2ef1985a52be75c12ca81458429454f3ab98e Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 10:57:10 -0600 Subject: [PATCH 26/37] ci: force latest bundler version --- .github/workflows/release-please.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index a05c3b71a3..3820fc898c 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -40,8 +40,11 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 + working-directory: ${{ matrix.path }} with: ruby-version: 3.0.0 + bundler: latest + bundler-cache: false - name: Configure RubyGems env: From 6aeffd0fb83f5aa3a7591a7429e60ff979405e20 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 11:02:10 -0600 Subject: [PATCH 27/37] ci: invalid option --- .github/workflows/release-please.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index 3820fc898c..a8d243b39f 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -40,7 +40,6 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 - working-directory: ${{ matrix.path }} with: ruby-version: 3.0.0 bundler: latest From 36fc16e41b81b4323ecfcee5d3a6979f87a890fd Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 13:51:54 -0600 Subject: [PATCH 28/37] ci: Fix toys config --- .toys/.data/releases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.toys/.data/releases.yml b/.toys/.data/releases.yml index 30d6cde6c0..2a34f531f7 100644 --- a/.toys/.data/releases.yml +++ b/.toys/.data/releases.yml @@ -6,7 +6,7 @@ repo: open-telemetry/opentelemetry-ruby-contrib main_branch: main # Time in seconds for release scripts to wait for CI to complete. required_checks_timeout: 1200 -required_jobs: "^(ci|CI).*" +required_checks_regexp: "^(ci|CI).*" # Git user attached to commits for release pull requests. git_user_name: Ariel Valentin git_user_email: ariel@arielvalentin.com From bdd9b5fde0d9d3c659872e5957d6da24c4c16e00 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 14:55:31 -0600 Subject: [PATCH 29/37] ci: Try again --- .toys/.data/releases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.toys/.data/releases.yml b/.toys/.data/releases.yml index 2a34f531f7..432ae44715 100644 --- a/.toys/.data/releases.yml +++ b/.toys/.data/releases.yml @@ -6,7 +6,7 @@ repo: open-telemetry/opentelemetry-ruby-contrib main_branch: main # Time in seconds for release scripts to wait for CI to complete. required_checks_timeout: 1200 -required_checks_regexp: "^(ci|CI).*" +required_checks: "^(ci|CI).*" # Git user attached to commits for release pull requests. git_user_name: Ariel Valentin git_user_email: ariel@arielvalentin.com From 61a1f09f8859389e5df6d3964da1b79ee46b77bb Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 23:32:44 -0600 Subject: [PATCH 30/37] Revert "chore: release main (#793)" This reverts commit 9d8788b8b27f4492eba9d6f60cafcee95ecad148. --- .release-please-manifest.json | 4 ++-- .../opentelemetry-instrumentation-all.gemspec | 4 ++-- instrumentation/rack/CHANGELOG.md | 16 ---------------- .../instrumentation/rack/version.rb | 2 +- instrumentation/trilogy/CHANGELOG.md | 16 ---------------- .../instrumentation/trilogy/version.rb | 2 +- 6 files changed, 6 insertions(+), 38 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 0ff91bc999..7adc63ff67 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -4,7 +4,7 @@ "instrumentation/racecar": "0.3.0", "instrumentation/rake": "0.2.1", "instrumentation/rdkafka": "0.4.2", - "instrumentation/trilogy": "0.58.0", + "instrumentation/trilogy": "0.57.0", "instrumentation/active_support": "0.5.1", "instrumentation/action_view": "0.7.0", "instrumentation/action_pack": "0.8.0", @@ -32,7 +32,7 @@ "instrumentation/net_http": "0.22.4", "instrumentation/pg": "0.26.1", "instrumentation/que": "0.7.1", - "instrumentation/rack": "0.24.0", + "instrumentation/rack": "0.23.5", "instrumentation/rails": "0.29.1", "instrumentation/redis": "0.25.3", "instrumentation/restclient": "0.22.3", diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec index b538d6fd16..95e8c667b7 100644 --- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec +++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec @@ -48,7 +48,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-instrumentation-pg', '~> 0.26.0' spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.7.0' spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.3.0' - spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.24.0' + spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.23.1' spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.29.0' spec.add_dependency 'opentelemetry-instrumentation-rake', '~> 0.2.1' spec.add_dependency 'opentelemetry-instrumentation-rdkafka', '~> 0.4.0' @@ -58,7 +58,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-instrumentation-ruby_kafka', '~> 0.21.0' spec.add_dependency 'opentelemetry-instrumentation-sidekiq', '~> 0.25.0' spec.add_dependency 'opentelemetry-instrumentation-sinatra', '~> 0.23.1' - spec.add_dependency 'opentelemetry-instrumentation-trilogy', '~> 0.58.0' + spec.add_dependency 'opentelemetry-instrumentation-trilogy', '~> 0.57.0' spec.add_development_dependency 'active_model_serializers' spec.add_development_dependency 'activesupport' diff --git a/instrumentation/rack/CHANGELOG.md b/instrumentation/rack/CHANGELOG.md index c45674ed54..3df214395a 100644 --- a/instrumentation/rack/CHANGELOG.md +++ b/instrumentation/rack/CHANGELOG.md @@ -1,21 +1,5 @@ # Release History: opentelemetry-instrumentation-rack -## [0.24.0](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-rack/v0.23.5...opentelemetry-instrumentation-rack/v0.24.0) (2024-01-05) - - -### ⚠ BREAKING CHANGES - -* Use Rack Events By Default - -### Features - -* Use Rack Events By Default ([f7f4603](https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/f7f46037bdda286a25763a31ae5236c947f060ed)) - - -### Bug Fixes - -* Backport Rack proxy event to middleware ([#764](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/764)) ([3d0f818](https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/3d0f818c06a2b246425c114b41bec260b9274bc0)) - ### v0.23.5 / 2023-11-23 * CHANGED: Applied Rubocop Performance Recommendations [#727](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/727) diff --git a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb index 0c1c489ccd..07c864bd7a 100644 --- a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb +++ b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb @@ -7,7 +7,7 @@ module OpenTelemetry module Instrumentation module Rack - VERSION = '0.24.0' + VERSION = '0.23.5' end end end diff --git a/instrumentation/trilogy/CHANGELOG.md b/instrumentation/trilogy/CHANGELOG.md index 9910fce63d..1cd9e405d7 100644 --- a/instrumentation/trilogy/CHANGELOG.md +++ b/instrumentation/trilogy/CHANGELOG.md @@ -1,21 +1,5 @@ # Release History: opentelemetry-instrumentation-trilogy -## [0.58.0](https://github.com/open-telemetry/opentelemetry-ruby-contrib/compare/opentelemetry-instrumentation-trilogy/v0.57.0...opentelemetry-instrumentation-trilogy/v0.58.0) (2024-01-05) - - -### ⚠ BREAKING CHANGES - -* change db.mysql.instance.address to db.instance.id ([#758](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/758)) - -### Features - -* change db.mysql.instance.address to db.instance.id ([#758](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/758)) ([73fa809](https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/73fa809867dd08c1e3fde7413d88538e0df748bf)) - - -### Bug Fixes - -* Trilogy only set db.instance.id attribute if there is a value ([#792](https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/792)) ([8b790a1](https://github.com/open-telemetry/opentelemetry-ruby-contrib/commit/8b790a1d4b5801bafe71b654bc8a933af21f76c7)) - ### v0.57.0 / 2023-10-27 * ADDED: Instrument connect and ping diff --git a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb index 98cb68e0db..a88022366b 100644 --- a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb +++ b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb @@ -7,7 +7,7 @@ module OpenTelemetry module Instrumentation module Trilogy - VERSION = '0.58.0' + VERSION = '0.57.0' end end end From b4343c0ddfbc8e60c5f068da4fe290a990ec17a6 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 23:37:50 -0600 Subject: [PATCH 31/37] ci: Give Credit to OTel Bot --- .toys/.data/releases.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.toys/.data/releases.yml b/.toys/.data/releases.yml index 432ae44715..1bacd4b351 100644 --- a/.toys/.data/releases.yml +++ b/.toys/.data/releases.yml @@ -8,8 +8,8 @@ main_branch: main required_checks_timeout: 1200 required_checks: "^(ci|CI).*" # Git user attached to commits for release pull requests. -git_user_name: Ariel Valentin -git_user_email: ariel@arielvalentin.com +git_user_name: OpenTelemetry Bot +git_user_email: 107717825+opentelemetrybot@users.noreply.github.com # Control the conventional commit linter. commit_lint: From ba8c44e4f0c0b03df6b29761c7b404e2e3950938 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 00:17:53 -0600 Subject: [PATCH 32/37] release: Release 2 gems (#796) * release: Release 2 gems * opentelemetry-instrumentation-trilogy 0.58.0 (was 0.57.0) * opentelemetry-instrumentation-rack 0.24.0 (was 0.23.5) * feat!: All Upgrade Trilogy:0.58 Rack:0.24 --------- Co-authored-by: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Ariel Valentin --- .../all/opentelemetry-instrumentation-all.gemspec | 4 ++-- instrumentation/rack/CHANGELOG.md | 7 +++++++ .../rack/lib/opentelemetry/instrumentation/rack/version.rb | 2 +- instrumentation/trilogy/CHANGELOG.md | 7 +++++++ .../lib/opentelemetry/instrumentation/trilogy/version.rb | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec index 95e8c667b7..b538d6fd16 100644 --- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec +++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec @@ -48,7 +48,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-instrumentation-pg', '~> 0.26.0' spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.7.0' spec.add_dependency 'opentelemetry-instrumentation-racecar', '~> 0.3.0' - spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.23.1' + spec.add_dependency 'opentelemetry-instrumentation-rack', '~> 0.24.0' spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.29.0' spec.add_dependency 'opentelemetry-instrumentation-rake', '~> 0.2.1' spec.add_dependency 'opentelemetry-instrumentation-rdkafka', '~> 0.4.0' @@ -58,7 +58,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-instrumentation-ruby_kafka', '~> 0.21.0' spec.add_dependency 'opentelemetry-instrumentation-sidekiq', '~> 0.25.0' spec.add_dependency 'opentelemetry-instrumentation-sinatra', '~> 0.23.1' - spec.add_dependency 'opentelemetry-instrumentation-trilogy', '~> 0.57.0' + spec.add_dependency 'opentelemetry-instrumentation-trilogy', '~> 0.58.0' spec.add_development_dependency 'active_model_serializers' spec.add_development_dependency 'activesupport' diff --git a/instrumentation/rack/CHANGELOG.md b/instrumentation/rack/CHANGELOG.md index 3df214395a..56fabc6614 100644 --- a/instrumentation/rack/CHANGELOG.md +++ b/instrumentation/rack/CHANGELOG.md @@ -1,5 +1,12 @@ # Release History: opentelemetry-instrumentation-rack +### v0.24.0 / 2024-01-06 + +* BREAKING CHANGE: Use Rack Events By Default + +* ADDED: Use Rack Events By Default +* FIXED: Backport Rack proxy event to middleware + ### v0.23.5 / 2023-11-23 * CHANGED: Applied Rubocop Performance Recommendations [#727](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/727) diff --git a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb index 07c864bd7a..0c1c489ccd 100644 --- a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb +++ b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/version.rb @@ -7,7 +7,7 @@ module OpenTelemetry module Instrumentation module Rack - VERSION = '0.23.5' + VERSION = '0.24.0' end end end diff --git a/instrumentation/trilogy/CHANGELOG.md b/instrumentation/trilogy/CHANGELOG.md index 1cd9e405d7..dc8d352314 100644 --- a/instrumentation/trilogy/CHANGELOG.md +++ b/instrumentation/trilogy/CHANGELOG.md @@ -1,5 +1,12 @@ # Release History: opentelemetry-instrumentation-trilogy +### v0.58.0 / 2024-01-06 + +* BREAKING CHANGE: Change db.mysql.instance.address to db.instance.id + +* ADDED: Change db.mysql.instance.address to db.instance.id +* FIXED: Trilogy only set db.instance.id attribute if there is a value + ### v0.57.0 / 2023-10-27 * ADDED: Instrument connect and ping diff --git a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb index a88022366b..98cb68e0db 100644 --- a/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb +++ b/instrumentation/trilogy/lib/opentelemetry/instrumentation/trilogy/version.rb @@ -7,7 +7,7 @@ module OpenTelemetry module Instrumentation module Trilogy - VERSION = '0.57.0' + VERSION = '0.58.0' end end end From 6ef33f24fef0310605dc137191447f85eb688a0b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 6 Jan 2024 00:47:21 -0600 Subject: [PATCH 33/37] release: Release opentelemetry-instrumentation-all 0.55.0 (was 0.54.0) (#799) * release: Release opentelemetry-instrumentation-all 0.55.0 (was 0.54.0) * ci: Update instrumentation/all/CHANGELOG.md --------- Co-authored-by: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Ariel Valentin --- instrumentation/all/CHANGELOG.md | 4 ++++ .../all/lib/opentelemetry/instrumentation/all/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/instrumentation/all/CHANGELOG.md b/instrumentation/all/CHANGELOG.md index 887e719128..9569e29e1d 100644 --- a/instrumentation/all/CHANGELOG.md +++ b/instrumentation/all/CHANGELOG.md @@ -1,5 +1,9 @@ # Release History: opentelemetry-instrumentation-all +### v0.55.0 / 2024-01-06 + +* CHANGED: Upgrade Trilogy and Rack [#796](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/796) + ### v0.54.0 / 2023-11-28 * ADDED: Updated excon to include connect spans diff --git a/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb b/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb index 00e9084e3f..5bd2c5d679 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.54.0' + VERSION = '0.55.0' end end end From 1c925e77a61017f3920d0ba092a12c1143687f85 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:50:58 -0600 Subject: [PATCH 34/37] release: Release 3 gems (#808) * release: Release 3 gems * opentelemetry-instrumentation-all 056.0 (was 0.55.0) * opentelemetry-instrumentation-action_pack 0.9.0 (was 0.8.0) * opentelemetry-instrumentation-rails 0.30.0 (was 0.29.1) * Apply suggestions from code review * squash: Bump dependencies --------- Co-authored-by: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Ariel Valentin Co-authored-by: Ariel Valentin --- instrumentation/action_pack/CHANGELOG.md | 4 ++++ .../lib/opentelemetry/instrumentation/action_pack/version.rb | 2 +- instrumentation/all/CHANGELOG.md | 4 ++++ .../all/lib/opentelemetry/instrumentation/all/version.rb | 2 +- instrumentation/all/opentelemetry-instrumentation-all.gemspec | 2 +- instrumentation/rails/CHANGELOG.md | 4 ++++ .../rails/lib/opentelemetry/instrumentation/rails/version.rb | 2 +- .../rails/opentelemetry-instrumentation-rails.gemspec | 2 +- 8 files changed, 17 insertions(+), 5 deletions(-) diff --git a/instrumentation/action_pack/CHANGELOG.md b/instrumentation/action_pack/CHANGELOG.md index ce51354e59..015a170fd5 100644 --- a/instrumentation/action_pack/CHANGELOG.md +++ b/instrumentation/action_pack/CHANGELOG.md @@ -1,5 +1,9 @@ # Release History: opentelemetry-instrumentation-action_pack +### v0.9.0 / 2024-01-09 + +* BREAKING CHANGE: Use ActiveSupport instead of patches #703 + ### v0.8.0 / 2023-11-22 * BREAKING CHANGE: Drop Rails 6.0 EOL diff --git a/instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/version.rb b/instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/version.rb index ac520594ef..b746ac4144 100644 --- a/instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/version.rb +++ b/instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/version.rb @@ -7,7 +7,7 @@ module OpenTelemetry module Instrumentation module ActionPack - VERSION = '0.8.0' + VERSION = '0.9.0' end end end diff --git a/instrumentation/all/CHANGELOG.md b/instrumentation/all/CHANGELOG.md index 9569e29e1d..1ce96900c3 100644 --- a/instrumentation/all/CHANGELOG.md +++ b/instrumentation/all/CHANGELOG.md @@ -1,5 +1,9 @@ # Release History: opentelemetry-instrumentation-all +### v0.56.0 / 2024-01-09 + +* BREAKING CHANGE: Use ActiveSupport instead of patches #703 + ### v0.55.0 / 2024-01-06 * CHANGED: Upgrade Trilogy and Rack [#796](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/796) diff --git a/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb b/instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb index 5bd2c5d679..b7827cad9d 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.55.0' + VERSION = '0.56.0' end end end diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec index b538d6fd16..c85d7df233 100644 --- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec +++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec @@ -49,7 +49,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-instrumentation-que', '~> 0.7.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.29.0' + spec.add_dependency 'opentelemetry-instrumentation-rails', '~> 0.30.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 e727af268b..7ac7b5e63c 100644 --- a/instrumentation/rails/CHANGELOG.md +++ b/instrumentation/rails/CHANGELOG.md @@ -1,5 +1,9 @@ # Release History: opentelemetry-instrumentation-rails +### v0.30.0 / 2024-01-09 + +* BREAKING CHANGE: Use ActiveSupport instead of patches #703 + ### v0.29.1 / 2023-11-23 * CHANGED: Applied Rubocop Performance Recommendations [#727](https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/727) diff --git a/instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb b/instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb index 77fad14591..915937bd61 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.29.1' + VERSION = '0.30.0' end end end diff --git a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec index c54ed61fcc..b051affce5 100644 --- a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec +++ b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec @@ -26,7 +26,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 3.0' spec.add_dependency 'opentelemetry-api', '~> 1.0' - spec.add_dependency 'opentelemetry-instrumentation-action_pack', '~> 0.8.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' From 7589a34ef0dfe041cc172af1fceff1c00a424039 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Wed, 10 Jan 2024 09:34:24 -0600 Subject: [PATCH 35/37] chore: Bump rubocop-performance 1.20.0 (#780) ```console $> bin/update-dependencies rubocop-performance 1.20.0 ``` --- .../opentelemetry-instrumentation-action_pack.gemspec | 2 +- .../opentelemetry-instrumentation-action_view.gemspec | 2 +- .../instrumentation/active_job/handlers/default.rb | 2 +- .../opentelemetry-instrumentation-active_job.gemspec | 2 +- ...elemetry-instrumentation-active_model_serializers.gemspec | 2 +- .../opentelemetry-instrumentation-active_record.gemspec | 2 +- .../opentelemetry-instrumentation-active_support.gemspec | 2 +- .../all/opentelemetry-instrumentation-all.gemspec | 2 +- .../aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec | 2 +- .../base/opentelemetry-instrumentation-base.gemspec | 2 +- .../bunny/opentelemetry-instrumentation-bunny.gemspec | 2 +- .../opentelemetry-instrumentation-concurrent_ruby.gemspec | 2 +- .../dalli/opentelemetry-instrumentation-dalli.gemspec | 2 +- .../opentelemetry-instrumentation-delayed_job.gemspec | 2 +- .../ethon/opentelemetry-instrumentation-ethon.gemspec | 2 +- .../excon/opentelemetry-instrumentation-excon.gemspec | 2 +- .../faraday/opentelemetry-instrumentation-faraday.gemspec | 2 +- .../grape/opentelemetry-instrumentation-grape.gemspec | 2 +- .../graphql/opentelemetry-instrumentation-graphql.gemspec | 2 +- instrumentation/graphql/test/test_helper.rb | 5 +++-- .../gruf/opentelemetry-instrumentation-gruf.gemspec | 2 +- .../http/opentelemetry-instrumentation-http.gemspec | 2 +- .../opentelemetry-instrumentation-http_client.gemspec | 2 +- .../httpx/opentelemetry-instrumentation-httpx.gemspec | 2 +- .../koala/opentelemetry-instrumentation-koala.gemspec | 2 +- .../lmdb/opentelemetry-instrumentation-lmdb.gemspec | 2 +- .../mongo/opentelemetry-instrumentation-mongo.gemspec | 2 +- .../mysql2/opentelemetry-instrumentation-mysql2.gemspec | 2 +- .../net_http/opentelemetry-instrumentation-net_http.gemspec | 2 +- instrumentation/pg/opentelemetry-instrumentation-pg.gemspec | 2 +- .../que/opentelemetry-instrumentation-que.gemspec | 2 +- .../racecar/opentelemetry-instrumentation-racecar.gemspec | 2 +- .../instrumentation/rack/middlewares/event_handler.rb | 2 +- .../rack/opentelemetry-instrumentation-rack.gemspec | 2 +- .../rails/opentelemetry-instrumentation-rails.gemspec | 2 +- .../rake/opentelemetry-instrumentation-rake.gemspec | 2 +- .../rdkafka/opentelemetry-instrumentation-rdkafka.gemspec | 2 +- .../redis/opentelemetry-instrumentation-redis.gemspec | 2 +- .../resque/opentelemetry-instrumentation-resque.gemspec | 2 +- .../opentelemetry-instrumentation-restclient.gemspec | 2 +- .../rspec/opentelemetry-instrumentation-rspec.gemspec | 2 +- .../opentelemetry-instrumentation-ruby_kafka.gemspec | 2 +- .../sidekiq/opentelemetry-instrumentation-sidekiq.gemspec | 2 +- .../sinatra/opentelemetry-instrumentation-sinatra.gemspec | 2 +- .../trilogy/opentelemetry-instrumentation-trilogy.gemspec | 2 +- propagator/ottrace/opentelemetry-propagator-ottrace.gemspec | 2 +- propagator/xray/opentelemetry-propagator-xray.gemspec | 2 +- .../azure/opentelemetry-resource-detector-azure.gemspec | 2 +- .../opentelemetry-resource-detector-container.gemspec | 2 +- ...telemetry-resource-detector-google_cloud_platform.gemspec | 2 +- 50 files changed, 52 insertions(+), 51 deletions(-) diff --git a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec index 136e13b787..ed58c921d6 100644 --- a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec +++ b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rails', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec index b77471a888..af56e9964e 100644 --- a/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec +++ b/instrumentation/action_view/opentelemetry-instrumentation-action_view.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rails', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/default.rb b/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/default.rb index 3c6b6aa7d0..9a5db43b59 100644 --- a/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/default.rb +++ b/instrumentation/active_job/lib/opentelemetry/instrumentation/active_job/handlers/default.rb @@ -80,7 +80,7 @@ def finish_span(span, tokens) end # pops the context stack - tokens&.reverse&.each do |token| + tokens&.reverse_each do |token| OpenTelemetry::Context.detach(token) rescue StandardError => e OpenTelemetry.handle_error(exception: e) diff --git a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec b/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec index aa5cc0afcc..7b8502fe79 100644 --- a/instrumentation/active_job/opentelemetry-instrumentation-active_job.gemspec +++ b/instrumentation/active_job/opentelemetry-instrumentation-active_job.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.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec b/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec index e05d9767d7..0341fa8426 100644 --- a/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec +++ b/instrumentation/active_model_serializers/opentelemetry-instrumentation-active_model_serializers.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec index 32cd0b0be5..59b7688e20 100644 --- a/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec +++ b/instrumentation/active_record/opentelemetry-instrumentation-active_record.gemspec @@ -37,7 +37,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.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec index febb6d0fec..5fd7f082af 100644 --- a/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec +++ b/instrumentation/active_support/opentelemetry-instrumentation-active_support.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rails', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec index c85d7df233..79e1946978 100644 --- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec +++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec @@ -66,7 +66,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec index 7b3d31e1a0..bc0247fb97 100644 --- a/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec +++ b/instrumentation/aws_sdk/opentelemetry-instrumentation-aws_sdk.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/base/opentelemetry-instrumentation-base.gemspec b/instrumentation/base/opentelemetry-instrumentation-base.gemspec index e0ab420f9e..d74b1f0bae 100644 --- a/instrumentation/base/opentelemetry-instrumentation-base.gemspec +++ b/instrumentation/base/opentelemetry-instrumentation-base.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.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.22.0' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec b/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec index 0f3a71779d..df174b3230 100644 --- a/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec +++ b/instrumentation/bunny/opentelemetry-instrumentation-bunny.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec b/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec index 3961a3e737..03fd88188c 100644 --- a/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec +++ b/instrumentation/concurrent_ruby/opentelemetry-instrumentation-concurrent_ruby.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec b/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec index a1d3572002..c0feca6a5a 100644 --- a/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec +++ b/instrumentation/dalli/opentelemetry-instrumentation-dalli.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec index fb59b5af5c..671de83a69 100644 --- a/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec +++ b/instrumentation/delayed_job/opentelemetry-instrumentation-delayed_job.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'sqlite3' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec b/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec index ee7958b7d7..fbfb958c36 100644 --- a/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec +++ b/instrumentation/ethon/opentelemetry-instrumentation-ethon.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec index 01ad635bd5..48f529a851 100644 --- a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec +++ b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec index d09424d235..1029cc7016 100644 --- a/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec +++ b/instrumentation/faraday/opentelemetry-instrumentation-faraday.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec index 401c37fde0..dcd86a7dd3 100644 --- a/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec +++ b/instrumentation/grape/opentelemetry-instrumentation-grape.gemspec @@ -40,7 +40,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec b/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec index 7a78d43a2b..1804bb0de7 100644 --- a/instrumentation/graphql/opentelemetry-instrumentation-graphql.gemspec +++ b/instrumentation/graphql/opentelemetry-instrumentation-graphql.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.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/graphql/test/test_helper.rb b/instrumentation/graphql/test/test_helper.rb index b25005d166..4fae892ce1 100644 --- a/instrumentation/graphql/test/test_helper.rb +++ b/instrumentation/graphql/test/test_helper.rb @@ -25,8 +25,9 @@ module SchemaTestPatches # Reseting @graphql_definition is needed for tests running against version `1.9.x` # Other variables are used by ~> 2.0.19 def _reset_tracer_for_testing - %w[own_tracers trace_modes trace_class tracers graphql_definition own_trace_modes].each do |ivar| - remove_instance_variable("@#{ivar}") if instance_variable_defined?("@#{ivar}") + %w[own_tracers trace_modes trace_class tracers graphql_definition own_trace_modes].each do |name| + ivar_name = "@#{name}" + remove_instance_variable(ivar_name) if instance_variable_defined?(ivar_name) end end end diff --git a/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec b/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec index b37cbcbeb1..dfa4879cd1 100644 --- a/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec +++ b/instrumentation/gruf/opentelemetry-instrumentation-gruf.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers' spec.add_development_dependency 'rake', '~> 12.3.3' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/http/opentelemetry-instrumentation-http.gemspec b/instrumentation/http/opentelemetry-instrumentation-http.gemspec index fb9418fd6b..bf7b0c853d 100644 --- a/instrumentation/http/opentelemetry-instrumentation-http.gemspec +++ b/instrumentation/http/opentelemetry-instrumentation-http.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec b/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec index e6931eb866..f67ec42468 100644 --- a/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec +++ b/instrumentation/http_client/opentelemetry-instrumentation-http_client.gemspec @@ -37,7 +37,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.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec b/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec index 87e8e9686f..2cc31b766b 100644 --- a/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec +++ b/instrumentation/httpx/opentelemetry-instrumentation-httpx.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec b/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec index abd3e5c548..d368dfa418 100644 --- a/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec +++ b/instrumentation/koala/opentelemetry-instrumentation-koala.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec b/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec index 1686d30be0..fbe1729afc 100644 --- a/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.gemspec +++ b/instrumentation/lmdb/opentelemetry-instrumentation-lmdb.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.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec b/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec index a02eb74c85..964bebb072 100644 --- a/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec +++ b/instrumentation/mongo/opentelemetry-instrumentation-mongo.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec b/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec index 5c865e0d01..aeed2ba342 100644 --- a/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec +++ b/instrumentation/mysql2/opentelemetry-instrumentation-mysql2.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry' spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec b/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec index 86eee49ae4..1b6afcaae3 100644 --- a/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec +++ b/instrumentation/net_http/opentelemetry-instrumentation-net_http.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0.1' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec b/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec index 2fff2f502d..0be2d63423 100644 --- a/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec +++ b/instrumentation/pg/opentelemetry-instrumentation-pg.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'pry' spec.add_development_dependency 'pry-byebug' unless RUBY_ENGINE == 'jruby' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/que/opentelemetry-instrumentation-que.gemspec b/instrumentation/que/opentelemetry-instrumentation-que.gemspec index 1573d3d80e..f1c86780ba 100644 --- a/instrumentation/que/opentelemetry-instrumentation-que.gemspec +++ b/instrumentation/que/opentelemetry-instrumentation-que.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'que' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec b/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec index f581e6b825..2d5f60a57c 100644 --- a/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec +++ b/instrumentation/racecar/opentelemetry-instrumentation-racecar.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb index 74bdb90052..338bd95dd1 100644 --- a/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb +++ b/instrumentation/rack/lib/opentelemetry/instrumentation/rack/middlewares/event_handler.rb @@ -192,7 +192,7 @@ def request_span_attributes(env) end def detach_contexts(request) - request.env[TOKENS_KEY]&.reverse&.each do |token| + request.env[TOKENS_KEY]&.reverse_each do |token| OpenTelemetry::Context.detach(token) OpenTelemetry::Trace.current_span.finish end diff --git a/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec b/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec index 1f1c459133..4df693784b 100644 --- a/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec +++ b/instrumentation/rack/opentelemetry-instrumentation-rack.gemspec @@ -40,7 +40,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec index b051affce5..dd5ecf0f05 100644 --- a/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec +++ b/instrumentation/rails/opentelemetry-instrumentation-rails.gemspec @@ -42,7 +42,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rails', '>= 6.1' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.22.0' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec b/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec index d261937e70..3acfea121f 100644 --- a/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec +++ b/instrumentation/rake/opentelemetry-instrumentation-rake.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rake', '>= 0.9.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec b/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec index 9ff04f2368..5b95ef1eb1 100644 --- a/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec +++ b/instrumentation/rdkafka/opentelemetry-instrumentation-rdkafka.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rdkafka', '>= 0.12' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec b/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec index c9d8ac82f6..9702fb53f8 100644 --- a/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec +++ b/instrumentation/redis/opentelemetry-instrumentation-redis.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'redis', '~> 4.1' spec.add_development_dependency 'redis-client', '~> 0.7' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec b/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec index 8cf44b8353..7bd7ab90fe 100644 --- a/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec +++ b/instrumentation/resque/opentelemetry-instrumentation-resque.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'resque' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec b/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec index e1661c2fdb..32ffc816b0 100644 --- a/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec +++ b/instrumentation/restclient/opentelemetry-instrumentation-restclient.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rest-client', '~> 2.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec b/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec index 8d8573c6ca..9c2200607c 100644 --- a/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec +++ b/instrumentation/rspec/opentelemetry-instrumentation-rspec.gemspec @@ -36,7 +36,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec', '~> 3.10.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'webmock', '~> 3.19' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec b/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec index 89d3e7ca72..8ff72e8243 100644 --- a/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec +++ b/instrumentation/ruby_kafka/opentelemetry-instrumentation-ruby_kafka.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'ruby-kafka' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec b/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec index 267c518419..877b155349 100644 --- a/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec +++ b/instrumentation/sidekiq/opentelemetry-instrumentation-sidekiq.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'sidekiq' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec index 80c5b3febf..088afdd08d 100644 --- a/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec +++ b/instrumentation/sinatra/opentelemetry-instrumentation-sinatra.gemspec @@ -37,7 +37,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' spec.add_development_dependency 'rack-test', '~> 1.1.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'sinatra' spec.add_development_dependency 'webmock', '~> 3.19' diff --git a/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec b/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec index d9c1320d6e..b7f94a1188 100644 --- a/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec +++ b/instrumentation/trilogy/opentelemetry-instrumentation-trilogy.gemspec @@ -39,7 +39,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rspec-mocks' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17.1' spec.add_development_dependency 'trilogy', '>= 2.0', '< 3.0' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec index 142cc81659..4c44d26e0d 100644 --- a/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec +++ b/propagator/ottrace/opentelemetry-propagator-ottrace.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.22.0' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/propagator/xray/opentelemetry-propagator-xray.gemspec b/propagator/xray/opentelemetry-propagator-xray.gemspec index f21f144943..642c355db2 100644 --- a/propagator/xray/opentelemetry-propagator-xray.gemspec +++ b/propagator/xray/opentelemetry-propagator-xray.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.22.0' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/resources/azure/opentelemetry-resource-detector-azure.gemspec b/resources/azure/opentelemetry-resource-detector-azure.gemspec index 0df2ff7a15..09f7344d52 100644 --- a/resources/azure/opentelemetry-resource-detector-azure.gemspec +++ b/resources/azure/opentelemetry-resource-detector-azure.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17' spec.add_development_dependency 'webmock', '~> 3.19.1' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/resources/container/opentelemetry-resource-detector-container.gemspec b/resources/container/opentelemetry-resource-detector-container.gemspec index fad77611ad..f18f7929c4 100644 --- a/resources/container/opentelemetry-resource-detector-container.gemspec +++ b/resources/container/opentelemetry-resource-detector-container.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17' spec.add_development_dependency 'yard', '~> 0.9' diff --git a/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec b/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec index 2c498e18da..61dd91da4f 100644 --- a/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec +++ b/resources/google_cloud_platform/opentelemetry-resource-detector-google_cloud_platform.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'rake', '~> 13.0' spec.add_development_dependency 'rubocop', '~> 1.59.0' - spec.add_development_dependency 'rubocop-performance', '~> 1.19.1' + spec.add_development_dependency 'rubocop-performance', '~> 1.20' spec.add_development_dependency 'simplecov', '~> 0.17' spec.add_development_dependency 'webmock', '~> 3.19.1' spec.add_development_dependency 'yard', '~> 0.9' From aa5249cf093191d9a965a972667e29235930cde1 Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Wed, 10 Jan 2024 09:52:10 -0600 Subject: [PATCH 36/37] ci: Add Tests For Ruby 3.3 (#797) * ci: Add Tests For Ruby 3.3 Ruby 3.3 is out so this PR adds actions to test against it. One this to note is that bigcommerce/gruf does not yet support Ruby 3.3. Once https://github.com/bigcommerce/gruf/pull/197 is merged I will update the test suite to include gruf again. * squash: fix test * squash: fix test --- .github/actions/test_gem/action.yml | 6 ++-- .github/workflows/ci-contrib-canary.yml | 12 ++++++++ .github/workflows/ci-contrib.yml | 10 +++++++ .../workflows/ci-instrumentation-canary.yml | 8 +++++ ...i-instrumentation-with-services-canary.yml | 6 ++++ .../ci-instrumentation-with-services.yml | 30 +++++++++++++++++++ .github/workflows/ci-instrumentation.yml | 7 +++++ .github/workflows/installation-tests.yml | 3 +- .github/workflows/release-hook-on-closed.yml | 2 +- .github/workflows/release-hook-on-push.yml | 2 +- .github/workflows/release-perform.yml | 2 +- .github/workflows/release-request.yml | 2 +- .github/workflows/release-retry.yml | 2 +- instrumentation/excon/Appraisals | 10 +++++-- ...pentelemetry-instrumentation-excon.gemspec | 2 +- .../excon/instrumentation_test.rb | 4 +-- .../graphql/instrumentation_test.rb | 4 +-- 17 files changed, 96 insertions(+), 16 deletions(-) diff --git a/.github/actions/test_gem/action.yml b/.github/actions/test_gem/action.yml index 07e934fb26..a2d7221817 100644 --- a/.github/actions/test_gem/action.yml +++ b/.github/actions/test_gem/action.yml @@ -66,18 +66,18 @@ runs: # ...but not for appraisals, sadly. - name: Install Ruby ${{ inputs.ruby }} with dependencies if: "${{ steps.setup.outputs.appraisals == 'false' }}" - uses: ruby/setup-ruby@v1.144.1 + uses: ruby/setup-ruby@v1.165.1 with: ruby-version: "${{ inputs.ruby }}" working-directory: "${{ steps.setup.outputs.gem_dir }}" bundler: "latest" bundler-cache: true - cache-version: "v1-${{ steps.setup.outputs.cache_key }}" + cache-version: "${{ inputs.ruby }}-${{ steps.setup.outputs.cache_key }}" # 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.144.1 + uses: ruby/setup-ruby@v1.165.1 with: ruby-version: "${{ inputs.ruby }}" bundler: "latest" diff --git a/.github/workflows/ci-contrib-canary.yml b/.github/workflows/ci-contrib-canary.yml index 214a516a70..8ea179d8d8 100644 --- a/.github/workflows/ci-contrib-canary.yml +++ b/.github/workflows/ci-contrib-canary.yml @@ -21,6 +21,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-propagator-${{ matrix.gem }}" + ruby: "3.3" + latest: "true" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: @@ -74,6 +80,12 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-${{ matrix.gem }}" + ruby: "3.3" + latest: "true" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: diff --git a/.github/workflows/ci-contrib.yml b/.github/workflows/ci-contrib.yml index 75e9703102..b006588940 100644 --- a/.github/workflows/ci-contrib.yml +++ b/.github/workflows/ci-contrib.yml @@ -23,6 +23,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-propagator-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: @@ -63,6 +68,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: diff --git a/.github/workflows/ci-instrumentation-canary.yml b/.github/workflows/ci-instrumentation-canary.yml index ae32dd9bba..a731bffd26 100644 --- a/.github/workflows/ci-instrumentation-canary.yml +++ b/.github/workflows/ci-instrumentation-canary.yml @@ -59,6 +59,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + # BLOCKED BY: https://github.com/bigcommerce/gruf/pull/197 + if: "${{ matrix.gem != 'gruf' }}" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" + latest: "true" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: diff --git a/.github/workflows/ci-instrumentation-with-services-canary.yml b/.github/workflows/ci-instrumentation-with-services-canary.yml index b375afb7cc..63d2d087c5 100644 --- a/.github/workflows/ci-instrumentation-with-services-canary.yml +++ b/.github/workflows/ci-instrumentation-with-services-canary.yml @@ -29,6 +29,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" + latest: "true" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: diff --git a/.github/workflows/ci-instrumentation-with-services.yml b/.github/workflows/ci-instrumentation-with-services.yml index 3b1f9a3422..259d97127e 100644 --- a/.github/workflows/ci-instrumentation-with-services.yml +++ b/.github/workflows/ci-instrumentation-with-services.yml @@ -23,6 +23,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: @@ -69,6 +74,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: @@ -106,6 +116,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: @@ -159,6 +174,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: @@ -203,6 +223,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: @@ -244,6 +269,11 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: diff --git a/.github/workflows/ci-instrumentation.yml b/.github/workflows/ci-instrumentation.yml index d06fe5d5b7..ebfefb3096 100644 --- a/.github/workflows/ci-instrumentation.yml +++ b/.github/workflows/ci-instrumentation.yml @@ -50,6 +50,13 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 + - name: "Test Ruby 3.3" + # BLOCKED BY: https://github.com/bigcommerce/gruf/pull/197 + if: "${{ matrix.gem != 'gruf' }}" + uses: ./.github/actions/test_gem + with: + gem: "opentelemetry-instrumentation-${{ matrix.gem }}" + ruby: "3.3" - name: "Test Ruby 3.2" uses: ./.github/actions/test_gem with: diff --git a/.github/workflows/installation-tests.yml b/.github/workflows/installation-tests.yml index c5f792896f..0640afd08e 100644 --- a/.github/workflows/installation-tests.yml +++ b/.github/workflows/installation-tests.yml @@ -15,6 +15,7 @@ jobs: fail-fast: false matrix: ruby-version: + - 3.3 - 3.2 - 3.1 - 3.0 @@ -22,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: ruby/setup-ruby@v1 + - uses: ruby/setup-ruby@v1.165.1 with: ruby-version: ${{ matrix.ruby-version }} - name: "Install Latest Gem Versions on ${{ matrix.ruby-version }}" diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml index 6a80f4146b..a5c252b602 100644 --- a/.github/workflows/release-hook-on-closed.yml +++ b/.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 + uses: ruby/setup-ruby@v1.165.1 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml index d3a85043de..9376de3364 100644 --- a/.github/workflows/release-hook-on-push.yml +++ b/.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 + uses: ruby/setup-ruby@v1.165.1 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml index 60ebeaee57..f38f7efb91 100644 --- a/.github/workflows/release-perform.yml +++ b/.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 + uses: ruby/setup-ruby@v1.165.1 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml index 00997a9ba2..ec07aefb93 100644 --- a/.github/workflows/release-request.yml +++ b/.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 + uses: ruby/setup-ruby@v1.165.1 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml index 381987aec7..793354b360 100644 --- a/.github/workflows/release-retry.yml +++ b/.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 + uses: ruby/setup-ruby@v1.165.1 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/instrumentation/excon/Appraisals b/instrumentation/excon/Appraisals index f84de92ff7..4538446e41 100644 --- a/instrumentation/excon/Appraisals +++ b/instrumentation/excon/Appraisals @@ -2,6 +2,12 @@ # add more tests for excon -appraise 'excon-0.71' do - gem 'excon', '~> 0.71.0' +%w[0.71 0.109].each do |version| + appraise "excon-#{version}" do + gem 'excon', "~> #{version}.0" + end +end + +appraise 'excon-latest' do + gem 'excon' end diff --git a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec index 48f529a851..1a1dca474f 100644 --- a/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec +++ b/instrumentation/excon/opentelemetry-instrumentation-excon.gemspec @@ -31,7 +31,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'appraisal', '~> 2.5' spec.add_development_dependency 'bundler', '~> 2.4' - spec.add_development_dependency 'excon', '~> 0.71.0' + spec.add_development_dependency 'excon' spec.add_development_dependency 'minitest', '~> 5.0' spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1' spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3' diff --git a/instrumentation/excon/test/opentelemetry/instrumentation/excon/instrumentation_test.rb b/instrumentation/excon/test/opentelemetry/instrumentation/excon/instrumentation_test.rb index fa166e1e69..94f354c09a 100644 --- a/instrumentation/excon/test/opentelemetry/instrumentation/excon/instrumentation_test.rb +++ b/instrumentation/excon/test/opentelemetry/instrumentation/excon/instrumentation_test.rb @@ -244,9 +244,9 @@ _(span.attributes['net.peer.port']).must_equal(99_999) span_event = span.events.first - _(span_event.name).must_equal 'exception' - _(span_event.attributes['exception.type']).must_equal(SocketError.name) + # Depending on the Ruby and Excon Version this will be a SocketError, Socket::ResolutionError or Resolv::ResolvError + _(span_event.attributes['exception.type']).must_match(/(Socket|Resolv)/) assert_http_spans(host: 'invalid.com', target: '/example') end diff --git a/instrumentation/graphql/test/instrumentation/graphql/instrumentation_test.rb b/instrumentation/graphql/test/instrumentation/graphql/instrumentation_test.rb index 916beaca51..580918fb8d 100644 --- a/instrumentation/graphql/test/instrumentation/graphql/instrumentation_test.rb +++ b/instrumentation/graphql/test/instrumentation/graphql/instrumentation_test.rb @@ -54,7 +54,7 @@ OpenTelemetry::TestHelpers.with_test_logger do |log| instrumentation.install(config) _(log.string).must_match( - / Unable to patch schema Old::Truck: undefined method `trace_with' for Old::Truck:Class/ + /undefined method `trace_with'.*Old::Truck/ ) end end @@ -90,7 +90,7 @@ instrumentation.install(config) _(log.string).must_match( - /Unable to patch schema Old::Truck: undefined method `use' for Old::Truck:Class/ + /undefined method `use'.*Old::Truck/ ) end end From 8b0c63e7e261bd2a6ff55864dd5bc8660003821d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 20:51:40 -0600 Subject: [PATCH 37/37] chore(deps): bump ruby/setup-ruby from 1.162.0 to 1.165.1 (#809) --- .github/workflows/release-please.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-please.yaml b/.github/workflows/release-please.yaml index a8d243b39f..ad9b765c95 100644 --- a/.github/workflows/release-please.yaml +++ b/.github/workflows/release-please.yaml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - name: Setup Ruby - uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 + uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 with: ruby-version: 3.0.0 bundler: latest