add uninstrument in tests + remove any none values from span attributes

Author: alizenhom

instrumentation/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/patch.py

@@ -54,7 +54,6 @@ def traced_method(wrapped, instance, args, kwargs):
             name=span_name, kind=SpanKind.CLIENT, attributes=span_attributes
         )
         if span.is_recording():
-            _set_input_attributes(span, span_attributes)
             set_event_prompt(span, json.dumps(llm_prompts))
 
         try:
@@ -84,12 +83,6 @@ def traced_method(wrapped, instance, args, kwargs):
     return traced_method
 
 
-@silently_fail
-def _set_input_attributes(span, attributes):
-    for field, value in attributes.items():
-        set_span_attribute(span, field, value)
-
-
 @silently_fail
 def _set_response_attributes(span, result):
     set_span_attribute(

instrumentation/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/utils.py

@@ -143,7 +143,7 @@ def get_llm_request_attributes(
     operation_name=GenAIAttributes.GenAiOperationNameValues.CHAT.value,
 ):
 
-    return {
+    attributes = {
         GenAIAttributes.GEN_AI_OPERATION_NAME: operation_name,
         GenAIAttributes.GEN_AI_SYSTEM: GenAIAttributes.GenAiSystemValues.OPENAI.value,
         GenAIAttributes.GEN_AI_REQUEST_MODEL: kwargs.get(
@@ -160,3 +160,6 @@ def get_llm_request_attributes(
             "frequency_penalty"
         ),
     }
+
+    # filter out None values
+    return {k: v for k, v in attributes.items() if v is not None}

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

@@ -56,6 +56,11 @@ def instrument():
     OpenAIInstrumentor().instrument()
 
 
+@pytest.fixture(scope="session", autouse=True)
+def uninstrument():
+    OpenAIInstrumentor().uninstrument()
+
+
 def scrub_response_headers(response):
     """
     This scrubs sensitive response headers. Note they are case-sensitive!