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

HTTP doc error about SpanLayer. (#4464)

This commit is contained in:
吴晟 Wu Sheng 2020-03-09 00:56:56 +08:00 committed by GitHub
parent 74b0af9d85
commit cbc692908f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/en/protocols/HTTP-API-Protocol.md
View File

@ -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,

6
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
View File

@ -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();
}