From 1057463812d129e9d2518e677cd06597170a2965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E5=8B=87=E5=8D=87=20pengys?= Date: Tue, 16 Jul 2019 09:19:48 +0800 Subject: [PATCH] Correct spelling errors in the network protocol. (#3091) * Correct spelling errors in the network protocol. * update protocol submodule commit id. --- apm-protocol/apm-network/src/main/proto | 2 +- .../core/dictionary/EndpointNameDictionary.java | 14 ++++---------- .../handler/v6/grpc/RegisterServiceHandler.java | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/apm-protocol/apm-network/src/main/proto b/apm-protocol/apm-network/src/main/proto index ef3f6f0c1..7b244ff7e 160000 --- a/apm-protocol/apm-network/src/main/proto +++ b/apm-protocol/apm-network/src/main/proto @@ -1 +1 @@ -Subproject commit ef3f6f0c18db9e4d11dbdd7ceacd16df456c3a1b +Subproject commit 7b244ff7ec350910295eee85633e02d92a6f6b1c diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java index ac56aa608..4d959118d 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java @@ -19,17 +19,11 @@ package org.apache.skywalking.apm.agent.core.dictionary; import io.netty.util.internal.ConcurrentSet; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import org.apache.skywalking.apm.agent.core.logging.api.ILog; -import org.apache.skywalking.apm.agent.core.logging.api.LogManager; +import org.apache.skywalking.apm.agent.core.logging.api.*; import org.apache.skywalking.apm.network.common.DetectPoint; -import org.apache.skywalking.apm.network.register.v2.Endpoint; -import org.apache.skywalking.apm.network.register.v2.EndpointMapping; -import org.apache.skywalking.apm.network.register.v2.EndpointMappingElement; -import org.apache.skywalking.apm.network.register.v2.Enpoints; -import org.apache.skywalking.apm.network.register.v2.RegisterGrpc; +import org.apache.skywalking.apm.network.register.v2.*; import static org.apache.skywalking.apm.agent.core.conf.Config.Dictionary.ENDPOINT_NAME_BUFFER_SIZE; @@ -73,7 +67,7 @@ public enum EndpointNameDictionary { public void syncRemoteDictionary( RegisterGrpc.RegisterBlockingStub serviceNameDiscoveryServiceBlockingStub) { if (unRegisterEndpoints.size() > 0) { - Enpoints.Builder builder = Enpoints.newBuilder(); + Endpoints.Builder builder = Endpoints.newBuilder(); for (OperationNameKey operationNameKey : unRegisterEndpoints) { Endpoint endpoint = Endpoint.newBuilder() .setServiceId(operationNameKey.getServiceId()) diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java index d7a2ef996..6bdb842f6 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java @@ -130,7 +130,7 @@ public class RegisterServiceHandler extends RegisterGrpc.RegisterImplBase implem responseObserver.onCompleted(); } - @Override public void doEndpointRegister(Enpoints request, StreamObserver responseObserver) { + @Override public void doEndpointRegister(Endpoints request, StreamObserver responseObserver) { EndpointMapping.Builder builder = EndpointMapping.newBuilder(); request.getEndpointsList().forEach(endpoint -> {