Skip to content

Commit 8268099

Browse files
authored
Merge pull request #2 from johanste/m-hietala/updated_responses_and_conversation_support
updated responses and conversation support
2 parents 339c4b3 + 3f5b74c commit 8268099

13 files changed

+2714
-78
lines changed

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/__init__.py

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,12 @@
6666
from .patch import (
6767
async_chat_completions_create,
6868
async_responses_create,
69+
async_conversations_create,
70+
async_conversation_items_list,
6971
chat_completions_create,
7072
responses_create,
73+
conversations_create,
74+
conversation_items_list,
7175
)
7276

7377

@@ -150,6 +154,38 @@ def _instrument(self, **kwargs):
150154
),
151155
)
152156

157+
wrap_function_wrapper(
158+
module="openai.resources.conversations.conversations",
159+
name="Conversations.create",
160+
wrapper=conversations_create(
161+
tracer, logger, instruments, is_content_enabled()
162+
),
163+
)
164+
165+
wrap_function_wrapper(
166+
module="openai.resources.conversations.conversations",
167+
name="AsyncConversations.create",
168+
wrapper=async_conversations_create(
169+
tracer, logger, instruments, is_content_enabled()
170+
),
171+
)
172+
173+
wrap_function_wrapper(
174+
module="openai.resources.conversations.items",
175+
name="Items.list",
176+
wrapper=conversation_items_list(
177+
tracer, logger, instruments, is_content_enabled()
178+
),
179+
)
180+
181+
wrap_function_wrapper(
182+
module="openai.resources.conversations.items",
183+
name="AsyncItems.list",
184+
wrapper=async_conversation_items_list(
185+
tracer, logger, instruments, is_content_enabled()
186+
),
187+
)
188+
153189
def _uninstrument(self, **kwargs):
154190
import openai # pylint: disable=import-outside-toplevel
155191

@@ -160,3 +196,7 @@ def _uninstrument(self, **kwargs):
160196
if _is_responses_api_supported():
161197
unwrap(openai.resources.responses.responses.Responses, "create")
162198
unwrap(openai.resources.responses.responses.AsyncResponses, "create")
199+
unwrap(openai.resources.conversations.conversations.Conversations, "create")
200+
unwrap(openai.resources.conversations.conversations.AsyncConversations, "create")
201+
unwrap(openai.resources.conversations.items.Items, "list")
202+
unwrap(openai.resources.conversations.items.AsyncItems, "list")

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

Lines changed: 641 additions & 57 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)