Use Mutex#synchronize (#5098)

Co-authored-by: Oleg Pudeyev <[email protected]>

Author: p-datadog

lib/datadog/core/remote/worker.rb

@@ -25,49 +25,45 @@ def initialize(interval:, logger:, &block)
         def start
           logger.debug { "remote worker starting (pid: #{Process.pid})" }
 
-          acquire_lock
+          @mutex.synchronize do
+            if @stopped
+              logger.debug('remote worker: refusing to restart after previous stop')
+              return
+            end
 
-          if @stopped
-            logger.debug('remote worker: refusing to restart after previous stop')
-            return
-          end
-
-          return if @starting || @started
+            return if @starting || @started
 
-          @starting = true
+            @starting = true
 
-          thread = Thread.new { poll(@interval) }
-          thread.name = self.class.name
-          thread.thread_variable_set(:fork_safe, true)
-          @thr = thread
+            thread = Thread.new { poll(@interval) }
+            thread.name = self.class.name
+            thread.thread_variable_set(:fork_safe, true)
+            @thr = thread
 
-          @started = true
-          @starting = false
+            @started = true
+            @starting = false
+          end
 
           logger.debug { 'remote worker started' }
-        ensure
-          release_lock
         end
 
         def stop
           logger.debug { "remote worker stopping (pid: #{Process.pid})" }
 
-          acquire_lock
+          @mutex.synchronize do
+            thread = @thr
 
-          thread = @thr
+            if thread
+              thread.kill
+              thread.join
+            end
 
-          if thread
-            thread.kill
-            thread.join
+            @started = false
+            @thr = nil
+            @stopped = true
           end
 
-          @started = false
-          @thr = nil
-          @stopped = true
-
           logger.debug { 'remote worker stopped' }
-        ensure
-          release_lock
         end
 
         def started?
@@ -76,14 +72,6 @@ def started?
 
         private
 
-        def acquire_lock
-          @mutex.lock
-        end
-
-        def release_lock
-          @mutex.unlock
-        end
-
         def poll(interval)
           loop do
             break unless @mutex.synchronize { @starting || @started }

sig/datadog/core/remote/worker.rbs

@@ -23,10 +23,6 @@ module Datadog
 
         private
 
-        def acquire_lock: () -> void
-
-        def release_lock: () -> void
-
         def poll: (::Float interval) -> void
 
         def call: () -> void

spec/datadog/core/remote/worker_spec.rb

@@ -26,8 +26,7 @@
     end
 
     it 'acquire and release lock' do
-      expect(worker).to receive(:acquire_lock).at_least(:once)
-      expect(worker).to receive(:release_lock).at_least(:once)
+      expect(worker.instance_variable_get('@mutex')).to receive(:synchronize).at_least(:once)
       worker.start
     end
 
@@ -84,8 +83,7 @@
     end
 
     it 'acquire and release lock' do
-      expect(worker).to receive(:acquire_lock)
-      expect(worker).to receive(:release_lock)
+      expect(worker.instance_variable_get('@mutex')).to receive(:synchronize).at_least(:once)
       worker.stop
     end
   end