This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/6.0 by this push:
new 550563a Update protocol to 2.0 draft.
550563a is described below
commit 550563aa8c820223706ab4fb4b3da3dca25e68ff
Author: Wu Sheng <[email protected]>
AuthorDate: Thu Aug 16 15:54:09 2018 +0800
Update protocol to 2.0 draft.
---
apm-protocol/apm-network/src/main/proto | 2 +-
docs/en/protocols/README.md | 2 +-
docs/en/protocols/Trace-Data-Protocol.md | 5 +++--
.../receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/apm-protocol/apm-network/src/main/proto
b/apm-protocol/apm-network/src/main/proto
index 33b132b..9f145f8 160000
--- a/apm-protocol/apm-network/src/main/proto
+++ b/apm-protocol/apm-network/src/main/proto
@@ -1 +1 @@
-Subproject commit 33b132bffaabacbd003eec41b498d2810f386161
+Subproject commit 9f145f80342f5cd28e5764b302d7e2e33bd00891
diff --git a/docs/en/protocols/README.md b/docs/en/protocols/README.md
index 376630c..8a6d555 100644
--- a/docs/en/protocols/README.md
+++ b/docs/en/protocols/README.md
@@ -23,7 +23,7 @@ service ID.
### Language based native agent protocol
This protocol is combined from two parts:
* [Cross Process Propagation Headers
Protocol](Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md) is for
in-wire propagation.
-which is usually used to carrier the necessary info to build trace.
+By following this protocol, the trace segments in different processes could be
linked.
* [SkyWalking Trace Data Protocol](Trace-Data-Protocol.md) define the
communication way and format between agent and backend.
diff --git a/docs/en/protocols/Trace-Data-Protocol.md
b/docs/en/protocols/Trace-Data-Protocol.md
index 2c25e93..54652fb 100644
--- a/docs/en/protocols/Trace-Data-Protocol.md
+++ b/docs/en/protocols/Trace-Data-Protocol.md
@@ -111,8 +111,9 @@ Input：
## Deprecated services
-**Deprecated service**(s) are the gRPC service name SkyWalking used before. In
SkyWalking v6, in order to match the common
-concepts in CloudNative world. There services are still supported at this
moment, but it will be removed at Feb. 2019.
+**Deprecated service**(s) are the gRPC services SkyWalking used before. In
SkyWalking v6, in order to match the common
+concepts in CloudNative world, these services are deprecated.
+Although there services are still supported at this moment, but it will be
removed after 6 months later(Feb. 2019).
## ~~Application Register Service~~
**Deprecated service**
diff --git
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java
index f7d56bd..c21a5dd 100644
---
a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java
+++
b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/istio/telemetry/provider/IstioTelemetryGRPCHandler.java
@@ -27,7 +27,7 @@ import io.istio.api.policy.v1beta1.TypeProto;
import java.time.Duration;
import java.time.Instant;
import java.util.Map;
-import org.apache.skywalking.apm.network.servicemesh.DetectPoint;
+import org.apache.skywalking.apm.network.common.DetectPoint;
import org.apache.skywalking.apm.network.servicemesh.Protocol;
import org.apache.skywalking.apm.network.servicemesh.ServiceMeshMetric;
import org.slf4j.Logger;
