kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spring-annotation plugin add component (#5160)

This commit is contained in:
李文广 2020-07-25 23:14:46 +08:00 committed by GitHub
parent 925c0d74c7
commit 3a00d84766
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
View File

@ -166,4 +166,6 @@ public class ComponentsDefine {
public static final OfficialComponent BRPC_JAVA = new OfficialComponent(91, "brpc-java");
public static final OfficialComponent GRAPHQL = new OfficialComponent(92, "GraphQL");
public static final OfficialComponent SPRING_ANNOTATION = new OfficialComponent(93, "spring-annotation");
}

5
apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java
View File

@ -20,16 +20,19 @@ package org.apache.skywalking.apm.plugin.spring.annotations;
import java.lang.reflect.Method;
import org.apache.skywalking.apm.agent.core.context.ContextManager;
import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan;
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.network.trace.component.ComponentsDefine;
public class SpringAnnotationInterceptor implements InstanceMethodsAroundInterceptor {
@Override
public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class<?>[] argumentsTypes,
MethodInterceptResult result) throws Throwable {
String operationName = objInst.getClass().getName() + "." + method.getName();
ContextManager.createLocalSpan(operationName);
AbstractSpan span = ContextManager.createLocalSpan(operationName);
span.setComponent(ComponentsDefine.SPRING_ANNOTATION);
}
@Override

3
oap-server/server-bootstrap/src/main/resources/component-libraries.yml
View File

@ -308,6 +308,9 @@ brpc-java:
GraphQL:
id: 92
languages: Java
spring-annotation:
id: 93
languages: Java
# .NET/.NET Core components
# [3000, 4000) for C#/.NET only

6
test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml
View File

@ -38,15 +38,15 @@ segmentItems:
spans:
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
operationId: 0, parentSpanId: 1, spanId: 2, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
operationId: 0, parentSpanId: 1, spanId: 3, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- operationName: /case/spring3
operationId: 0

6
test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml
View File

@ -38,15 +38,15 @@ segmentItems:
spans:
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
operationId: 0, parentSpanId: 1, spanId: 2, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
operationId: 0, parentSpanId: 1, spanId: 3, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- operationName: /case/spring3
operationId: 0

6
test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml
View File

@ -38,15 +38,15 @@ segmentItems:
spans:
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
operationId: 0, parentSpanId: 1, spanId: 2, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
operationId: 0, parentSpanId: 1, spanId: 3, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- operationName: /case/spring3
operationId: 0

6
test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml
View File

@ -38,15 +38,15 @@ segmentItems:
spans:
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.component.TestComponentBean.componentMethod,
operationId: 0, parentSpanId: 1, spanId: 2, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.dao.TestRepositoryBean.doSomeStuff,
operationId: 0, parentSpanId: 1, spanId: 3, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- {operationName: test.org.apache.skywalking.apm.testcase.spring3.service.TestServiceBean.doSomeBusiness,
operationId: 0, parentSpanId: 0, spanId: 1, spanLayer: Unknown, startTime: nq
0, endTime: nq 0, componentId: 0, isError: false, spanType: Local, peer: '',
0, endTime: nq 0, componentId: 93, isError: false, spanType: Local, peer: '',
skipAnalysis: 'false'}
- operationName: /case/spring3
operationId: 0