Merge branch 'dev' into uat

# Conflicts:
#	apm-sniffer/apm-sdk-plugin/spring-plugins/spring-ai-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/ai/v1/AbstractObservationVectorStoreConstructorInterceptor.java
#	apm-sniffer/apm-sdk-plugin/spring-plugins/spring-ai-1.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/ai/v1/define/AbstractObservationVectorStoreInstrumentation.java

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/AbstractObservationVectorStoreConstructorInterceptor.java

@@ -21,6 +21,7 @@
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
 import org.springframework.ai.embedding.EmbeddingOptions;
+import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.util.StringUtils;
 
 import java.lang.reflect.Field;
@@ -31,11 +32,18 @@ public class AbstractObservationVectorStoreConstructorInterceptor implements Ins
     @Override
     public void onConstruct(EnhancedInstance objInst, Object[] allArguments) {
         if (allArguments != null && allArguments.length > 0) {
-            String embeddingModelName = resolveModelFromEmbeddingModel(allArguments[0]);
+            String embeddingModelName = resolveModelFromArgument(allArguments[0]);
             objInst.setSkyWalkingDynamicField(new VectorStoreEnhanceContext(embeddingModelName));
         }
     }
 
+    private String resolveModelFromArgument(Object argument) {
+        if (argument instanceof EmbeddingModel) {
+            return resolveModelFromEmbeddingModel(argument);
+        }
+        return null;
+    }
+
     private String resolveModelFromEmbeddingModel(Object embeddingModel) {
         if (embeddingModel == null) {
             return null;

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

@@ -25,6 +25,8 @@
 import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
 import org.apache.skywalking.apm.agent.core.plugin.match.HierarchyMatch;
+import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch;
+import org.apache.skywalking.apm.agent.core.plugin.match.logical.LogicalMatchOperation;
 
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -34,8 +36,6 @@ public class AbstractObservationVectorStoreInstrumentation extends ClassInstance
 
     private static final String ENHANCE_CLASS = "org.springframework.ai.vectorstore.observation.AbstractObservationVectorStore";
 
-    private static final String EMBEDDING_MODEL_CLASS = "org.springframework.ai.embedding.EmbeddingModel";
-
     private static final String INTERCEPT_METHOD = "doSimilaritySearch";
 
     private static final String INTERCEPTOR_CLASS =
@@ -46,16 +46,16 @@ public class AbstractObservationVectorStoreInstrumentation extends ClassInstance
 
     @Override
     protected ClassMatch enhanceClass() {
-        return HierarchyMatch.byHierarchyMatch(ENHANCE_CLASS);
+        return LogicalMatchOperation.or(HierarchyMatch.byHierarchyMatch(ENHANCE_CLASS), MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS));
     }
 
     @Override
     public ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
-        return new ConstructorInterceptPoint[] {
+        return new ConstructorInterceptPoint[]{
                 new ConstructorInterceptPoint() {
                     @Override
                     public ElementMatcher<MethodDescription> getConstructorMatcher() {
-                        return takesArguments(4).and(takesArgumentWithType(0, EMBEDDING_MODEL_CLASS));
+                        return takesArgumentWithType(0, "org.springframework.ai.embedding.EmbeddingModel");
                     }
 
                     @Override
@@ -68,7 +68,7 @@ public String getConstructorInterceptor() {
 
     @Override
     public InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() {
-        return new InstanceMethodsInterceptPoint[] {
+        return new InstanceMethodsInterceptPoint[]{
                 new InstanceMethodsInterceptPoint() {
                     @Override
                     public ElementMatcher<MethodDescription> getMethodsMatcher() {