Skip to content

Commit f54c468

Browse files
author
Nayeem Kamal
committed
resolve merge conflicts
1 parent 52d3502 commit f54c468

File tree

6 files changed

+42
-42
lines changed

6 files changed

+42
-42
lines changed

‎dd-java-agent/agent-llmobs/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
plugins {
12-
id 'com.github.johnrengelman.shadow'
12+
id 'com.gradleup.shadow'
1313
id 'java-test-fixtures'
1414
}
1515

‎dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/LLMObsSystem.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ public LLMObsSpan startLLMSpan(
4848
String modelName,
4949
String modelProvider,
5050
@Nullable String mlApp,
51-
@Nullable String sessionID) {
51+
@Nullable String sessionId) {
5252

5353
DDLLMObsSpan span =
5454
new DDLLMObsSpan(
55-
Tags.LLMOBS_LLM_SPAN_KIND, spanName, getMLApp(mlApp), sessionID, serviceName);
55+
Tags.LLMOBS_LLM_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName);
5656

5757
if (modelName == null || modelName.isEmpty()) {
5858
modelName = CUSTOM_MODEL_VAL;
@@ -68,30 +68,30 @@ public LLMObsSpan startLLMSpan(
6868

6969
@Override
7070
public LLMObsSpan startAgentSpan(
71-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
71+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
7272
return new DDLLMObsSpan(
73-
Tags.LLMOBS_AGENT_SPAN_KIND, spanName, getMLApp(mlApp), sessionID, serviceName);
73+
Tags.LLMOBS_AGENT_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName);
7474
}
7575

7676
@Override
7777
public LLMObsSpan startToolSpan(
78-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
78+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
7979
return new DDLLMObsSpan(
80-
Tags.LLMOBS_TOOL_SPAN_KIND, spanName, getMLApp(mlApp), sessionID, serviceName);
80+
Tags.LLMOBS_TOOL_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName);
8181
}
8282

8383
@Override
8484
public LLMObsSpan startTaskSpan(
85-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
85+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
8686
return new DDLLMObsSpan(
87-
Tags.LLMOBS_TASK_SPAN_KIND, spanName, getMLApp(mlApp), sessionID, serviceName);
87+
Tags.LLMOBS_TASK_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName);
8888
}
8989

9090
@Override
9191
public LLMObsSpan startWorkflowSpan(
92-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
92+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
9393
return new DDLLMObsSpan(
94-
Tags.LLMOBS_WORKFLOW_SPAN_KIND, spanName, getMLApp(mlApp), sessionID, serviceName);
94+
Tags.LLMOBS_WORKFLOW_SPAN_KIND, spanName, getMLApp(mlApp), sessionId, serviceName);
9595
}
9696

