lint

open-telemetry · Nov 21, 2024 · 26c92b5 · 26c92b5
1 parent e36fe2a
commit 26c92b5
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -67,7 +67,14 @@
     for f in listdir(resource)
     if isdir(join(resource, f))
 ]
-sys.path[:0] = exp_dirs + instr_dirs + instr_genai_dirs + sdk_ext_dirs + prop_dirs + resource_dirs
+sys.path[:0] = (
+    exp_dirs
+    + instr_dirs
+    + instr_genai_dirs
+    + sdk_ext_dirs
+    + prop_dirs
+    + resource_dirs
+)
 
 # -- Project information -----------------------------------------------------
 

diff --git a/docs/instrumentation-genai/openai.rst b/docs/instrumentation-genai/openai.rst
@@ -1,5 +1,5 @@
 OpenTelemetry Python - OpenAI Instrumentation
-===========================================
+============================================
 
 .. automodule:: opentelemetry.instrumentation.openai_v2
     :members:

diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/examples/manual/main.py b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/examples/manual/main.py
@@ -2,18 +2,20 @@
 
 from openai import OpenAI
 
-from opentelemetry.instrumentation.openai_v2 import OpenAIInstrumentor
-
 # NOTE: OpenTelemetry Python Logs and Events APIs are in beta
-from opentelemetry import trace, _logs, _events
-from opentelemetry.sdk.trace import TracerProvider
-from opentelemetry.sdk._logs import LoggerProvider
+from opentelemetry import _events, _logs, trace
+from opentelemetry.exporter.otlp.proto.http._log_exporter import (
+    OTLPLogExporter,
+)
+from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
+    OTLPSpanExporter,
+)
+from opentelemetry.instrumentation.openai_v2 import OpenAIInstrumentor
 from opentelemetry.sdk._events import EventLoggerProvider
-
-from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
-from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
-from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
 # configure tracing
 trace.set_tracer_provider(TracerProvider())
@@ -23,14 +25,16 @@
 
 # configure logging and events
 _logs.set_logger_provider(LoggerProvider())
-_logs.get_logger_provider().add_log_record_processor(BatchLogRecordProcessor(OTLPLogExporter()))
+_logs.get_logger_provider().add_log_record_processor(
+    BatchLogRecordProcessor(OTLPLogExporter())
+)
 _events.set_event_logger_provider(EventLoggerProvider())
 
 # instrument OpenAI
 OpenAIInstrumentor().instrument()
 
-def main():
 
+def main():
     client = OpenAI()
     chat_completion = client.chat.completions.create(
         model=os.getenv("CHAT_MODEL", "gpt-4o-mini"),

diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/test-requirements-0.txt
@@ -7,6 +7,7 @@ pytest==7.4.4
 pytest-vcr==1.0.2
 pytest-asyncio==0.21.0
 wrapt==1.16.0
+opentelemetry-exporter-otlp-proto-http~=1.28
 opentelemetry-api==1.28  # when updating, also update in pyproject.toml
 opentelemetry-sdk==1.28  # when updating, also update in pyproject.toml
 opentelemetry-semantic-conventions==0.49b0  # when updating, also update in pyproject.toml

diff --git a/...tation-genai/opentelemetry-instrumentation-openai-v2/tests/test_async_chat_completions.py b/...tation-genai/opentelemetry-instrumentation-openai-v2/tests/test_async_chat_completions.py
@@ -86,19 +86,16 @@ async def test_async_chat_completion_no_content(
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
 
-    assert_message_in_logs(
-        logs[0], "gen_ai.user.message", None, spans[0]
-    )
+    assert_message_in_logs(logs[0], "gen_ai.user.message", None, spans[0])
 
     choice_event = {
         "index": 0,
         "finish_reason": "stop",
-        "message": {
-            "role": "assistant"
-        },
+        "message": {"role": "assistant"},
     }
     assert_message_in_logs(logs[1], "gen_ai.choice", choice_event, spans[0])
 
+
 @pytest.mark.asyncio()
 async def test_async_chat_completion_bad_endpoint(
     span_exporter, instrument_no_content

diff --git a/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/test_chat_completions.py b/instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/test_chat_completions.py
@@ -84,16 +84,12 @@ def test_chat_completion_no_content(
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
 
-    assert_message_in_logs(
-        logs[0], "gen_ai.user.message", None, spans[0]
-    )
+    assert_message_in_logs(logs[0], "gen_ai.user.message", None, spans[0])
 
     choice_event = {
         "index": 0,
         "finish_reason": "stop",
-        "message": {
-            "role": "assistant"
-        },
+        "message": {"role": "assistant"},
     }
     assert_message_in_logs(logs[1], "gen_ai.choice", choice_event, spans[0])