You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by zh...@apache.org on 2022/01/12 03:54:41 UTC
[skywalking] branch faas created (now 275832c)
This is an automated email from the ASF dual-hosted git repository.
zhangwei24 pushed a change to branch faas
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 275832c Add faas to SpanLayer
This branch includes the following new commits:
new 275832c Add faas to SpanLayer
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Add faas to SpanLayer
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhangwei24 pushed a commit to branch faas
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 275832c231e414a3b4f3832151340f3b297b83fa
Author: zhangwei <zh...@apache.org>
AuthorDate: Wed Jan 12 10:56:16 2022 +0800
Add faas to SpanLayer
---
apm-protocol/apm-network/src/main/proto | 2 +-
.../provider/trace/parser/listener/MultiScopesAnalysisListener.java | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/apm-protocol/apm-network/src/main/proto b/apm-protocol/apm-network/src/main/proto
index 52f2c74..3a1d551 160000
--- a/apm-protocol/apm-network/src/main/proto
+++ b/apm-protocol/apm-network/src/main/proto
@@ -1 +1 @@
-Subproject commit 52f2c74b7fc25a3827f268efcf5cb75c327a7934
+Subproject commit 3a1d55173efcd4a6235a937fd4fd16ccda78150f
diff --git a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/MultiScopesAnalysisListener.java b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/MultiScopesAnalysisListener.java
index 201a99f..c945bde 100644
--- a/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/MultiScopesAnalysisListener.java
+++ b/oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/parser/listener/MultiScopesAnalysisListener.java
@@ -119,7 +119,7 @@ public class MultiScopesAnalysisListener implements EntryAnalysisListener, ExitA
sourceBuilder.setDestEndpointName(span.getOperationName());
sourceBuilder.setDestServiceInstanceName(segmentObject.getServiceInstance());
sourceBuilder.setDestServiceName(segmentObject.getService());
- sourceBuilder.setDestLayer(Layer.GENERAL);
+ sourceBuilder.setDestLayer(fromSpanLayerValue(span.getSpanLayer()));
sourceBuilder.setDetectPoint(DetectPoint.SERVER);
sourceBuilder.setComponentId(span.getComponentId());
setPublicAttrs(sourceBuilder, span);
@@ -133,7 +133,7 @@ public class MultiScopesAnalysisListener implements EntryAnalysisListener, ExitA
sourceBuilder.setSourceNormal(false);
sourceBuilder.setDestServiceInstanceName(segmentObject.getServiceInstance());
sourceBuilder.setDestServiceName(segmentObject.getService());
- sourceBuilder.setDestLayer(Layer.GENERAL);
+ sourceBuilder.setDestLayer(fromSpanLayerValue(span.getSpanLayer()));
sourceBuilder.setDestEndpointName(span.getOperationName());
sourceBuilder.setDetectPoint(DetectPoint.SERVER);
sourceBuilder.setComponentId(span.getComponentId());
@@ -390,6 +390,8 @@ public class MultiScopesAnalysisListener implements EntryAnalysisListener, ExitA
return Layer.CACHE;
case UNRECOGNIZED:
return Layer.UNDEFINED;
+ case FAAS:
+ return Layer.FAAS;
default:
throw new UnexpectedException("Can't transfer to the Layer. SpanLayer=" + spanLayer);
}