Making raise on cancellation the default (#935)

* Making raise on cancellation the default

* Lint

* Remove todo

* Remove code from other feature

Author: tconley1428

temporalio/worker/_workflow_instance.py

@@ -1620,16 +1620,14 @@ async def run_activity() -> Any:
                     # If an activity future completes at the same time as a cancellation is being processed, the cancellation would be swallowed
                     # _WorkflowLogicFlag.RAISE_ON_CANCELLING_COMPLETED_ACTIVITY will correctly reraise the exception
                     if handle._result_fut.done():
-                        # TODO in next release, check sdk flag when not replaying instead of global override, remove the override, and set flag use
                         if (
-                            (
-                                not self._is_replaying
-                                and _raise_on_cancelling_completed_activity_override
-                            )
+                            not self._is_replaying
                             or _WorkflowLogicFlag.RAISE_ON_CANCELLING_COMPLETED_ACTIVITY
                             in self._current_internal_flags
                         ):
-                            # self._current_completion.successful.used_internal_flags.append(WorkflowLogicFlag.RAISE_ON_CANCELLING_COMPLETED_ACTIVITY)
+                            self._current_completion.successful.used_internal_flags.append(
+                                _WorkflowLogicFlag.RAISE_ON_CANCELLING_COMPLETED_ACTIVITY
+                            )
                             raise
                     # Send a cancel request to the activity
                     handle._apply_cancel_command(self._add_command())
@@ -3138,7 +3136,3 @@ class _WorkflowLogicFlag(IntEnum):
     """Flags that may be set on task/activation completion to differentiate new from old workflow behavior."""
 
     RAISE_ON_CANCELLING_COMPLETED_ACTIVITY = 1
-
-
-# Used by tests to validate behavior prior to SDK flag becoming default
-_raise_on_cancelling_completed_activity_override = False

tests/worker/test_workflow.py

@@ -8005,8 +8005,6 @@ async def test_quick_activity_swallows_cancellation(client: Client):
         activities=[short_activity_async],
         activity_executor=concurrent.futures.ThreadPoolExecutor(max_workers=1),
     ) as worker:
-        temporalio.worker._workflow_instance._raise_on_cancelling_completed_activity_override = True
-
         for i in range(10):
             wf_duration = random.uniform(5.0, 15.0)
             wf_handle = await client.start_workflow(
@@ -8028,8 +8026,6 @@ async def test_quick_activity_swallows_cancellation(client: Client):
             assert isinstance(cause, CancelledError)
             assert cause.message == "Workflow cancelled"
 
-        temporalio.worker._workflow_instance._raise_on_cancelling_completed_activity_override = False
-
 
 async def test_workflow_logging_trace_identifier(client: Client):
     with LogCapturer().logs_captured(