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:56:27 UTC
[skywalking] branch http-doc created (now 05095e0)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch http-doc
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 05095e0 HTTP doc error about SpanLayer.
This branch includes the following new commits:
new 05095e0 HTTP doc error about 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: HTTP doc error about SpanLayer.
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch http-doc
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 05095e0b8d3b009b826503d8686d51ebfc80c1db
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Mar 8 23:56:04 2020 +0800
HTTP doc error about SpanLayer.
---
docs/en/protocols/HTTP-API-Protocol.md | 4 ++--
.../provider/parser/listener/segment/ProtoBufJsonUtilsTest.java | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docs/en/protocols/HTTP-API-Protocol.md b/docs/en/protocols/HTTP-API-Protocol.md
index 3b42a42..0100850 100644
--- a/docs/en/protocols/HTTP-API-Protocol.md
+++ b/docs/en/protocols/HTTP-API-Protocol.md
@@ -128,7 +128,7 @@ Input:
"parentSpanId": 0,
"componentId": 6000,
"peer": "User Service Name-nginx:upstream_ip:port",
- "spanLayer": "HTTP"
+ "spanLayer": "Http"
},
{
"operationName": "/tier2/lb",
@@ -170,7 +170,7 @@ Input:
"entryEndpoint": "/ingress"
}
],
- "spanLayer": "HTTP"
+ "spanLayer": "Http"
}
],
"serviceInstanceId": 1,
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/ProtoBufJsonUtilsTest.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/ProtoBufJsonUtilsTest.java
index 559a908..2feb961 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/ProtoBufJsonUtilsTest.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/segment/ProtoBufJsonUtilsTest.java
@@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.listener
import java.io.IOException;
import org.apache.skywalking.apm.network.common.Command;
import org.apache.skywalking.apm.network.common.Commands;
+import org.apache.skywalking.apm.network.language.agent.SpanLayer;
import org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
import org.apache.skywalking.apm.network.language.agent.v2.SegmentObject;
import org.apache.skywalking.oap.server.library.util.ProtoBufJsonUtils;
@@ -42,7 +43,7 @@ public class ProtoBufJsonUtilsTest {
" \"parentSpanId\": 0,\n" +
" \"componentId\": 6000,\n" +
" \"peer\": \"User Service Name-nginx:upstream_ip:port\",\n" +
- " \"spanLayer\": \"HTTP\"\n" +
+ " \"spanLayer\": \"Http\"\n" +
" },\n" +
" {\n" +
" \"operationName\": \"/tier2/lb\",\n" +
@@ -83,7 +84,7 @@ public class ProtoBufJsonUtilsTest {
" \"entryEndpoint\": \"/ingress\"\n" +
" }\n" +
" ],\n" +
- " \"spanLayer\": \"HTTP\"\n" +
+ " \"spanLayer\": \"Http\"\n" +
" }\n" +
" ],\n" +
" \"serviceInstanceId\": 1,\n" +
@@ -116,6 +117,7 @@ public class ProtoBufJsonUtilsTest {
ProtoBufJsonUtils.fromJSON(json, segBuilder);
SegmentObject segmentObject = segBuilder.build();
Assert.assertEquals(2, segmentObject.getSpansCount());
+ Assert.assertEquals(SpanLayer.Http, segmentObject.getSpans(0).getSpanLayer());
} catch (IOException e) {
e.printStackTrace();
}