From 55f759912134e83458f7def7085480363ed6db17 Mon Sep 17 00:00:00 2001 From: peachisai <2581009893@qq.com> Date: Wed, 3 Jun 2026 12:06:27 +0800 Subject: [PATCH] fix the config of plugin.springai.retrieval_query_length_limit --- .../ai/v1/AbstractObservationVectorStoreInterceptor.java | 2 +- .../apm/plugin/spring/ai/v1/ChatModelCallInterceptor.java | 4 ++-- .../apm/plugin/spring/ai/v1/ChatModelStreamInterceptor.java | 4 ++-- .../apm/plugin/spring/ai/v1/config/SpringAiPluginConfig.java | 2 +- apm-sniffer/config/agent.config | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/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 b/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 index 4b278b6c87..473ffb5b95 100644 --- a/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 +++ b/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 @@ -80,7 +80,7 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr String query = request.getQuery(); if (StringUtils.hasText(query) && SpringAiPluginConfig.Plugin.SpringAi.COLLECT_RETRIEVAL_QUERY) { int limit = SpringAiPluginConfig.Plugin.SpringAi.RETRIEVAL_QUERY_LENGTH_LIMIT; - if (limit > 0 && query.length() > limit) { + if (limit >= 0 && query.length() > limit) { query = query.substring(0, limit); } Tags.GEN_AI_RETRIEVAL_QUERY_TEXT.set(span, query); diff --git a/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 b/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 index 73f62629c1..2e25f9e13b 100644 --- a/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 +++ b/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 @@ -161,7 +161,7 @@ private void collectPrompt(AbstractSpan span, Object[] allArguments) { InputMessages inputMessages = InputMessages.fromPrompt(prompt); String inputMessagesJson = inputMessages.toJson(); int limit = SpringAiPluginConfig.Plugin.SpringAi.INPUT_MESSAGES_LENGTH_LIMIT; - if (limit > 0 && inputMessagesJson.length() > limit) { + if (limit >= 0 && inputMessagesJson.length() > limit) { inputMessagesJson = inputMessagesJson.substring(0, limit); } @@ -174,7 +174,7 @@ private void collectCompletion(AbstractSpan span, ChatResponse response) { String outputMessagesJson = outputMessages.toJson(); int limit = SpringAiPluginConfig.Plugin.SpringAi.OUTPUT_MESSAGES_LENGTH_LIMIT; - if (limit > 0 && outputMessagesJson.length() > limit) { + if (limit >= 0 && outputMessagesJson.length() > limit) { outputMessagesJson = outputMessagesJson.substring(0, limit); } Tags.GEN_AI_OUTPUT_MESSAGES.set(span, outputMessagesJson); diff --git a/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 b/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 index 7d1b380573..7231a99aa1 100644 --- a/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 +++ b/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 @@ -218,7 +218,7 @@ private void collectPrompt(AbstractSpan span, Object[] allArguments) { String inputMessagesJson = inputMessages.toJson(); int limit = SpringAiPluginConfig.Plugin.SpringAi.INPUT_MESSAGES_LENGTH_LIMIT; - if (limit > 0 && inputMessagesJson.length() > limit) { + if (limit >= 0 && inputMessagesJson.length() > limit) { inputMessagesJson = inputMessagesJson.substring(0, limit); } @@ -238,7 +238,7 @@ private void collectCompletion(AbstractSpan span, StreamState state) { String outputMessagesJson = outputMessages.toJson(); int limit = SpringAiPluginConfig.Plugin.SpringAi.OUTPUT_MESSAGES_LENGTH_LIMIT; - if (limit > 0 && outputMessagesJson.length() > limit) { + if (limit >= 0 && outputMessagesJson.length() > limit) { outputMessagesJson = outputMessagesJson.substring(0, limit); } diff --git a/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 b/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 index 6a348c622b..b0a56635ce 100644 --- a/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 +++ b/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 @@ -85,7 +85,7 @@ public static class SpringAi { /** * Whether to collect the documents of the rag call. */ - public static boolean COLLECT_RETRIEVAL_DOCUMENTS = false; + public static boolean COLLECT_RETRIEVAL_DOCUMENTS = false; } } } diff --git a/apm-sniffer/config/agent.config b/apm-sniffer/config/agent.config index 146d0d94fc..b9101f1f1c 100755 --- a/apm-sniffer/config/agent.config +++ b/apm-sniffer/config/agent.config @@ -368,6 +368,6 @@ plugin.springai.collect_retrieval_query=${SW_PLUGIN_SPRINGAI_COLLECT_RETRIEVAL_Q # The maximum characters of the collected rag query. # If the content exceeds this limit, it will be truncated. # Use a negative value to represent no limit, but be aware this could cause OOM. -plugin.springai.retrieval_query=${SW_PLUGIN_SPRINGAI_RETRIEVAL_QUERY_LENGTH_LIMIT:1024} +plugin.springai.retrieval_query_length_limit=${SW_PLUGIN_SPRINGAI_RETRIEVAL_QUERY_LENGTH_LIMIT:1024} # Whether to collect the documents of the rag call. plugin.springai.collect_retrieval_documents=${SW_PLUGIN_SPRINGAI_COLLECT_RETRIEVAL_DOCUMENTS:false} \ No newline at end of file