fix

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

@@ -45,7 +45,6 @@ public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allAr
 
         AbstractSpan span = ContextManager.createLocalSpan("Spring-ai/tool/execute/" + toolName);
         span.setComponent(ComponentsDefine.SPRING_AI);
-        SpanLayer.asGenAI(span);
 
         Tags.GEN_AI_TOOL_NAME.set(span, toolName);
         Tags.GEN_AI_OPERATION_NAME.set(span, Constants.EXECUTE_TOOL);

apm-sniffer/apm-sdk-plugin/spring-plugins/spring-ai-1.x-plugin/src/main/resources/skywalking-plugin.def

@@ -16,7 +16,6 @@
 
 spring-ai-1.x=org.apache.skywalking.apm.plugin.spring.ai.v1.define.ChatModelInstrumentation
 spring-ai-1.x=org.apache.skywalking.apm.plugin.spring.ai.v1.define.ToolCallbackInstrumentation
-spring-ai-1.x=org.apache.skywalking.apm.plugin.spring.ai.v1.define.DefaultToolCallingManagerInstrumentation
 spring-ai-1.x=org.apache.skywalking.apm.plugin.spring.ai.v1.define.provider.AnthropicApiInstrumentation
 spring-ai-1.x=org.apache.skywalking.apm.plugin.spring.ai.v1.define.provider.DeepSeekApiInstrumentation
 spring-ai-1.x=org.apache.skywalking.apm.plugin.spring.ai.v1.define.provider.HuggingfaceChatModelInstrumentation

test/plugin/scenarios/spring-ai-1.x-scenario/config/expectedData.yaml

@@ -23,7 +23,7 @@ segmentItems:
           - operationName: Spring-ai/tool/execute/get_weather
             parentSpanId: 2
             spanId: 3
-            spanLayer: UNRECOGNIZED
+            spanLayer: Unknown
             spanType: Local
             tags:
               - { key: gen_ai.tool.name, value: get_weather }
@@ -40,7 +40,29 @@ segmentItems:
           - operationName: Spring-ai/openai/call
             parentSpanId: 0
             spanId: 1
-            spanLayer: UNRECOGNIZED
+            spanLayer: GenAI
+            componentId: 173
+            spanType: Exit
+            peer: http://localhost:8080/spring-ai-1.x-scenario/llm/v1/chat/completions
+            tags:
+              - { key: gen_ai.operation.name, value: chat }
+              - { key: gen_ai.provider.name, value: openai }
+              - { key: gen_ai.request.model, value: gpt-4.1-2025-04-14 }
+              - { key: gen_ai.request.temperature, value: '0.7' }
+              - { key: gen_ai.request.top_p, value: '0.9' }
+              - { key: gen_ai.response.id, value: 'chatcmpl-CyJXJt7gxwDgz' }
+              - { key: gen_ai.response.model, value: gpt-4.1-2025-04-14 }
+              - { key: gen_ai.usage.input_tokens, value: '52' }
+              - { key: gen_ai.usage.output_tokens, value: '17' }
+              - { key: gen_ai.client.token.usage, value: '69' }
+              - { key: gen_ai.response.finish_reasons, value: STOP }
+              - { key: gen_ai.input.messages, value: not null }
+              - { key: gen_ai.output.messages, value: not null }
+
+          - operationName: Spring-ai/openai/stream
+            parentSpanId: 0
+            spanId: 4
+            spanLayer: GenAI
             componentId: 173
             spanType: Exit
             peer: http://localhost:8080/spring-ai-1.x-scenario/llm/v1/chat/completions

test/plugin/scenarios/spring-ai-1.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/jdk/httpclient/controller/CaseController.java

@@ -54,6 +54,15 @@ public String testCase() throws Exception {
                 .call()
                 .content();
 
+        chatClient
+                .prompt("What's the weather in New York?")
+                .system(systemPrompt)
+                .tools(weatherTool)
+                .stream()
+                .content()
+                .doOnNext(System.out::println)
+                .blockLast();
+
         return "success";
     }
 }