You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2020/07/25 15:15:05 UTC
[skywalking] branch master updated: spring-annotation plugin add
component (#5160)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 3a00d84 spring-annotation plugin add component (#5160)
3a00d84 is described below
commit 3a00d847664695286e9d203c4096ad0fae5cc3f6
Author: 李文广 <li...@163.com>
AuthorDate: Sat Jul 25 23:14:46 2020 +0800
spring-annotation plugin add component (#5160)
---
.../skywalking/apm/network/trace/component/ComponentsDefine.java | 2 ++
.../apm/plugin/spring/annotations/SpringAnnotationInterceptor.java | 5 ++++-
.../server-bootstrap/src/main/resources/component-libraries.yml | 3 +++
.../plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml | 6 +++---
.../plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml | 6 +++---
.../plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml | 6 +++---
.../plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml | 6 +++---
7 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
index 163371a..d31a16d 100755
--- a/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
+++ b/apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/ComponentsDefine.java
@@ -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");
}
diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java
index fcb4ca9..60c5702 100644
--- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java
+++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/annotations/SpringAnnotationInterceptor.java
@@ -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
diff --git a/oap-server/server-bootstrap/src/main/resources/component-libraries.yml b/oap-server/server-bootstrap/src/main/resources/component-libraries.yml
index 4dea612..2c6d840 100755
--- a/oap-server/server-bootstrap/src/main/resources/component-libraries.yml
+++ b/oap-server/server-bootstrap/src/main/resources/component-libraries.yml
@@ -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
diff --git a/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml
index 13d65b0..37407a4 100644
--- a/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-3.0.x-scenario/config/expectedData.yaml
@@ -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
diff --git a/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml
index 95cd1e5..13cddd7 100644
--- a/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-3.1.x-scenario/config/expectedData.yaml
@@ -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
diff --git a/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml
index d3ccdc6..38ead27 100644
--- a/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-4.1.x-scenario/config/expectedData.yaml
@@ -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
diff --git a/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml b/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml
index 986697b..7961509 100644
--- a/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml
+++ b/test/plugin/scenarios/spring-4.3.x-scenario/config/expectedData.yaml
@@ -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