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/03/08 15:53:49 UTC
[skywalking-nginx-lua] branch master updated: Uniform the SpanLayer
type name (#21)
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-nginx-lua.git
The following commit(s) were added to refs/heads/master by this push:
new 13b4c77 Uniform the SpanLayer type name (#21)
13b4c77 is described below
commit 13b4c77278110bbafe5a3b6e358e2113e163b6f8
Author: Daming <zt...@foxmail.com>
AuthorDate: Sun Mar 8 23:53:42 2020 +0800
Uniform the SpanLayer type name (#21)
* Uniform the SpanLayer type name
* update the expectedData.yml
---
lib/skywalking/span_layer.lua | 12 ++++++------
test/e2e/validator/src/test/resources/expectedData.yaml | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/skywalking/span_layer.lua b/lib/skywalking/span_layer.lua
index a82e543..fcf0baa 100644
--- a/lib/skywalking/span_layer.lua
+++ b/lib/skywalking/span_layer.lua
@@ -16,12 +16,12 @@
--
local Layer = {
- NONE = {name = "NONE", value=0},
- DB = {name = "DB", value=1},
- RPC_FRAMEWORK = {name = "RPC_FRAMEWORK", value=2},
- HTTP = {name = "HTTP", value=3},
+ NONE = {name = "Unknown", value=0},
+ DB = {name = "Database", value=1},
+ RPC_FRAMEWORK = {name = "RPCFramework", value=2},
+ HTTP = {name = "Http", value=3},
MQ = {name = "MQ", value=4},
- CACHE = {name = "CACHE", value=5},
+ CACHE = {name = "Cache", value=5},
}
-return Layer
\ No newline at end of file
+return Layer
diff --git a/test/e2e/validator/src/test/resources/expectedData.yaml b/test/e2e/validator/src/test/resources/expectedData.yaml
index 237c04a..226676d 100644
--- a/test/e2e/validator/src/test/resources/expectedData.yaml
+++ b/test/e2e/validator/src/test/resources/expectedData.yaml
@@ -20,7 +20,7 @@ segmentItems:
parentSpanId: 0
componentId: 6000
peer: 'User_Service_Name-nginx:upstream_ip2:port2'
- spanLayer: HTTP
+ spanLayer: Http
- operationName: /tier2/lb
startTime: gt 0
tags:
@@ -36,7 +36,7 @@ segmentItems:
- {parentEndpointId: 0, entryEndpointId: 0, parentServiceInstanceId: 1, parentEndpoint: /ingress, parentTraceSegmentId: parentTraceSegmentId,
networkAddress: '#User_Service_Name-nginx:upstream_ip:port', parentSpanId: 1,
entryServiceInstanceId: 1, networkAddressId: 0, entryEndpoint: /ingress}
- spanLayer: HTTP
+ spanLayer: Http
- segmentId: not null
spans:
- operationName: /ingress
@@ -48,7 +48,7 @@ segmentItems:
parentSpanId: 0
componentId: 6000
peer: 'User_Service_Name-nginx:upstream_ip:port'
- spanLayer: HTTP
+ spanLayer: Http
- operationName: /ingress
startTime: gt 0
tags:
@@ -59,5 +59,5 @@ segmentItems:
spanId: 0
parentSpanId: -1
isError: false
- spanLayer: HTTP
- componentId: 6000
\ No newline at end of file
+ spanLayer: Http
+ componentId: 6000