wu-sheng closed pull request #816: Application, Instance, Service register tested with elastic search. URL: https://github.com/apache/incubator-skywalking/pull/816
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java new file mode 100644 index 000000000..6bf5d1690 --- /dev/null +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java @@ -0,0 +1,104 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.collector.agent.grpc.provider.handler.mock; + +import io.grpc.ManagedChannel; +import java.util.UUID; +import org.apache.skywalking.apm.network.proto.Application; +import org.apache.skywalking.apm.network.proto.ApplicationInstance; +import org.apache.skywalking.apm.network.proto.ApplicationMapping; +import org.apache.skywalking.apm.network.proto.ApplicationRegisterServiceGrpc; +import org.apache.skywalking.apm.network.proto.InstanceDiscoveryServiceGrpc; +import org.apache.skywalking.apm.network.proto.OSInfo; +import org.apache.skywalking.apm.network.proto.ServiceNameCollection; +import org.apache.skywalking.apm.network.proto.ServiceNameDiscoveryServiceGrpc; +import org.apache.skywalking.apm.network.proto.ServiceNameElement; +import org.joda.time.DateTime; + +/** + * @author peng-yongsheng + */ +class RegisterMock { + + private ApplicationRegisterServiceGrpc.ApplicationRegisterServiceBlockingStub applicationRegisterServiceBlockingStub; + private InstanceDiscoveryServiceGrpc.InstanceDiscoveryServiceBlockingStub instanceDiscoveryServiceBlockingStub; + private ServiceNameDiscoveryServiceGrpc.ServiceNameDiscoveryServiceBlockingStub serviceNameDiscoveryServiceBlockingStub; + + void mock(ManagedChannel channel) { + applicationRegisterServiceBlockingStub = ApplicationRegisterServiceGrpc.newBlockingStub(channel); + instanceDiscoveryServiceBlockingStub = InstanceDiscoveryServiceGrpc.newBlockingStub(channel); + serviceNameDiscoveryServiceBlockingStub = ServiceNameDiscoveryServiceGrpc.newBlockingStub(channel); + registerConsumer(); + registerProvider(); + } + + private void registerConsumer() { + Application.Builder application = Application.newBuilder(); + application.setApplicationCode("dubbox-consumer"); + ApplicationMapping applicationMapping = applicationRegisterServiceBlockingStub.applicationCodeRegister(application.build()); + + ApplicationInstance.Builder instance = ApplicationInstance.newBuilder(); + instance.setApplicationId(applicationMapping.getApplication().getValue()); + instance.setAgentUUID(UUID.randomUUID().toString()); + instance.setRegisterTime(new DateTime("2017-01-01T00:01:01.001").getMillis()); + + OSInfo.Builder osInfo = OSInfo.newBuilder(); + osInfo.setHostname("pengys"); + osInfo.setOsName("MacOS XX"); + osInfo.setProcessNo(1001); + osInfo.addIpv4S("10.0.0.3"); + osInfo.addIpv4S("10.0.0.4"); + instance.setOsinfo(osInfo); + instanceDiscoveryServiceBlockingStub.registerInstance(instance.build()); + + ServiceNameCollection.Builder serviceNameCollection = ServiceNameCollection.newBuilder(); + ServiceNameElement.Builder serviceNameElement = ServiceNameElement.newBuilder(); + serviceNameElement.setApplicationId(applicationMapping.getApplication().getValue()); + serviceNameElement.setServiceName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"); + serviceNameCollection.addElements(serviceNameElement); + serviceNameDiscoveryServiceBlockingStub.discovery(serviceNameCollection.build()); + } + + private void registerProvider() { + Application.Builder application = Application.newBuilder(); + application.setApplicationCode("dubbox-provider"); + ApplicationMapping applicationMapping = applicationRegisterServiceBlockingStub.applicationCodeRegister(application.build()); + + ApplicationInstance.Builder instance = ApplicationInstance.newBuilder(); + instance.setApplicationId(applicationMapping.getApplication().getValue()); + instance.setAgentUUID(UUID.randomUUID().toString()); + instance.setRegisterTime(new DateTime("2017-01-01T00:01:01.001").getMillis()); + + OSInfo.Builder osInfo = OSInfo.newBuilder(); + osInfo.setHostname("peng-yongsheng"); + osInfo.setOsName("MacOS X"); + osInfo.setProcessNo(1000); + osInfo.addIpv4S("10.0.0.1"); + osInfo.addIpv4S("10.0.0.2"); + instance.setOsinfo(osInfo); + instanceDiscoveryServiceBlockingStub.registerInstance(instance.build()); + + ServiceNameCollection.Builder serviceNameCollection = ServiceNameCollection.newBuilder(); + ServiceNameElement.Builder serviceNameElement = ServiceNameElement.newBuilder(); + serviceNameElement.setApplicationId(applicationMapping.getApplication().getValue()); + serviceNameElement.setServiceName("org.skywaking.apm.testcase.dubbo.services.GreetService.doBusiness()"); + serviceNameCollection.addElements(serviceNameElement); + serviceNameDiscoveryServiceBlockingStub.discovery(serviceNameCollection.build()); + } +} diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java index 1f6544110..8fe9ee82a 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/TraceSegmentMock.java @@ -36,9 +36,13 @@ private static final Logger logger = LoggerFactory.getLogger(TraceSegmentMock.class); public static void main(String[] args) throws InterruptedException { + ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build(); + + RegisterMock registerMock = new RegisterMock(); + registerMock.mock(channel); + Sleeping sleeping = new Sleeping(); - ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build(); TraceSegmentServiceGrpc.TraceSegmentServiceStub stub = TraceSegmentServiceGrpc.newStub(channel); StreamObserver<UpstreamSegment> segmentStreamObserver = stub.collect(new StreamObserver<Downstream>() { @Override public void onNext(Downstream downstream) { diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java index 686320b54..d2032a47d 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/ApplicationRegisterSerialWorker.java @@ -55,7 +55,14 @@ public ApplicationRegisterSerialWorker(ModuleManager moduleManager) { @Override protected void onWork(Application application) throws WorkerException { logger.debug("register application, application code: {}", application.getApplicationCode()); - int applicationId = applicationCacheService.getApplicationIdByCode(application.getApplicationCode()); + + int applicationId; + + if (BooleanUtils.valueToBoolean(application.getIsAddress())) { + applicationId = applicationCacheService.getApplicationIdByAddressId(application.getAddressId()); + } else { + applicationId = applicationCacheService.getApplicationIdByCode(application.getApplicationCode()); + } if (applicationId == 0) { Application newApplication; diff --git a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java index de5a8c131..e51a4cd50 100644 --- a/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-register/register-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/register/provider/register/InstanceRegisterSerialWorker.java @@ -55,7 +55,14 @@ public InstanceRegisterSerialWorker(ModuleManager moduleManager) { @Override protected void onWork(Instance instance) throws WorkerException { logger.debug("register instance, application id: {}, agentUUID: {}", instance.getApplicationId(), instance.getAgentUUID()); - int instanceId = instanceCacheService.getInstanceIdByAgentUUID(instance.getApplicationId(), instance.getAgentUUID()); + + int instanceId; + if (BooleanUtils.valueToBoolean(instance.getIsAddress())) { + instanceId = instanceCacheService.getInstanceIdByAddressId(instance.getApplicationId(), instance.getAddressId()); + } else { + instanceId = instanceCacheService.getInstanceIdByAgentUUID(instance.getApplicationId(), instance.getAgentUUID()); + } + if (instanceId == 0) { Instance newInstance; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/ApplicationEsCacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/ApplicationEsCacheDAO.java index ded51ed6c..93bec1ec3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/ApplicationEsCacheDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/ApplicationEsCacheDAO.java @@ -50,7 +50,7 @@ public ApplicationEsCacheDAO(ElasticSearchClient client) { ElasticSearchClient client = getClient(); SearchRequestBuilder searchRequestBuilder = client.prepareSearch(ApplicationTable.TABLE); - searchRequestBuilder.setTypes("type"); + searchRequestBuilder.setTypes(ApplicationTable.TABLE_TYPE); searchRequestBuilder.setSearchType(SearchType.QUERY_THEN_FETCH); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); @@ -88,7 +88,7 @@ public ApplicationEsCacheDAO(ElasticSearchClient client) { ElasticSearchClient client = getClient(); SearchRequestBuilder searchRequestBuilder = client.prepareSearch(ApplicationTable.TABLE); - searchRequestBuilder.setTypes("type"); + searchRequestBuilder.setTypes(ApplicationTable.TABLE_TYPE); searchRequestBuilder.setSearchType(SearchType.QUERY_THEN_FETCH); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/InstanceEsCacheDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/InstanceEsCacheDAO.java index baca55ef4..0c302b012 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/InstanceEsCacheDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/cache/InstanceEsCacheDAO.java @@ -53,7 +53,7 @@ public InstanceEsCacheDAO(ElasticSearchClient client) { ElasticSearchClient client = getClient(); SearchRequestBuilder searchRequestBuilder = client.prepareSearch(InstanceTable.TABLE); - searchRequestBuilder.setTypes("type"); + searchRequestBuilder.setTypes(InstanceTable.TABLE_TYPE); searchRequestBuilder.setSearchType(SearchType.QUERY_THEN_FETCH); BoolQueryBuilder builder = QueryBuilders.boolQuery(); builder.must().add(QueryBuilders.termQuery(InstanceTable.COLUMN_APPLICATION_ID, applicationId)); @@ -74,7 +74,7 @@ public InstanceEsCacheDAO(ElasticSearchClient client) { ElasticSearchClient client = getClient(); SearchRequestBuilder searchRequestBuilder = client.prepareSearch(InstanceTable.TABLE); - searchRequestBuilder.setTypes("type"); + searchRequestBuilder.setTypes(InstanceTable.TABLE_TYPE); searchRequestBuilder.setSearchType(SearchType.QUERY_THEN_FETCH); BoolQueryBuilder builder = QueryBuilders.boolQuery(); builder.must().add(QueryBuilders.termQuery(InstanceTable.COLUMN_APPLICATION_ID, applicationId)); ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
