From 61a1f09f8859389e5df6d3964da1b79ee46b77bb Mon Sep 17 00:00:00 2001 From: Ariel Valentin Date: Fri, 5 Jan 2024 23:32:44 -0600 Subject: [PATCH] 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 0ff91bc99..7adc63ff6 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 b538d6fd1..95e8c667b 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 c45674ed5..3df214395 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 0c1c489cc..07c864bd7 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 9910fce63..1cd9e405d 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 98cb68e0d..a88022366 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