test: share OTEL tracer reset fixture

Author: tconley1428

tests/conftest.py

@@ -4,8 +4,10 @@
 import sys
 from collections.abc import AsyncGenerator, Iterator
 
+import opentelemetry.trace
 import pytest
 import pytest_asyncio
+from opentelemetry.util._once import Once
 
 from temporalio.client import Client
 from temporalio.testing import WorkflowEnvironment
@@ -196,3 +198,13 @@ def pytest_cmdline_main(config):  # type: ignore[reportMissingParameterType, rep
 @pytest.fixture
 def continue_as_new_suggest_history_count() -> int:
     return CONTINUE_AS_NEW_SUGGEST_HISTORY_COUNT
+
+
+@pytest.fixture
+def reset_otel_tracer_provider():
+    """Reset global OpenTelemetry tracer provider state around tests."""
+    opentelemetry.trace._TRACER_PROVIDER_SET_ONCE = Once()
+    opentelemetry.trace._TRACER_PROVIDER = None
+    yield
+    opentelemetry.trace._TRACER_PROVIDER_SET_ONCE = Once()
+    opentelemetry.trace._TRACER_PROVIDER = None

tests/contrib/google_adk_agents/test_google_adk_agents.py

@@ -501,7 +501,10 @@ async def test_mcp_agent(client: Client, use_local_model: bool):
 
 
 @pytest.mark.asyncio
-async def test_single_agent_telemetry(client: Client):
+async def test_single_agent_telemetry(
+    client: Client,
+    reset_otel_tracer_provider,  # type: ignore[reportUnusedParameter]
+):
     exporter = InMemorySpanExporter()
     provider = create_tracer_provider()
     provider.add_span_processor(SimpleSpanProcessor(exporter))

tests/contrib/openai_agents/test_openai_tracing.py

@@ -265,19 +265,16 @@ def print_otel_spans(spans: tuple[ReadableSpan, ...]):
 def set_test_tracer_provider() -> InMemorySpanExporter:
     exporter = InMemorySpanExporter()
 
-    # Reset global so tests don't conflict
-    from opentelemetry.util._once import Once
-
-    opentelemetry.trace._TRACER_PROVIDER_SET_ONCE = Once()
-    opentelemetry.trace._TRACER_PROVIDER = None
-
     provider = create_tracer_provider()
     provider.add_span_processor(SimpleSpanProcessor(exporter))
     opentelemetry.trace.set_tracer_provider(provider)
     return exporter
 
 
-async def test_external_trace_to_workflow_spans(client: Client):
+async def test_external_trace_to_workflow_spans(
+    client: Client,
+    reset_otel_tracer_provider: Any,  # type: ignore[reportUnusedParameter]
+):
     """Test: External trace -> workflow spans (with worker restart)."""
     exporter = set_test_tracer_provider()
     workflow_id = None
@@ -364,7 +361,10 @@ async def ready() -> bool:
     ), f"All spans should have unique IDs, got: {span_ids}"
 
 
-async def test_external_trace_and_span_to_workflow_spans(client: Client):
+async def test_external_trace_and_span_to_workflow_spans(
+    client: Client,
+    reset_otel_tracer_provider: Any,  # type: ignore[reportUnusedParameter]
+):
     """Test: External trace + span -> workflow spans (with worker restart)."""
     exporter = set_test_tracer_provider()
     workflow_id = None
@@ -461,7 +461,10 @@ async def ready() -> bool:
     ), f"All spans should have unique IDs, got: {span_ids}"
 
 
-async def test_workflow_only_trace_to_spans(client: Client):
+async def test_workflow_only_trace_to_spans(
+    client: Client,
+    reset_otel_tracer_provider: Any,  # type: ignore[reportUnusedParameter]
+):
     """Test: Workflow-only trace -> spans (with worker restart)."""
     exporter = set_test_tracer_provider()
     workflow_id = None
@@ -551,7 +554,10 @@ async def run(self) -> str:
                 return "done"
 
 
-async def test_custom_span_without_trace_context(client: Client):
+async def test_custom_span_without_trace_context(
+    client: Client,
+    reset_otel_tracer_provider: Any,  # type: ignore[reportUnusedParameter]
+):
     """Test that custom_span() without a trace context emits no spans.
 
     This validates our hypothesis about why the main test fails:
@@ -591,7 +597,10 @@ async def test_custom_span_without_trace_context(client: Client):
     ), f"Expected no spans without trace context, but found: {[s.name for s in spans]}"
 
 
-async def test_otel_tracing_in_runner(client: Client):
+async def test_otel_tracing_in_runner(
+    client: Client,
+    reset_otel_tracer_provider: Any,  # type: ignore[reportUnusedParameter]
+):
     """Test the tracing when executing an actual OpenAI Runner."""
     exporter = set_test_tracer_provider()
 
@@ -750,7 +759,10 @@ def proceed(self) -> None:
         self._proceed = True
 
 
-async def test_sdk_trace_to_otel_span_parenting(client: Client):
+async def test_sdk_trace_to_otel_span_parenting(
+    client: Client,
+    reset_otel_tracer_provider: Any,  # type: ignore[reportUnusedParameter]
+):
     """Test that OTEL spans started in workflow are properly parented to client SDK trace."""
     exporter = set_test_tracer_provider()
     workflow_id = None

tests/contrib/opentelemetry/test_opentelemetry_plugin.py

@@ -13,7 +13,6 @@
 from opentelemetry.trace import (
     get_tracer,
 )
-from opentelemetry.util._once import Once
 
 import temporalio.contrib.opentelemetry.workflow
 from temporalio import activity, nexus, workflow
@@ -30,16 +29,6 @@
 logger = logging.getLogger(__name__)
 
 
-@pytest.fixture
-def reset_otel_tracer_provider():
-    """Reset OpenTelemetry tracer provider state to allow multiple test runs."""
-    opentelemetry.trace._TRACER_PROVIDER_SET_ONCE = Once()
-    opentelemetry.trace._TRACER_PROVIDER = None
-    yield
-    opentelemetry.trace._TRACER_PROVIDER_SET_ONCE = Once()
-    opentelemetry.trace._TRACER_PROVIDER = None
-
-
 @activity.defn
 async def simple_no_context_activity() -> str:
     with get_tracer(__name__).start_as_current_span("Activity"):