Merge branch 'main' into feat-migrate-grpc-instrumentation-to-rubocop

.instrumentation_generator/templates/Appraisals

@@ -13,4 +13,3 @@
 # appraise 'rack-2.0' do
 #   gem 'rack', '2.0.8'
 # end
-

.instrumentation_generator/templates/lib/entrypoint.rb

@@ -4,4 +4,4 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-require_relative './opentelemetry/instrumentation'
+require_relative 'opentelemetry/instrumentation'

.instrumentation_generator/templates/lib/instrumentation.rb.tt

@@ -16,4 +16,4 @@ module OpenTelemetry
   end
 end
 
-require_relative './instrumentation/<%= instrumentation_name %>'
+require_relative 'instrumentation/<%= instrumentation_name %>'

.instrumentation_generator/templates/lib/instrumentation/instrumentation_name.rb.tt

@@ -15,5 +15,5 @@ module OpenTelemetry
   end
 end
 
-require_relative './<%= instrumentation_name %>/instrumentation'
-require_relative './<%= instrumentation_name %>/version'
+require_relative '<%= instrumentation_name %>/instrumentation'
+require_relative '<%= instrumentation_name %>/version'

instrumentation/all/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-all
 
+### v0.71.1 / 2025-01-14
+
+* No Significant Changes
+
 ### v0.71.0 / 2025-01-07
 
 * ADDED: Faraday Minimum v1.0

instrumentation/all/lib/opentelemetry/instrumentation/all/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module All
-      VERSION = '0.71.0'
+      VERSION = '0.71.1'
     end
   end
 end

instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/utils.rb

@@ -41,7 +41,8 @@ module Utils
         'multi_add' => 'addq',
         'multi_replace' => 'replaceq',
         'multi_delete' => 'deleteq',
-        'touch' => 'touch'
+        'touch' => 'touch',
+        'gat' => 'gat'
         # 'sasl_authentication' => 'auth_negotiation',
         # 'sasl_authentication' => 'auth_request',
       }.freeze

instrumentation/dalli/test/opentelemetry/instrumentation/dalli/instrumentation_test.rb

@@ -127,6 +127,16 @@
       _(span.name).must_equal 'set'
       _(span.attributes['db.statement']).must_equal 'set ?'
     end
+
+    it 'supports gat' do
+      skip unless dalli.respond_to?(:gat)
+
+      dalli.gat('foo')
+
+      _(exporter.finished_spans.size).must_equal 1
+      _(span.name).must_equal 'gat'
+      _(span.attributes['db.statement']).must_equal 'gat foo 0'
+    end
   end
 
   # Dalli 3.x has different behavior than 2.x versions and attempts to retry on network errors

instrumentation/rails/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-rails
 
+### v0.34.1 / 2025-01-14
+
+* FIXED: Add Concurrent Ruby dependency to Rails
+
 ### v0.34.0 / 2024-12-19
 
 * ADDED: Upgrade ActiveSupport Instrumentation 0.7.0

instrumentation/rails/lib/opentelemetry/instrumentation/rails/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Rails
-      VERSION = '0.34.0'
+      VERSION = '0.34.1'
     end
   end
 end