Update SDK to beta 3 (temporalio#27)

cretz · web-flow · commit e8e8ee609007 · 2022-11-15T06:30:15.000-06:00
diff --git a/hello/hello_activity_choice.py b/hello/hello_activity_choice.py
@@ -58,31 +58,33 @@ async def run(self, list: ShoppingList) -> str:
         # Order each thing on the list
         ordered: List[str] = []
         for item in list.items:
-            if item.fruit is Fruit.APPLE:
+            # TODO(cretz): Use "is" instead of "==" after
+            # https://github.com/temporalio/sdk-python/issues/200 is fixed
+            if item.fruit == Fruit.APPLE:
                 ordered.append(
                     await workflow.execute_activity(
                         order_apples,
                         item.amount,
                         start_to_close_timeout=timedelta(seconds=5),
                     )
                 )
-            elif item.fruit is Fruit.BANANA:
+            elif item.fruit == Fruit.BANANA:
                 ordered.append(
                     await workflow.execute_activity(
                         order_bananas,
                         item.amount,
                         start_to_close_timeout=timedelta(seconds=5),
                     )
                 )
-            elif item.fruit is Fruit.CHERRY:
+            elif item.fruit == Fruit.CHERRY:
                 ordered.append(
                     await workflow.execute_activity(
                         order_cherries,
                         item.amount,
                         start_to_close_timeout=timedelta(seconds=5),
                     )
                 )
-            elif item.fruit is Fruit.ORANGE:
+            elif item.fruit == Fruit.ORANGE:
                 ordered.append(
                     await workflow.execute_activity(
                         order_oranges,
diff --git a/hello/hello_activity_multiprocess.py b/hello/hello_activity_multiprocess.py
@@ -2,14 +2,17 @@
 import multiprocessing
 import os
 import time
-from concurrent.futures import ProcessPoolExecutor
 from dataclasses import dataclass
 from datetime import timedelta
 
 from temporalio import activity, workflow
 from temporalio.client import Client
 from temporalio.worker import SharedStateManager, Worker
 
+# TODO(cretz): https://github.com/temporalio/sdk-python/issues/201
+with workflow.unsafe.sandbox_unrestricted():
+    from concurrent.futures import ProcessPoolExecutor
+
 
 @dataclass
 class ComposeGreetingInput:
diff --git a/hello/hello_activity_threaded.py b/hello/hello_activity_threaded.py
@@ -1,14 +1,17 @@
 import asyncio
 import threading
 import time
-from concurrent.futures import ThreadPoolExecutor
 from dataclasses import dataclass
 from datetime import timedelta
 
 from temporalio import activity, workflow
 from temporalio.client import Client
 from temporalio.worker import Worker
 
+# TODO(cretz): https://github.com/temporalio/sdk-python/issues/201
+with workflow.unsafe.sandbox_unrestricted():
+    from concurrent.futures import ThreadPoolExecutor
+
 
 @dataclass
 class ComposeGreetingInput:
diff --git a/open_telemetry/starter.py b/open_telemetry/starter.py
@@ -3,17 +3,18 @@
 from temporalio.client import Client
 from temporalio.contrib.opentelemetry import TracingInterceptor
 
-from open_telemetry.worker import GreetingWorkflow, init_opentelemetry
+from open_telemetry.worker import GreetingWorkflow, init_runtime_with_telemetry
 
 
 async def main():
-    init_opentelemetry()
+    runtime = init_runtime_with_telemetry()
 
     # Connect client
     client = await Client.connect(
         "localhost:7233",
         # Use OpenTelemetry interceptor
         interceptors=[TracingInterceptor()],
+        runtime=runtime,
     )
 
     # Run workflow
diff --git a/open_telemetry/worker.py b/open_telemetry/worker.py
@@ -1,6 +1,7 @@
 import asyncio
 from datetime import timedelta
 
+import opentelemetry.context
 from opentelemetry import trace
 
 # See note in README about why Thrift
@@ -9,7 +10,12 @@
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from temporalio import activity, workflow
-from temporalio.bridge import telemetry
+from temporalio.bridge.runtime import (
+    MetricsConfig,
+    OpenTelemetryConfig,
+    Runtime,
+    TelemetryConfig,
+)
 from temporalio.client import Client
 from temporalio.contrib.opentelemetry import TracingInterceptor
 from temporalio.worker import Worker
@@ -34,30 +40,38 @@ async def compose_greeting(name: str) -> str:
 interrupt_event = asyncio.Event()
 
 
-def init_opentelemetry() -> None:
+def init_runtime_with_telemetry() -> Runtime:
     # Setup global tracer for workflow traces
     provider = TracerProvider(resource=Resource.create({SERVICE_NAME: "my-service"}))
     provider.add_span_processor(BatchSpanProcessor(JaegerExporter()))
     trace.set_tracer_provider(provider)
 
     # Setup SDK metrics to OTel endpoint
-    telemetry.init_telemetry(
-        telemetry.TelemetryConfig(
-            otel_metrics=telemetry.OtelCollectorConfig(
-                url="http://localhost:4317", headers={}
+    return Runtime(
+        telemetry=TelemetryConfig(
+            # TODO(cretz): Remove type ignore when
+            # https://github.com/temporalio/sdk-python/issues/198 fixed
+            metrics=MetricsConfig(  # type: ignore
+                opentelemetry=OpenTelemetryConfig(
+                    url="http://localhost:4317", headers={}
+                )
             )
         )
     )
 
 
 async def main():
-    init_opentelemetry()
+    runtime = init_runtime_with_telemetry()
+
+    # See https://github.com/temporalio/sdk-python/issues/199
+    opentelemetry.context.get_current()
 
     # Connect client
     client = await Client.connect(
         "localhost:7233",
         # Use OpenTelemetry interceptor
         interceptors=[TracingInterceptor()],
+        runtime=runtime,
     )
 
     # Run a worker for the workflow
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -17,7 +17,7 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.7"
-temporalio = "^0.1b2"
+temporalio = "^0.1b3"
 
 [tool.poetry.dev-dependencies]
 black = "^22.3.0"
