Merge branch 'main' into add-ruby-3.3

open-telemetry · Jan 6, 2024 · 83041ba · 83041ba
2 parents 5ce9c04 + 6ef33f2
commit 83041ba
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 5 deletions.
diff --git 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
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module All
-      VERSION = '0.54.0'
+      VERSION = '0.55.0'
     end
   end
 end
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Trilogy
-      VERSION = '0.57.0'
+      VERSION = '0.58.0'
     end
   end
 end