Merge branch 'main' into contribute-ecs-resource-detector

Author: yiyuan-he

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

@@ -33,7 +33,7 @@ def add_patches
           if Gem::Version.new(::Dalli::VERSION) < Gem::Version.new('3.0.0')
             ::Dalli::Server.prepend(Patches::Server)
           else
-            ::Dalli::Protocol::Binary.prepend(Patches::Server)
+            ::Dalli::Protocol::Binary.prepend(Patches::Server) if defined?(::Dalli::Protocol::Binary)
             ::Dalli::Protocol::Meta.prepend(Patches::Server) if defined?(::Dalli::Protocol::Meta)
           end
         end

instrumentation/grpc/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-grpc
 
+### v0.2.1 / 2025-04-17
+
+* CHANGED: Fix ClientTracer: uninitialized constant GRPC (NameError) https://github.com/open-telemetry/opentelemetry-ruby-contrib/pull/1471
+
 ### v0.2.0 / 2025-04-02
 
 * ADDED: Add gRPC trace demonstration

instrumentation/grpc/lib/opentelemetry/instrumentation/grpc/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Grpc
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
     end
   end
 end