pr feedback

Author: chris-olszewski

test/updatable_timer/updatable_timer_workflow_test.rb

@@ -17,19 +17,32 @@ def test_workflow
           task_queue: "tq-#{SecureRandom.uuid}",
           workflows: [UpdatableTimerWorkflow]
         )
-        worker.run do
+        handle = worker.run do
           day_from_now = (Time.now(in: 'utc') + (24 * 60 * 60)).to_r
           hour_from_now = (Time.now(in: 'utc') + (60 * 60)).to_r
           handle = env.client.start_workflow(
             UpdatableTimerWorkflow, day_from_now,
             id: "wf-#{SecureRandom.uuid}", task_queue: worker.task_queue
           )
           assert_equal day_from_now, Rational(handle.query(UpdatableTimerWorkflow.wake_up_time))
+          env.sleep(10)
           handle.signal(UpdatableTimerWorkflow.update_wake_up_time, hour_from_now)
           assert_equal hour_from_now, Rational(handle.query(UpdatableTimerWorkflow.wake_up_time))
 
           handle.result
+          handle
         end
+        timer_events = handle.fetch_history_events.filter_map do |e|
+          timer_id = (e.timer_started_event_attributes ||
+                e.timer_canceled_event_attributes ||
+                e.timer_fired_event_attributes)&.timer_id
+          [e.event_type, timer_id] if timer_id
+        end.compact
+        assert_equal(
+          [[:EVENT_TYPE_TIMER_STARTED, '1'], [:EVENT_TYPE_TIMER_CANCELED, '1'], [:EVENT_TYPE_TIMER_STARTED, '2'],
+           [:EVENT_TYPE_TIMER_FIRED, '2']],
+          timer_events
+        )
       end
     end
   end

updatable_timer/README.md

@@ -16,7 +16,7 @@ Then in another terminal, use the Ruby client to the workflow from this director
 
 The Ruby code will invoke the workflow which will create a timer that will resolve in a day.
 
-Finally run the updater to change the timer to 10 seconds from now:
+Finally in a third terminal, run the updater to change the timer to 10 seconds from now:
 
 ```bash
   bundle exec ruby wake_up_timer_updater.rb

updatable_timer/starter.rb

@@ -8,9 +8,9 @@
 client = Temporalio::Client.connect('localhost:7233', 'default', logger:)
 
 # Run workflow
-logger.info('Starting timer')
+logger.info('Starting workflow')
 client.execute_workflow(
   UpdatableTimer::UpdatableTimerWorkflow, (Time.now(in: 'utc') + (24 * 60 * 60)).to_r,
-  id: 'updatable-timer-sample-workflow-id', task_queue: 'updatable-timer'
+  id: 'updatable-timer-sample-workflow-id', task_queue: 'updatable-timer-sample'
 )
-logger.info('Timer complete')
+logger.info('Workflow complete')

updatable_timer/updatable_timer.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 require 'temporalio/workflow'
-require 'temporalio/error'
 
 module UpdatableTimer
   class UpdatableTimer
     def initialize(wake_up_time)
       @wake_up_time = wake_up_time
-      @wake_up_time_updated = false
     end
 
     attr_reader :wake_up_time
@@ -34,7 +32,7 @@ def sleep
             Temporalio::Workflow.wait_condition { @wake_up_time_updated }
           end
         rescue Timeout::Error
-          next
+          break
         end
       end
       Temporalio::Workflow.logger.info('sleep_until completed')

updatable_timer/updatable_timer_workflow.rb

@@ -5,8 +5,12 @@
 
 module UpdatableTimer
   class UpdatableTimerWorkflow < Temporalio::Workflow::Definition
-    def execute(wake_up_time)
+    workflow_init
+    def initialize(wake_up_time)
       @timer = UpdatableTimer.new(Time.at(Rational(wake_up_time)))
+    end
+
+    def execute(_wake_up_time)
       @timer.sleep
     end
 

updatable_timer/worker.rb

@@ -15,7 +15,7 @@
 # Create worker with the activities and workflow
 worker = Temporalio::Worker.new(
   client:,
-  task_queue: 'updatable-timer',
+  task_queue: 'updatable-timer-sample',
   workflows: [UpdatableTimer::UpdatableTimerWorkflow]
 )