Skip to content

Commit 1acfda1

Browse files
authored
fix the config of plugin.springai.retrieval_query_length_limit (#809)
1 parent 9e770bf commit 1acfda1

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

apm-sniffer/apm-sdk-plugin/spring-plugins/spring-ai-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/ai/v1/AbstractObservationVectorStoreInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
8080
String query = request.getQuery();
8181
if (StringUtils.hasText(query) && SpringAiPluginConfig.Plugin.SpringAi.COLLECT_RETRIEVAL_QUERY) {
8282
int limit = SpringAiPluginConfig.Plugin.SpringAi.RETRIEVAL_QUERY_LENGTH_LIMIT;
83-
if (limit > 0 && query.length() > limit) {
83+
if (limit >= 0 && query.length() > limit) {
8484
query = query.substring(0, limit);
8585
}
8686
Tags.GEN_AI_RETRIEVAL_QUERY_TEXT.set(span, query);

apm-sniffer/apm-sdk-plugin/spring-plugins/spring-ai-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/ai/v1/ChatModelCallInterceptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private void collectPrompt(AbstractSpan span, Object[] allArguments) {
161161
InputMessages inputMessages = InputMessages.fromPrompt(prompt);
162162
String inputMessagesJson = inputMessages.toJson();
163163
int limit = SpringAiPluginConfig.Plugin.SpringAi.INPUT_MESSAGES_LENGTH_LIMIT;
164-
if (limit > 0 && inputMessagesJson.length() > limit) {
164+
if (limit >= 0 && inputMessagesJson.length() > limit) {
165165
inputMessagesJson = inputMessagesJson.substring(0, limit);
166166
}
167167

@@ -174,7 +174,7 @@ private void collectCompletion(AbstractSpan span, ChatResponse response) {
174174
String outputMessagesJson = outputMessages.toJson();
175175
int limit = SpringAiPluginConfig.Plugin.SpringAi.OUTPUT_MESSAGES_LENGTH_LIMIT;
176176

177-
if (limit > 0 && outputMessagesJson.length() > limit) {
177+
if (limit >= 0 && outputMessagesJson.length() > limit) {
178178
outputMessagesJson = outputMessagesJson.substring(0, limit);
179179
}
180180
Tags.GEN_AI_OUTPUT_MESSAGES.set(span, outputMessagesJson);

apm-sniffer/apm-sdk-plugin/spring-plugins/spring-ai-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/ai/v1/ChatModelStreamInterceptor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private void collectPrompt(AbstractSpan span, Object[] allArguments) {
218218
String inputMessagesJson = inputMessages.toJson();
219219

220220
int limit = SpringAiPluginConfig.Plugin.SpringAi.INPUT_MESSAGES_LENGTH_LIMIT;
221-
if (limit > 0 && inputMessagesJson.length() > limit) {
221+
if (limit >= 0 && inputMessagesJson.length() > limit) {
222222
inputMessagesJson = inputMessagesJson.substring(0, limit);
223223
}
224224

@@ -238,7 +238,7 @@ private void collectCompletion(AbstractSpan span, StreamState state) {
238238
String outputMessagesJson = outputMessages.toJson();
239239

240240
int limit = SpringAiPluginConfig.Plugin.SpringAi.OUTPUT_MESSAGES_LENGTH_LIMIT;
241-
if (limit > 0 && outputMessagesJson.length() > limit) {
241+
if (limit >= 0 && outputMessagesJson.length() > limit) {
242242
outputMessagesJson = outputMessagesJson.substring(0, limit);
243243
}
244244

apm-sniffer/apm-sdk-plugin/spring-plugins/spring-ai-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/ai/v1/config/SpringAiPluginConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static class SpringAi {
8585
/**
8686
* Whether to collect the documents of the rag call.
8787
*/
88-
public static boolean COLLECT_RETRIEVAL_DOCUMENTS = false;
88+
public static boolean COLLECT_RETRIEVAL_DOCUMENTS = false;
8989
}
9090
}
9191
}

apm-sniffer/config/agent.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,6 @@ plugin.springai.collect_retrieval_query=${SW_PLUGIN_SPRINGAI_COLLECT_RETRIEVAL_Q
368368
# The maximum characters of the collected rag query.
369369
# If the content exceeds this limit, it will be truncated.
370370
# Use a negative value to represent no limit, but be aware this could cause OOM.
371-
plugin.springai.retrieval_query=${SW_PLUGIN_SPRINGAI_RETRIEVAL_QUERY_LENGTH_LIMIT:1024}
371+
plugin.springai.retrieval_query_length_limit=${SW_PLUGIN_SPRINGAI_RETRIEVAL_QUERY_LENGTH_LIMIT:1024}
372372
# Whether to collect the documents of the rag call.
373373
plugin.springai.collect_retrieval_documents=${SW_PLUGIN_SPRINGAI_COLLECT_RETRIEVAL_DOCUMENTS:false}

0 commit comments

Comments
 (0)