Unverified Commit 2d80d8dc authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge branch 'feature/collector-modelization' into feature/agent-memory-control

parents 41e459df b744d402

README.md

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ Sky Walking | [中文](README_ZH.md) 
* The UI released on [skywalking-ui](https://github.com/OpenSkywalking/sky-walking-ui)



# Architecture

* Architecture graph for 3.2+

<img src="https://skywalkingtest.github.io/page-resources/3.x-architecture.jpg"/>

* Architecture graph for 3.2.5+

<img src="https://skywalkingtest.github.io/page-resources/3.2.5%2b_architecture.jpg"/>



# Document

[![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/document-中文-blue.svg)](docs/README_ZH.md)

README_ZH.md

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ Sky Walking | [English](README.md) 


# Architecture

* 3.2+版本架构图

<img src="https://skywalkingtest.github.io/page-resources/3.x-architecture.jpg"/>

<img src="https://skywalkingtest.github.io/page-resources/3.2.5%2b_architecture.jpg"/>



# Document

[![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/document-中文-blue.svg)](docs/README_ZH.md)

apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentModuleGRPCProvider.java

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import org.skywalking.apm.collector.naming.service.NamingHandlerRegisterService; 
import org.skywalking.apm.collector.remote.RemoteModule;

import org.skywalking.apm.collector.server.Server;

import org.skywalking.apm.collector.storage.StorageModule;

import org.skywalking.apm.collector.stream.worker.base.WorkerCreateListener;

import org.skywalking.apm.collector.stream.StreamModule;



/**

 * @author peng-yongsheng
@@ -82,7 +82,7 @@ public class AgentModuleGRPCProvider extends ModuleProvider { 
        GRPCManagerService managerService = getManager().find(GRPCManagerModule.NAME).getService(GRPCManagerService.class);

        Server gRPCServer = managerService.createIfAbsent(host, port);



        AgentStreamSingleton.getInstance(getManager(), new WorkerCreateListener());

        AgentStreamSingleton.createInstanceIfAbsent(getManager());

        addHandlers(gRPCServer);

    }
@@ -91,7 +91,7 @@ public class AgentModuleGRPCProvider extends ModuleProvider { 
    }



    @Override public String[] requiredModules() {

        return new String[] {ClusterModule.NAME, NamingModule.NAME, StorageModule.NAME, GRPCManagerModule.NAME, CacheModule.NAME, RemoteModule.NAME};

        return new String[] {ClusterModule.NAME, NamingModule.NAME, StorageModule.NAME, GRPCManagerModule.NAME, CacheModule.NAME, RemoteModule.NAME, StreamModule.NAME};

    }



    private void addHandlers(Server gRPCServer) {

apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/main/java/org/skywalking/apm/collector/agent/grpc/handler/JVMMetricsServiceHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 


        request.getMetricsList().forEach(metric -> {

            long time = TimeBucketUtils.INSTANCE.getSecondTimeBucket(metric.getTime());

            senToInstanceHeartBeatPersistenceWorker(instanceId, metric.getTime());

            sendToInstanceHeartBeatPersistenceWorker(instanceId, metric.getTime());

            sendToCpuMetricPersistenceWorker(instanceId, time, metric.getCpu());

            sendToMemoryMetricPersistenceWorker(instanceId, time, metric.getMemoryList());

            sendToMemoryPoolMetricPersistenceWorker(instanceId, time, metric.getMemoryPoolList());
@@ -79,7 +79,7 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 
        responseObserver.onCompleted();

    }



    private void senToInstanceHeartBeatPersistenceWorker(int instanceId, long heartBeatTime) {

    private void sendToInstanceHeartBeatPersistenceWorker(int instanceId, long heartBeatTime) {

        Instance instance = new Instance(String.valueOf(instanceId));

        instance.setHeartBeatTime(TimeBucketUtils.INSTANCE.getSecondTimeBucket(heartBeatTime));

        instance.setInstanceId(instanceId);

apm-collector/apm-collector-agent/collector-agent-grpc-provider/src/test/java/org/skywalking/apm/collector/agent/grpc/handler/ApplicationRegisterServiceHandlerTestCase.java

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ public class ApplicationRegisterServiceHandlerTestCase { 


    private ApplicationRegisterServiceGrpc.ApplicationRegisterServiceBlockingStub stub;



    //@Test

    public void testRegister() {

        ManagedChannel channel = ManagedChannelBuilder.forAddress("localhost", 11800).usePlaintext(true).build();

        stub = ApplicationRegisterServiceGrpc.newBlockingStub(channel);