Merge branch 'main' into jruby-10

Author: kaylareopelle

instrumentation/dalli/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-dalli
 
+### v0.27.3 / 2025-05-27
+
+* FIXED: Compact Dalli attributes
+
 ### v0.27.2 / 2025-04-30
 
 * FIXED: Do not pollute the `OpenTelemetry::Instrumentation` namespace

instrumentation/dalli/lib/opentelemetry/instrumentation/dalli/patches/server.rb

@@ -15,9 +15,10 @@ def request(op, *args) # rubocop:disable Naming/MethodParameterName
             attributes = {
               'db.system' => 'memcached',
               'db.operation' => operation,
-              'net.peer.name' => hostname,
-              'net.peer.port' => port
+              'net.peer.name' => hostname
             }
+            attributes['net.peer.port'] = port if port
+
             if config[:db_statement] == :include
               attributes['db.statement'] = Utils.format_command(operation, args)
             elsif config[:db_statement] == :obfuscate

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module Dalli
-      VERSION = '0.27.2'
+      VERSION = '0.27.3'
     end
   end
 end

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

@@ -142,6 +142,24 @@
         _(span.name).must_equal 'gat'
         _(span.attributes['db.statement']).must_equal 'gat foo 0'
       end
+
+      it 'supports unix domain socket' do
+        dalli.version
+        exporter.reset
+
+        server = dalli.instance_variable_get(:@ring).servers.first
+        server.stub(:hostname, '/tmp/memcached.sock') do
+          server.stub(:port, nil) do
+            dalli.set('foo', 'bar')
+
+            puts exporter.finished_spans
+            _(exporter.finished_spans.size).must_equal 1
+            _(span.name).must_equal 'set'
+            _(span.attributes).wont_include 'net.peer.port'
+            _(span.attributes['net.peer.name']).must_equal '/tmp/memcached.sock'
+          end
+        end
+      end
     end
   end
 

instrumentation/rake/lib/opentelemetry/instrumentation/rake/patches/task.rb

@@ -29,7 +29,11 @@ def tracer
           end
 
           def force_flush
-            OpenTelemetry.tracer_provider.force_flush if ::Rake.application.top_level_tasks.include?(name)
+            top_level_task_names = ::Rake.application.top_level_tasks.map { |t| t.split('[').first }
+
+            if top_level_task_names.include?(name)
+              OpenTelemetry.tracer_provider.force_flush
+            end
           end
         end
       end

instrumentation/rake/test/opentelemetry/instrumentation/rake/patches/task_test.rb

@@ -56,6 +56,25 @@
       _(execute_span.parent_span_id).must_equal(invoke_span.span_id)
     end
 
+    describe 'with a task argument' do
+      it 'should call force_flush on OpenTelemetry.tracer_provider' do
+        mock = Minitest::Mock.new
+        mock.expect(:force_flush, nil)
+        mock.expect(:force_flush, nil)
+
+        Rake::Task.define_task("#{task_name}[:arg]")
+        task_string = "#{task_name}[test_arg]"
+
+        Rake.application.instance_eval { @top_level_tasks = [task_string] }
+
+        OpenTelemetry.stub(:tracer_provider, mock) do
+          Rake.application.invoke_task(task_string)
+        end
+
+        mock.verify
+      end
+    end
+
     describe 'with a prerequisite task' do
       before do
         Rake::Task.define_task(prerequisite_task_name)