fix fixtures

Author: Liudmila Molkova

instrumentation/opentelemetry-instrumentation-openai-v2/tests/conftest.py

@@ -19,40 +19,30 @@
     InMemorySpanExporter,
 )
 
-
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="function")
 def span_exporter():
     exporter = InMemorySpanExporter()
-    processor = SimpleSpanProcessor(exporter)
-
-    provider = TracerProvider()
-    provider.add_span_processor(processor)
-    trace.set_tracer_provider(provider)
-
-    return exporter
+    yield exporter
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture(scope="function")
 def log_exporter():
     exporter = InMemoryLogExporter()
-    processor = SimpleLogRecordProcessor(exporter)
+    yield exporter
 
-    provider = LoggerProvider()
-    provider.add_log_record_processor(processor)
+@pytest.fixture(scope="function")
+def tracer_provider(span_exporter):
+    provider = TracerProvider()
+    provider.add_span_processor(SimpleSpanProcessor(span_exporter))
+    return provider
 
+@pytest.fixture(scope="function")
+def event_provider(log_exporter):
+    provider = LoggerProvider()
+    provider.add_log_record_processor(SimpleLogRecordProcessor(log_exporter))
     event_provider = EventLoggerProvider(provider)
 
-    _logs.set_logger_provider(provider)
-    _events.set_event_logger_provider(event_provider)
-
-    return exporter
-
-
-@pytest.fixture(autouse=True)
-def clear_exporter(span_exporter, log_exporter):
-    span_exporter.clear()
-    log_exporter.clear()
-
+    return event_provider
 
 @pytest.fixture(autouse=True)
 def environment():
@@ -74,15 +64,13 @@ def vcr_config():
     }
 
 
-@pytest.fixture(scope="session", autouse=True)
-def instrument():
-    OpenAIInstrumentor().instrument()
-
+@pytest.fixture(scope="function", autouse=True)
+def instrument(tracer_provider, event_provider):
+    instrumentor = OpenAIInstrumentor()
+    instrumentor.instrument(tracer_provider=tracer_provider, event_provider=event_provider)
 
-@pytest.fixture(scope="session", autouse=True)
-def uninstrument():
-    # OpenAIInstrumentor().uninstrument()
-    pass
+    yield instrumentor
+    instrumentor.uninstrument()
 
 
 def scrub_response_headers(response):

instrumentation/opentelemetry-instrumentation-openai-v2/tests/test_chat_completions.py

@@ -54,7 +54,7 @@ def test_chat_completion(span_exporter, log_exporter, openai_client):
 
 
 def test_chat_completion_bad_endpoint(
-    span_exporter, log_exporter, openai_client
+    span_exporter
 ):
     llm_model_value = "gpt-4o-mini"
     messages_value = [{"role": "user", "content": "Say this is a test"}]
@@ -83,7 +83,8 @@ def test_chat_completion_bad_endpoint(
 
 
 @pytest.mark.vcr()
-def test_chat_completion_404(span_exporter, log_exporter, openai_client):
+def test_chat_completion_404(span_exporter, openai_client):
+
     llm_model_value = "this-model-does-not-exist"
     messages_value = [{"role": "user", "content": "Say this is a test"}]
 
@@ -108,7 +109,7 @@ def test_chat_completion_404(span_exporter, log_exporter, openai_client):
 
 @pytest.mark.vcr()
 def test_chat_completion_extra_params(
-    span_exporter, log_exporter, openai_client
+    span_exporter, openai_client
 ):
     llm_model_value = "gpt-4o-mini"
     messages_value = [{"role": "user", "content": "Say this is a test"}]
@@ -331,6 +332,7 @@ def test_chat_completion_tool_calls(
 
 @pytest.mark.vcr()
 def test_chat_completion_streaming(span_exporter, log_exporter, openai_client):
+
     llm_model_value = "gpt-4"
     messages_value = [{"role": "user", "content": "Say this is a test"}]