diff --git a/apm-protocol/apm-network/src/main/proto b/apm-protocol/apm-network/src/main/proto index 33b132bffaabacbd003eec41b498d2810f386161..9f145f80342f5cd28e5764b302d7e2e33bd00891 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 376630c258a758b8616932c1e03f0164bc3c3f34..8a6d55531235bc4bfca31e419933fea99d1dd08d 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 2c25e9325bfd7daf940f802ea06cba65c1ac0115..54652fb966526a2cdd186420c77f0bf5fea4dd7e 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 f7d56bd9c940b881b4d2800dbcb5e1192ed61a12..c21a5ddf235ec4a9f97417d031ab7dc2b6aedced 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;