Fix EmbeddingModelInterceptor

Author: peachisai

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

@@ -18,39 +18,39 @@
 
 package org.apache.skywalking.apm.plugin.spring.ai.v1;
 
-import java.lang.reflect.Method;
-
 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.springframework.ai.embedding.EmbeddingOptions;
+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) {
-        if (allArguments == null || allArguments.length < 2 || !(allArguments[1] instanceof EmbeddingOptions)) {
-            return;
+    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) {
+        EmbeddingResponseMetadata metadata = ((EmbeddingResponse) ret).getMetadata();
+        if (metadata == null) {
+            return ret;
         }
-        String model = ((EmbeddingOptions) allArguments[1]).getModel();
+        String model = metadata.getModel();
         if (!StringUtils.hasText(model)) {
-            return;
+            return ret;
         }
         EmbeddingModelEnhanceContext context = getOrCreateContext(objInst);
         context.setEmbeddingModelNameIfAbsent(model);
-    }
-
-    @Override
-    public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
-                              Object ret) {
         return ret;
     }
 
     @Override
-    public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments,
-                                      Class<?>[] argumentsTypes, Throwable t) {
+    public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes, Throwable t) {
     }
 
     private EmbeddingModelEnhanceContext getOrCreateContext(EnhancedInstance objInst) {

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

@@ -34,7 +34,7 @@ public class EmbeddingModelInstrumentation extends ClassInstanceMethodsEnhancePl
 
     private static final String ENHANCE_CLASS = "org.springframework.ai.embedding.EmbeddingModel";
 
-    private static final String INTERCEPT_METHOD = "embed";
+    private static final String INTERCEPT_METHOD = "call";
 
     private static final String INTERCEPTOR_CLASS =
             "org.apache.skywalking.apm.plugin.spring.ai.v1.EmbeddingModelInterceptor";
@@ -56,10 +56,8 @@ public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
                     @Override
                     public ElementMatcher<MethodDescription> getMethodsMatcher() {
                         return named(INTERCEPT_METHOD)
-                                .and(takesArguments(3))
-                                .and(takesArgumentWithType(0, "java.util.List"))
-                                .and(takesArgumentWithType(1, "org.springframework.ai.embedding.EmbeddingOptions"))
-                                .and(takesArgumentWithType(2, "org.springframework.ai.embedding.BatchingStrategy"));
+                                .and(takesArguments(1))
+                                .and(takesArgumentWithType(0, "org.springframework.ai.embedding.EmbeddingRequest"));
                     }
 
                     @Override