Skip to content

Correct spelling errors in the network protocol. #3091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 3 commits into from
Jul 16, 2019
Merged

Correct spelling errors in the network protocol. #3091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a69a965
Correct spelling errors in the network protocol.
peng-yongsheng Jul 15, 2019
84c79ef
update protocol submodule commit id.
peng-yongsheng Jul 15, 2019
e073f67
Merge branch 'master' into fixed/protocol
wu-sheng Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apm-protocol/apm-network/src/main/proto
Open in desktop
Submodule proto updated 2 files
+3 −3 register/Register.proto
+4 −3 service-mesh-probe/istio/skywalking.config.pb.html
14 changes: 4 additions & 10 deletions ...src/main/java/org/apache/skywalking/apm/agent/core/dictionary/EndpointNameDictionary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -73,7 +67,7 @@ private PossibleFound find0(int serviceId, String endpointName,
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())
Expand Down
2 changes: 1 addition & 1 deletion ...walking/oap/server/receiver/register/provider/handler/v6/grpc/RegisterServiceHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public RegisterServiceHandler(ModuleManager moduleManager) {
responseObserver.onCompleted();
}

@Override public void doEndpointRegister(Enpoints request, StreamObserver<EndpointMapping> responseObserver) {
@Override public void doEndpointRegister(Endpoints request, StreamObserver<EndpointMapping> responseObserver) {
EndpointMapping.Builder builder = EndpointMapping.newBuilder();

request.getEndpointsList().forEach(endpoint -> {
Expand Down