Remove xray

Author: dandavison

hello_nexus/caller/workflows.py

@@ -1,6 +1,5 @@
 from datetime import timedelta
 
-import xray
 from temporalio import workflow
 from temporalio.exceptions import FailureError
 from temporalio.workflow import NexusClient
@@ -25,7 +24,6 @@ def __init__(self):
 
 @workflow.defn
 class EchoCallerWorkflow(CallerWorkflowBase):
-    @xray.start_as_current_workflow_method_span()
     @workflow.run
     async def run(self, message: str) -> EchoOutput:
         op_output = await self.nexus_client.execute_operation(
@@ -37,7 +35,6 @@ async def run(self, message: str) -> EchoOutput:
 
 @workflow.defn
 class Echo2CallerWorkflow(CallerWorkflowBase):
-    @xray.start_as_current_workflow_method_span()
     @workflow.run
     async def run(self, message: str) -> EchoOutput:
         op_output = await self.nexus_client.execute_operation(
@@ -49,7 +46,6 @@ async def run(self, message: str) -> EchoOutput:
 
 @workflow.defn
 class Echo3CallerWorkflow(CallerWorkflowBase):
-    @xray.start_as_current_workflow_method_span()
     @workflow.run
     async def run(self, message: str) -> EchoOutput:
         op_output = await self.nexus_client.execute_operation(
@@ -61,7 +57,6 @@ async def run(self, message: str) -> EchoOutput:
 
 @workflow.defn
 class HelloCallerWorkflow(CallerWorkflowBase):
-    @xray.start_as_current_workflow_method_span()
     @workflow.run
     async def run(self, name: str) -> HelloOutput:
         # TODO: Java returns a handle immediately. The handle has a blocking method to
@@ -71,36 +66,24 @@ async def run(self, name: str) -> HelloOutput:
             MyNexusService.hello,
             HelloInput(name),
         )
-        span = xray.get_current_span()
-        span.add_event("Got NexusOperationHandle (1)")
         assert handle.cancel()
         try:
             await handle
         # TODO(dan): But should this be asyncio.CancelledError? (there's also
         # temporalio.exceptions.CancelledError which doesn't inherit from
         # asyncio.CancelledError; as a workflow author, this confused me)
-        except FailureError as e:
-            span.add_event(
-                "Caught error, retrying operation",
-                attributes={
-                    "type": e.__class__.__name__,
-                    "message": str(e),
-                },
-            )
+        except FailureError:
             handle = await self.nexus_client.start_operation(
                 MyNexusService.hello,
                 HelloInput(name),
             )
-            span.add_event("Got NexusOperationHandle (2)")
             result = await handle
-            span.add_event(f"Got result (2): {result}")
             return result
         raise AssertionError("Expected Nexus operation to be cancelled")
 
 
 @workflow.defn
 class Hello2CallerWorkflow(CallerWorkflowBase):
-    @xray.start_as_current_workflow_method_span()
     @workflow.run
     async def run(self, name: str) -> HelloOutput:
         handle = await self.nexus_client.start_operation(
@@ -112,7 +95,6 @@ async def run(self, name: str) -> HelloOutput:
 
 @workflow.defn
 class Hello3CallerWorkflow(CallerWorkflowBase):
-    @xray.start_as_current_workflow_method_span()
     @workflow.run
     async def run(self, name: str) -> HelloOutput:
         handle = await self.nexus_client.start_operation(

hello_nexus/handler/workflows.py

@@ -1,6 +1,5 @@
 import asyncio
 
-import xray
 from temporalio import workflow
 
 from hello_nexus.service.interface import (
@@ -15,7 +14,6 @@ class HelloWorkflow:
     Workflow that backs the `hello` operation.
     """
 
-    @xray.start_as_current_workflow_method_span()
     @workflow.run
     async def run(self, input: HelloInput) -> HelloOutput:
         await asyncio.sleep(1)  # so that it can be cancelled