Skip to content

llmobs: set model tag even when llmobs disabled #10644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ygree wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

llmobs: set model tag even when llmobs disabled #10644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ public void withChatCompletionCreateParams(
AgentSpan span, ChatCompletionCreateParams params, boolean stream) {
span.setResourceName(CHAT_COMPLETIONS_CREATE);
span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/chat/completions");
if (params != null) {
params
.model()
._value()
.asString()
.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
}
if (!llmObsEnabled) {
return;
}
Expand All @@ -39,11 +46,6 @@ public void withChatCompletionCreateParams(
if (params == null) {
return;
}
params
.model()
._value()
.asString()
.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));

span.setTag(
CommonTags.INPUT,
Expand Down
13 changes: 7 additions & 6 deletions ...java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ public class CompletionDecorator {
public void withCompletionCreateParams(AgentSpan span, CompletionCreateParams params) {
span.setResourceName(COMPLETIONS_CREATE);
span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/completions");
if (params != null) {
params
.model()
._value()
.asString()
.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
}
if (!llmObsEnabled) {
return;
}
Expand All @@ -31,12 +38,6 @@ public void withCompletionCreateParams(AgentSpan span, CompletionCreateParams pa
if (params == null) {
return;
}

params
.model()
._value()
.asString()
.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
params
.prompt()
.flatMap(p -> p.string())
Expand Down
12 changes: 7 additions & 5 deletions ...-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ public class EmbeddingDecorator {
public void withEmbeddingCreateParams(AgentSpan span, EmbeddingCreateParams params) {
span.setResourceName(EMBEDDINGS_CREATE);
span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/embeddings");
if (params != null) {
params
.model()
._value()
.asString()
.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));
}
if (!llmObsEnabled) {
return;
}
Expand All @@ -33,11 +40,6 @@ public void withEmbeddingCreateParams(AgentSpan span, EmbeddingCreateParams para
if (params == null) {
return;
}
params
.model()
._value()
.asString()
.ifPresent(str -> span.setTag(CommonTags.OPENAI_REQUEST_MODEL, str));

span.setTag(CommonTags.INPUT, embeddingDocuments(params.input()));

Expand Down
12 changes: 7 additions & 5 deletions ...i-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ public class ResponseDecorator {
public void withResponseCreateParams(AgentSpan span, ResponseCreateParams params) {
span.setResourceName(RESPONSES_CREATE);
span.setTag(CommonTags.OPENAI_REQUEST_ENDPOINT, "/v1/responses");
if (params != null) {
// Use ResponseCreateParams._model() b/o ResponseCreateParams.model() changed type from
// ResponsesModel to Optional<ResponsesModel> in
// https://github.com/openai/openai-java/commit/87dd64658da6cec7564f3b571e15ec0e2db0660b
String modelName = extractResponseModel(params._model());
span.setTag(CommonTags.OPENAI_REQUEST_MODEL, modelName);
}
if (!llmObsEnabled) {
return;
}
Expand All @@ -45,11 +52,6 @@ public void withResponseCreateParams(AgentSpan span, ResponseCreateParams params
if (params == null) {
return;
}
// Use ResponseCreateParams._model() b/o ResponseCreateParams.model() changed type from
// ResponsesModel to Optional<ResponsesModel> in
// https://github.com/openai/openai-java/commit/87dd64658da6cec7564f3b571e15ec0e2db0660b
String modelName = extractResponseModel(params._model());
span.setTag(CommonTags.OPENAI_REQUEST_MODEL, modelName);

List<LLMObs.LLMMessage> inputMessages = new ArrayList<>();

Expand Down