Unverified Commit 461672c9 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge branch 'master' into feature/support-start-script

parents b13049a4 af0b05a5

apm-collector/apm-collector-stream/collector-stream-define/pom.xml→apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/pom.xml

+3 −2
Original line number Diff line number Diff line
@@ -21,12 +21,13 @@ 
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>

        <artifactId>apm-collector-stream</artifactId>

        <artifactId>apm-collector-agent-grpc</artifactId>

        <groupId>org.skywalking</groupId>

        <version>3.2.5-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>collector-stream-define</artifactId>

    <artifactId>collector-agent-grpc-define</artifactId>

    <packaging>jar</packaging>



</project>
 
 No newline at end of file

apm-collector/apm-collector-agent/collector-agent-define/src/main/java/org/skywalking/apm/collector/agent/AgentModule.java→apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/java/org/skywalking/apm/collector/agent/grpc/AgentGRPCModule.java

+3 −3
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 
 * Project repository: https://github.com/OpenSkywalking/skywalking

 */



package org.skywalking.apm.collector.agent;

package org.skywalking.apm.collector.agent.grpc;



import org.skywalking.apm.collector.core.module.Module;



/**

 * @author peng-yongsheng

 */

public class AgentModule extends Module {

public class AgentGRPCModule extends Module {



    public static final String NAME = "agent";

    public static final String NAME = "agent_gRPC";



    @Override public String name() {

        return NAME;

apm-collector/apm-collector-stream/collector-stream-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module→apm-collector/apm-collector-agent-grpc/collector-agent-grpc-define/src/main/resources/META-INF/services/org.skywalking.apm.collector.core.module.Module

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 
# Project repository: https://github.com/OpenSkywalking/skywalking

#



org.skywalking.apm.collector.stream.StreamModule
 
 No newline at end of file
 
org.skywalking.apm.collector.agent.grpc.AgentGRPCModule
 
 No newline at end of file

apm-collector/apm-collector-agent-grpc/collector-agent-grpc-provider/pom.xml

0 → 100644
+60 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--

  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.

  ~

  ~ Licensed 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.

  ~

  ~ Project repository: https://github.com/OpenSkywalking/skywalking

  -->



<project xmlns="http://maven.apache.org/POM/4.0.0"

         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <parent>

        <artifactId>apm-collector-agent-grpc</artifactId>

        <groupId>org.skywalking</groupId>

        <version>3.2.5-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>collector-agent-grpc-provider</artifactId>

    <packaging>jar</packaging>



    <dependencies>

        <dependency>

            <groupId>org.skywalking</groupId>

            <artifactId>collector-agent-grpc-define</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>org.skywalking</groupId>

            <artifactId>collector-grpc-manager-define</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>org.skywalking</groupId>

            <artifactId>collector-cluster-define</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>org.skywalking</groupId>

            <artifactId>collector-naming-define</artifactId>

            <version>${project.version}</version>

        </dependency>

        <dependency>

            <groupId>org.skywalking</groupId>

            <artifactId>collector-agent-stream-define</artifactId>

            <version>${project.version}</version>

        </dependency>

    </dependencies>

</project>

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

+5 −11
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
package org.skywalking.apm.collector.agent.grpc;



import java.util.Properties;

import org.skywalking.apm.collector.agent.AgentModule;

import org.skywalking.apm.collector.agent.grpc.handler.ApplicationRegisterServiceHandler;

import org.skywalking.apm.collector.agent.grpc.handler.InstanceDiscoveryServiceHandler;

import org.skywalking.apm.collector.agent.grpc.handler.JVMMetricsServiceHandler;
@@ -27,8 +26,7 @@ import org.skywalking.apm.collector.agent.grpc.handler.ServiceNameDiscoveryServi 
import org.skywalking.apm.collector.agent.grpc.handler.TraceSegmentServiceHandler;

import org.skywalking.apm.collector.agent.grpc.handler.naming.AgentGRPCNamingHandler;

import org.skywalking.apm.collector.agent.grpc.handler.naming.AgentGRPCNamingListener;

import org.skywalking.apm.collector.agent.stream.AgentStreamSingleton;

import org.skywalking.apm.collector.cache.CacheModule;

import org.skywalking.apm.collector.agent.stream.AgentStreamModule;

import org.skywalking.apm.collector.cluster.ClusterModule;

import org.skywalking.apm.collector.cluster.service.ModuleListenerService;

import org.skywalking.apm.collector.cluster.service.ModuleRegisterService;
@@ -39,10 +37,7 @@ import org.skywalking.apm.collector.grpc.manager.GRPCManagerModule; 
import org.skywalking.apm.collector.grpc.manager.service.GRPCManagerService;

import org.skywalking.apm.collector.naming.NamingModule;

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.StreamModule;



/**

 * @author peng-yongsheng
@@ -58,7 +53,7 @@ public class AgentModuleGRPCProvider extends ModuleProvider { 
    }



    @Override public Class<? extends Module> module() {

        return AgentModule.class;

        return AgentGRPCModule.class;

    }



    @Override public void prepare(Properties config) throws ServiceNotProvidedException {
@@ -70,7 +65,7 @@ public class AgentModuleGRPCProvider extends ModuleProvider { 
        Integer port = (Integer)config.get(PORT);



        ModuleRegisterService moduleRegisterService = getManager().find(ClusterModule.NAME).getService(ModuleRegisterService.class);

        moduleRegisterService.register(AgentModule.NAME, this.name(), new AgentModuleGRPCRegistration(host, port));

        moduleRegisterService.register(AgentGRPCModule.NAME, this.name(), new AgentModuleGRPCRegistration(host, port));



        AgentGRPCNamingListener namingListener = new AgentGRPCNamingListener();

        ModuleListenerService moduleListenerService = getManager().find(ClusterModule.NAME).getService(ModuleListenerService.class);
@@ -82,7 +77,6 @@ public class AgentModuleGRPCProvider extends ModuleProvider { 
        GRPCManagerService managerService = getManager().find(GRPCManagerModule.NAME).getService(GRPCManagerService.class);

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



        AgentStreamSingleton.createInstanceIfAbsent(getManager());

        addHandlers(gRPCServer);

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



    @Override public String[] requiredModules() {

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

        return new String[] {ClusterModule.NAME, NamingModule.NAME, GRPCManagerModule.NAME, AgentStreamModule.NAME};

    }



    private void addHandlers(Server gRPCServer) {

        gRPCServer.addHandler(new ApplicationRegisterServiceHandler(getManager()));

        gRPCServer.addHandler(new InstanceDiscoveryServiceHandler(getManager()));

        gRPCServer.addHandler(new ServiceNameDiscoveryServiceHandler(getManager()));

        gRPCServer.addHandler(new JVMMetricsServiceHandler());

        gRPCServer.addHandler(new JVMMetricsServiceHandler(getManager()));

        gRPCServer.addHandler(new TraceSegmentServiceHandler(getManager()));

    }

}