Support tracing RAG retrieval in Spring AI 1.x plugin #808
+915
−5
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.apache.skywalking.apm.plugin.spring.ai.v1; | ||
|
|
||
| import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; | ||
| import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor; | ||
| import org.apache.skywalking.apm.plugin.spring.ai.v1.common.EmbeddingModelEnhanceContext; | ||
|
|
||
| public class AbstractObservationVectorStoreConstructorInterceptor implements InstanceConstructorInterceptor { | ||
|
|
||
| @Override | ||
| public void onConstruct(EnhancedInstance objInst, Object[] allArguments) { | ||
| objInst.setSkyWalkingDynamicField(new VectorStoreEnhanceContext(resolveContextFromArgument(allArguments[0]))); | ||
| } | ||
|
|
||
| private EmbeddingModelEnhanceContext resolveContextFromArgument(Object argument) { | ||
| if (argument instanceof EnhancedInstance) { | ||
| return getOrCreateContext((EnhancedInstance) argument); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private EmbeddingModelEnhanceContext getOrCreateContext(EnhancedInstance embeddingModel) { | ||
| Object context = embeddingModel.getSkyWalkingDynamicField(); | ||
| if (context instanceof EmbeddingModelEnhanceContext) { | ||
| return (EmbeddingModelEnhanceContext) context; | ||
| } | ||
| EmbeddingModelEnhanceContext embeddingModelEnhanceContext = new EmbeddingModelEnhanceContext(); | ||
| embeddingModel.setSkyWalkingDynamicField(embeddingModelEnhanceContext); | ||
| return embeddingModelEnhanceContext; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.apache.skywalking.apm.plugin.spring.ai.v1; | ||
|
|
||
| import org.apache.skywalking.apm.agent.core.context.ContextManager; | ||
| import org.apache.skywalking.apm.agent.core.context.tag.Tags; | ||
| import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; | ||
| import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; | ||
| import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; | ||
| import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; | ||
| import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; | ||
| import org.apache.skywalking.apm.agent.core.util.GsonUtil; | ||
| import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; | ||
| import org.apache.skywalking.apm.plugin.spring.ai.v1.common.ErrorTypeResolver; | ||
| import org.apache.skywalking.apm.plugin.spring.ai.v1.config.SpringAiPluginConfig; | ||
| import org.apache.skywalking.apm.plugin.spring.ai.v1.contant.Constants; | ||
| import org.springframework.ai.document.Document; | ||
| import org.springframework.ai.vectorstore.SearchRequest; | ||
| import org.springframework.ai.vectorstore.observation.AbstractObservationVectorStore; | ||
| import org.springframework.ai.vectorstore.observation.VectorStoreObservationContext; | ||
| import org.springframework.util.StringUtils; | ||
|
|
||
| import java.lang.reflect.Method; | ||
| import java.util.ArrayList; | ||
| import java.util.LinkedHashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| public class AbstractObservationVectorStoreInterceptor implements InstanceMethodsAroundInterceptor { | ||
|
|
||
| @Override | ||
| public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, | ||
| MethodInterceptResult result) throws Throwable { | ||
| SearchRequest request = (SearchRequest) allArguments[0]; | ||
| String dataSourceId = objInst.getClass().getSimpleName(); | ||
|
|
||
| try { | ||
| VectorStoreObservationContext context = | ||
| createObservationContext(objInst, request); | ||
|
|
||
| String resolved = | ||
| resolveDataSourceId(context, objInst); | ||
|
|
||
| if (StringUtils.hasText(resolved)) { | ||
| dataSourceId = resolved; | ||
| } | ||
| } catch (Throwable ignored) { | ||
|
|
||
| } | ||
|
|
||
| AbstractSpan span = ContextManager.createExitSpan(Constants.RETRIEVAL + "/" + dataSourceId, dataSourceId); | ||
|
|
||
| SpanLayer.asGenAI(span); | ||
| span.setComponent(ComponentsDefine.SPRING_AI); | ||
| Tags.GEN_AI_OPERATION_NAME.set(span, Constants.RETRIEVAL); | ||
| Tags.GEN_AI_DATA_SOURCE_ID.set(span, dataSourceId); | ||
| String model = resolveEmbeddingModelName(objInst); | ||
| if (StringUtils.hasText(model)) { | ||
| Tags.GEN_AI_REQUEST_MODEL.set(span, model); | ||
| } | ||
|
|
||
| if (request != null) { | ||
| Tags.GEN_AI_TOP_K.set(span, String.valueOf(request.getTopK())); | ||
| 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) { | ||
| query = query.substring(0, limit); | ||
| } | ||
| Tags.GEN_AI_RETRIEVAL_QUERY_TEXT.set(span, query); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, | ||
| Object ret) throws Throwable { | ||
| if (!ContextManager.isActive()) { | ||
| return ret; | ||
| } | ||
| try { | ||
| if (ret instanceof List<?> && SpringAiPluginConfig.Plugin.SpringAi.COLLECT_RETRIEVAL_DOCUMENTS) { | ||
| Tags.GEN_AI_RETRIEVAL_DOCUMENTS.set(ContextManager.activeSpan(), toDocumentsJson((List<?>) ret)); | ||
| } | ||
| } finally { | ||
| ContextManager.stopSpan(); | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| @Override | ||
| public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, | ||
| Class<?>[] argumentsTypes, Throwable t) { | ||
| if (ContextManager.isActive()) { | ||
| AbstractSpan span = ContextManager.activeSpan(); | ||
| span.log(t); | ||
| ErrorTypeResolver.setErrorType(span, t); | ||
| } | ||
| } | ||
|
|
||
| private VectorStoreObservationContext createObservationContext(EnhancedInstance objInst, SearchRequest request) { | ||
| VectorStoreObservationContext.Builder builder = ((AbstractObservationVectorStore) objInst) | ||
| .createObservationContextBuilder(VectorStoreObservationContext.Operation.QUERY.value()); | ||
| if (request != null) { | ||
| builder.queryRequest(request); | ||
| } | ||
| return builder.build(); | ||
| } | ||
|
|
||
| private String resolveEmbeddingModelName(EnhancedInstance objInst) { | ||
| Object context = objInst.getSkyWalkingDynamicField(); | ||
| if (context instanceof VectorStoreEnhanceContext) { | ||
| return ((VectorStoreEnhanceContext) context).getEmbeddingModelName(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private String resolveDataSourceId(VectorStoreObservationContext context, EnhancedInstance objInst) { | ||
| StringBuilder dataSourceId = new StringBuilder(); | ||
| appendDataSourcePart(dataSourceId, context.getDatabaseSystem()); | ||
| appendDataSourcePart(dataSourceId, context.getNamespace()); | ||
| appendDataSourcePart(dataSourceId, context.getCollectionName()); | ||
| if (dataSourceId.length() > 0) { | ||
| return dataSourceId.toString(); | ||
| } | ||
| return objInst.getClass().getSimpleName(); | ||
| } | ||
|
|
||
| private void appendDataSourcePart(StringBuilder dataSourceId, String value) { | ||
| if (!StringUtils.hasText(value)) { | ||
| return; | ||
| } | ||
| if (dataSourceId.length() > 0) { | ||
| dataSourceId.append('/'); | ||
| } | ||
| dataSourceId.append(value); | ||
| } | ||
|
|
||
| private String toDocumentsJson(List<?> documents) { | ||
| List<Map<String, Object>> retrievalDocuments = new ArrayList<>(documents.size()); | ||
| for (Object item : documents) { | ||
| if (!(item instanceof Document)) { | ||
| continue; | ||
| } | ||
| Document document = (Document) item; | ||
| Map<String, Object> documentMap = new LinkedHashMap<>(); | ||
| documentMap.put("id", document.getId()); | ||
| if (document.getScore() != null) { | ||
| documentMap.put("score", document.getScore()); | ||
| } | ||
| retrievalDocuments.add(documentMap); | ||
| } | ||
| return GsonUtil.toJson(retrievalDocuments); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| */ | ||
|
|
||
| package org.apache.skywalking.apm.plugin.spring.ai.v1; | ||
|
|
||
| import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; | ||
| import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; | ||
| import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; | ||
| import org.apache.skywalking.apm.plugin.spring.ai.v1.common.EmbeddingModelEnhanceContext; | ||
| import org.springframework.ai.embedding.EmbeddingResponse; | ||
| import org.springframework.ai.embedding.EmbeddingResponseMetadata; | ||
| import org.springframework.util.StringUtils; | ||
|
|
||
| import java.lang.reflect.Method; | ||
|
|
||
| public class EmbeddingModelInterceptor implements InstanceMethodsAroundInterceptor { | ||
|
|
||
| @Override | ||
| public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, MethodInterceptResult result) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, Object ret) { | ||
| if (!(ret instanceof EmbeddingResponse)) { | ||
| return ret; | ||
| } | ||
|
|
||
| EmbeddingResponseMetadata metadata = ((EmbeddingResponse) ret).getMetadata(); | ||
|
Member
There was a problem hiding this comment.
|
||
| if (metadata == null) { | ||
| return ret; | ||
| } | ||
| String model = metadata.getModel(); | ||
| if (!StringUtils.hasText(model)) { | ||
| return ret; | ||
| } | ||
| EmbeddingModelEnhanceContext context = getOrCreateContext(objInst); | ||
| context.setEmbeddingModelNameIfAbsent(model); | ||
| return ret; | ||
| } | ||
|
|
||
| @Override | ||
| public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, Throwable t) { | ||
| } | ||
|
|
||
| private EmbeddingModelEnhanceContext getOrCreateContext(EnhancedInstance objInst) { | ||
| Object context = objInst.getSkyWalkingDynamicField(); | ||
| if (context instanceof EmbeddingModelEnhanceContext) { | ||
| return (EmbeddingModelEnhanceContext) context; | ||
| } | ||
| EmbeddingModelEnhanceContext embeddingModelEnhanceContext = new EmbeddingModelEnhanceContext(); | ||
| objInst.setSkyWalkingDynamicField(embeddingModelEnhanceContext); | ||
| return embeddingModelEnhanceContext; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gen_ai.retrieval.documentsis likewise emitted unconditionally, unlikeCOLLECT_OUTPUT_MESSAGESwhich gates analogous response content (defaultfalse).Lower risk than the query text since only
id+scoreare serialized (not document bodies), but for consistency consider aCOLLECT_RETRIEVAL_DOCUMENTS = falseflag. Note the JSON grows withtopKand has no size cap.