9797
private String getMLApp(String mlApp) {

‎dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public DDLLMObsSpan(
4343
@Nonnull String kind,
4444
String spanName,
4545
@Nonnull String mlApp,
46-
String sessionID,
46+
String sessionId,
4747
@Nonnull String serviceName) {
4848

4949
if (null == spanName || spanName.isEmpty()) {
@@ -60,8 +60,8 @@ public DDLLMObsSpan(
6060
this.span.setTag(SPAN_KIND, kind);
6161
this.spanKind = kind;
6262
this.span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.ML_APP, mlApp);
63-
if (sessionID != null && !sessionID.isEmpty()) {
64-
this.span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.SESSION_ID, sessionID);
63+
if (sessionId != null && !sessionId.isEmpty()) {
64+
this.span.setTag(LLMOBS_TAG_PREFIX + LLMObsTags.SESSION_ID, sessionId);
6565
}
6666
}
6767

‎dd-java-agent/agent-llmobs/src/test/groovy/datadog/trace/llmobs/domain/DDLLMObsSpanTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class DDLLMObsSpanTest extends DDSpecification{
256256
def toolCall = spanOutputMsg.getToolCalls().get(0)
257257
assert toolCall.getName().equals("weather-tool")
258258
assert toolCall.getType().equals("function")
259-
assert toolCall.getToolID().equals("6176241000")
259+
assert toolCall.getToolId().equals("6176241000")
260260
def expectedToolArgs = Maps.of("location", "paris")
261261
assert toolCall.getArguments().equals(expectedToolArgs)
262262
}

‎dd-trace-api/src/main/java/datadog/trace/api/llmobs/LLMObs.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,33 @@ public static LLMObsSpan startLLMSpan(
1515
String modelName,
1616
String modelProvider,
1717
@Nullable String mlApp,
18-
@Nullable String sessionID) {
18+
@Nullable String sessionId) {
1919

20-
return SPAN_FACTORY.startLLMSpan(spanName, modelName, modelProvider, mlApp, sessionID);
20+
return SPAN_FACTORY.startLLMSpan(spanName, modelName, modelProvider, mlApp, sessionId);
2121
}
2222

2323
public static LLMObsSpan startAgentSpan(
24-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
24+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
2525

26-
return SPAN_FACTORY.startAgentSpan(spanName, mlApp, sessionID);
26+
return SPAN_FACTORY.startAgentSpan(spanName, mlApp, sessionId);
2727
}
2828

2929
public static LLMObsSpan startToolSpan(
30-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
30+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
3131

32-
return SPAN_FACTORY.startToolSpan(spanName, mlApp, sessionID);
32+
return SPAN_FACTORY.startToolSpan(spanName, mlApp, sessionId);
3333
}
3434

3535
public static LLMObsSpan startTaskSpan(
36-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
36+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
3737

38-
return SPAN_FACTORY.startTaskSpan(spanName, mlApp, sessionID);
38+
return SPAN_FACTORY.startTaskSpan(spanName, mlApp, sessionId);
3939
}
4040

4141
public static LLMObsSpan startWorkflowSpan(
42-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
42+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
4343

44-
return SPAN_FACTORY.startWorkflowSpan(spanName, mlApp, sessionID);
44+
return SPAN_FACTORY.startWorkflowSpan(spanName, mlApp, sessionId);
4545
}
4646

4747
public interface LLMObsSpanFactory {
@@ -50,33 +50,33 @@ LLMObsSpan startLLMSpan(
5050
String modelName,
5151
String modelProvider,
5252
@Nullable String mlApp,
53-
@Nullable String sessionID);
53+
@Nullable String sessionId);
5454

55-
LLMObsSpan startAgentSpan(String spanName, @Nullable String mlApp, @Nullable String sessionID);
55+
LLMObsSpan startAgentSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
5656

57-
LLMObsSpan startToolSpan(String spanName, @Nullable String mlApp, @Nullable String sessionID);
57+
LLMObsSpan startToolSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
5858

59-
LLMObsSpan startTaskSpan(String spanName, @Nullable String mlApp, @Nullable String sessionID);
59+
LLMObsSpan startTaskSpan(String spanName, @Nullable String mlApp, @Nullable String sessionId);
6060

6161
LLMObsSpan startWorkflowSpan(
62-
String spanName, @Nullable String mlApp, @Nullable String sessionID);
62+
String spanName, @Nullable String mlApp, @Nullable String sessionId);
6363
}
6464

6565
public static class ToolCall {
6666
private String name;
6767
private String type;
68-
private String toolID;
68+
private String toolId;
6969
private Map<String, Object> arguments;
7070

7171
public static ToolCall from(
72-
String name, String type, String toolID, Map<String, Object> arguments) {
73-
return new ToolCall(name, type, toolID, arguments);
72+
String name, String type, String toolId, Map<String, Object> arguments) {
73+
return new ToolCall(name, type, toolId, arguments);
7474
}
7575

76-
private ToolCall(String name, String type, String toolID, Map<String, Object> arguments) {
76+
private ToolCall(String name, String type, String toolId, Map<String, Object> arguments) {
7777
this.name = name;
7878
this.type = type;
79-
this.toolID = toolID;
79+
this.toolId = toolId;
8080
this.arguments = arguments;
8181
}
8282

@@ -88,8 +88,8 @@ public String getType() {
8888
return type;
8989
}
9090

91-
public String getToolID() {
92-
return toolID;
91+
public String gettoolId() {
92+
return toolId;
9393
}
9494

9595
public Map<String, Object> getArguments() {

‎dd-trace-api/src/main/java/datadog/trace/api/llmobs/noop/NoOpLLMObsSpanFactory.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ public LLMObsSpan startLLMSpan(
1212
String modelName,
1313
String modelProvider,
1414
@Nullable String mlApp,
15-
@Nullable String sessionID) {
15+
@Nullable String sessionId) {
1616
return NoOpLLMObsSpan.INSTANCE;
1717
}
1818

1919
public LLMObsSpan startAgentSpan(
20-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
20+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
2121
return NoOpLLMObsSpan.INSTANCE;
2222
}
2323

2424
public LLMObsSpan startToolSpan(
25-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
25+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
2626
return NoOpLLMObsSpan.INSTANCE;
2727
}
2828

2929
public LLMObsSpan startTaskSpan(
30-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
30+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
3131
return NoOpLLMObsSpan.INSTANCE;
3232
}
3333

3434
public LLMObsSpan startWorkflowSpan(
35-
String spanName, @Nullable String mlApp, @Nullable String sessionID) {
35+
String spanName, @Nullable String mlApp, @Nullable String sessionId) {
3636
return NoOpLLMObsSpan.INSTANCE;
3737
}
3838
}

0 commit comments

Comments
 (0)