Commit d7a2a198 authored by 吴晟's avatar 吴晟
Browse files

Move instruments into an independency module in collector, named `apm-collector-instrument`.

parent 9dbd4ef6

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/ModuleProvider.java

+0 −1
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}.

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

+0 −34
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package org.skywalking.apm.collector.core.module; 


import org.junit.Assert;

import org.junit.Test;

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



/**

 * @author wu-sheng
@@ -39,37 +38,4 @@ public class ModuleManagerTest { 
        BaseModuleA.ServiceABusiness1 serviceABusiness1 = manager.find("BaseA").provider().getService(BaseModuleA.ServiceABusiness1.class);

        Assert.assertTrue(serviceABusiness1 != null);

    }



    @Test

    public void testInstrument() throws ServiceNotProvidedException, ModuleNotFoundException, ProviderNotFoundException, DuplicateProviderException {

        ApplicationConfiguration configuration = new ApplicationConfiguration();

        configuration.addModule("Test").addProviderConfiguration("TestModule-Provider", null);

        configuration.addModule("BaseA").addProviderConfiguration("P-A", null);

        configuration.addModule("BaseB").addProviderConfiguration("P-B", null);



        ModuleManager manager = new ModuleManager();

        manager.init(configuration);



        BaseModuleA.ServiceABusiness1 serviceABusiness1 = manager.find("BaseA").getService(BaseModuleA.ServiceABusiness1.class);



        Assert.assertTrue(serviceABusiness1 instanceof TracedService);



//        for (int i = 0; i < 10000; i++)

//            serviceABusiness1.print();

//

//        try {

//            Thread.sleep(60 * 1000L);

//        } catch (InterruptedException e) {

//            e.printStackTrace();

//        }

//

//        for (int i = 0; i < 10000; i++)

//            serviceABusiness1.print();

//

//        try {

//            Thread.sleep(120 * 1000L);

//        } catch (InterruptedException e) {

//            e.printStackTrace();

//        }

    }

}

apm-collector/apm-collector-instrument/pom.xml

0 → 100644
+44 −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</artifactId>

        <groupId>org.skywalking</groupId>

        <version>3.2.4-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>apm-collector-instrument</artifactId>



    <dependencies>

        <dependency>

            <groupId>org.skywalking</groupId>

            <artifactId>apm-collector-core</artifactId>

            <version>${project.version}</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/instrument/MetricCollector.java→apm-collector/apm-collector-instrument/src/main/java/org/skywalking/apm/collector/instrument/MetricCollector.java

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

 */



package org.skywalking.apm.collector.core.module.instrument;

package org.skywalking.apm.collector.instrument;



import java.lang.reflect.Method;

import java.util.HashMap;