Commit d8ba62e9 authored by peng-yongsheng's avatar peng-yongsheng
Browse files

Merge branch 'feature/collector-modelization' of... 

Merge branch 'feature/collector-modelization' of https://github.com/OpenSkywalking/skywalking into feature/collector-modelization
parents 8922e974 e8e4915d

apm-collector/apm-collector-core/pom.xml

+1 −6
Original line number Diff line number Diff line
@@ -18,10 +18,5 @@ 
            <artifactId>gson</artifactId>

            <version>2.8.1</version>

        </dependency>

        <dependency>

            <groupId>net.bytebuddy</groupId>

            <artifactId>byte-buddy</artifactId>

            <version>1.7.8</version>

        </dependency>

    </dependencies>

</project>

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/BootstrapFlow.java

+2 −2
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ public class BootstrapFlow { 
                }

            }

            logger.info("start the provider {} in {} module.", provider.name(), provider.getModuleName());

            provider.start(configuration.getModuleConfiguration(provider.getModuleName()).getProviderConfiguration(provider.name()));



            provider.requiredCheck(provider.getModule().services());



            provider.start(configuration.getModuleConfiguration(provider.getModuleName()).getProviderConfiguration(provider.name()));

        }

    }

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleManager.java

+0 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import java.util.ServiceLoader; 
 */

public class ModuleManager {

    private Map<String, Module> loadedModules = new HashMap<>();

    private boolean isServiceInstrument = true;



    /**

     * Init the given modules
@@ -81,12 +80,4 @@ public class ModuleManager { 
            return module;

        throw new ModuleNotFoundException(moduleName + " missing.");

    }



    public boolean isServiceInstrument() {

        return isServiceInstrument;

    }



    public void setServiceInstrument(boolean serviceInstrument) {

        isServiceInstrument = serviceInstrument;

    }

}

apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/module/ModuleProvider.java

+0 −4
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ package org.skywalking.apm.collector.core.module; 
import java.util.HashMap;

import java.util.Map;

import java.util.Properties;

import org.skywalking.apm.collector.core.module.instrument.ServiceInstrumentation;



/**

 * The <code>ModuleProvider</code> is an implementation of a {@link Module}.
@@ -95,9 +94,6 @@ public abstract class ModuleProvider { 
    protected final void registerServiceImplementation(Class<? extends Service> serviceType,

        Service service) throws ServiceNotProvidedException {

        if (serviceType.isInstance(service)) {

            if (manager.isServiceInstrument()) {

//                service = ServiceInstrumentation.INSTANCE.buildServiceUnderMonitor(module.name(), name(), service);

            }

            this.services.put(serviceType, service);

        } else {

            throw new ServiceNotProvidedException(serviceType + " is not implemented by " + service);

apm-collector/apm-collector-core/src/test/java/org/skywalking/apm/collector/core/module/ModuleAProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ public class ModuleAProvider extends ModuleProvider { 


    @Override public void prepare(Properties config) throws ServiceNotProvidedException {

        this.registerServiceImplementation(BaseModuleA.ServiceABusiness1.class, new ModuleABusiness1Impl());

        this.registerServiceImplementation(BaseModuleA.ServiceABusiness2.class, new ModuleABusiness2Impl());

    }



    @Override public void start(Properties config) throws ServiceNotProvidedException {

        this.registerServiceImplementation(BaseModuleA.ServiceABusiness2.class, new ModuleABusiness2Impl());

    }



    @Override public void notifyAfterCompleted() throws ServiceNotProvidedException {