Commit 1b8db8ce authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge branch 'master' into wu-sheng-3.2-readme

parents 2ac6f175 7f5248c5

apm-application-toolkit/apm-toolkit-trace/pom.xml

0 → 100644
+45 −0
Original line number Diff line number Diff line 
<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-application-toolkit</artifactId>

        <groupId>org.skywalking</groupId>

        <version>3.2-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>apm-toolkit-trace</artifactId>

    <packaging>jar</packaging>



    <url>http://maven.apache.org</url>



    <build>

        <plugins>

            <plugin>

                <!-- 源码插件 -->

                <groupId>org.apache.maven.plugins</groupId>

                <artifactId>maven-source-plugin</artifactId>

                <!-- 发布时自动将源码同时发布的配置 -->

                <executions>

                    <execution>

                        <id>attach-sources</id>

                        <goals>

                            <goal>jar</goal>

                        </goals>

                    </execution>

                </executions>

                <version>2.4</version>

            </plugin>

        </plugins>

    </build>



    <distributionManagement>

        <repository>

            <id>bintray-wu-sheng-sky-walking-repository</id>

            <name>wu-sheng-sky-walking-repository</name>

            <url>

                https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-trace/;publish=1

            </url>

        </repository>

    </distributionManagement>

</project>

apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/ActiveSpan.java

0 → 100644
+16 −0
Original line number Diff line number Diff line 
package org.skywalking.apm.toolkit.trace;



/**

 * provide custom api that set tag for current active span.

 *

 * @author zhangxin

 */

public class ActiveSpan {

    /**

     * @param key tag key

     * @param value tag value

     */

    public static void tag(String key, String value) {



    }

}

apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/Trace.java

0 → 100644
+22 −0
Original line number Diff line number Diff line 
package org.skywalking.apm.toolkit.trace;



import java.lang.annotation.ElementType;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.lang.annotation.Target;



/**

 * The agent create local span if the method that annotation with {@link Trace}. The value of span operation name will

 * fetch by {@link #operationName()}.  if the value of {@link #operationName()} is blank string. the operation name will

 * be set the class name + method name.

 *

 * @author zhangxin

 */

@Target(ElementType.METHOD)

@Retention(RetentionPolicy.RUNTIME)

public @interface Trace {

    /**

     * @return operation name, the default value is blank string.

     */

    String operationName() default "";

}

apm-application-toolkit/pom.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
        <module>apm-toolkit-logback-1.x</module>

        <module>apm-toolkit-trace-context</module>

        <module>apm-toolkit-opentracing</module>

        <module>apm-toolkit-trace</module>

    </modules>

</project>

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

+10 −9
Original line number Diff line number Diff line
@@ -3,23 +3,23 @@ package org.skywalking.apm.collector.agentjvm.grpc.handler; 
import io.grpc.stub.StreamObserver;

import java.util.List;

import org.skywalking.apm.collector.agentjvm.worker.cpu.CpuMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.cpu.define.CpuMetricDataDefine;

import org.skywalking.apm.collector.agentjvm.worker.gc.GCMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.gc.define.GCMetricDataDefine;

import org.skywalking.apm.collector.agentjvm.worker.heartbeat.InstHeartBeatPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.heartbeat.define.InstanceHeartBeatDataDefine;

import org.skywalking.apm.collector.agentjvm.worker.memory.MemoryMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.memory.define.MemoryMetricDataDefine;

import org.skywalking.apm.collector.agentjvm.worker.memorypool.MemoryPoolMetricPersistenceWorker;

import org.skywalking.apm.collector.agentjvm.worker.memorypool.define.MemoryPoolMetricDataDefine;

import org.skywalking.apm.collector.core.framework.CollectorContextHelper;

import org.skywalking.apm.collector.core.util.Const;

import org.skywalking.apm.collector.core.util.TimeBucketUtils;

import org.skywalking.apm.collector.server.grpc.GRPCHandler;

import org.skywalking.apm.collector.storage.define.jvm.CpuMetricDataDefine;

import org.skywalking.apm.collector.storage.define.jvm.GCMetricDataDefine;

import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricDataDefine;

import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricDataDefine;

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

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

import org.skywalking.apm.collector.stream.worker.WorkerInvokeException;

import org.skywalking.apm.collector.stream.worker.WorkerNotFoundException;

import org.skywalking.apm.collector.stream.worker.util.TimeBucketUtils;

import org.skywalking.apm.network.proto.CPU;

import org.skywalking.apm.network.proto.Downstream;

import org.skywalking.apm.network.proto.GC;
@@ -44,7 +44,7 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 
        StreamModuleContext context = (StreamModuleContext)CollectorContextHelper.INSTANCE.getContext(StreamModuleGroupDefine.GROUP_NAME);

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

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

            senToInstanceHeartBeatPersistenceWorker(context, applicationInstanceId, time);

            senToInstanceHeartBeatPersistenceWorker(context, applicationInstanceId, metric.getTime());

            sendToCpuMetricPersistenceWorker(context, applicationInstanceId, time, metric.getCpu());

            sendToMemoryMetricPersistenceWorker(context, applicationInstanceId, time, metric.getMemoryList());

            sendToMemoryPoolMetricPersistenceWorker(context, applicationInstanceId, time, metric.getMemoryPoolList());
@@ -59,8 +59,8 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 
        long heartBeatTime) {

        InstanceHeartBeatDataDefine.InstanceHeartBeat heartBeat = new InstanceHeartBeatDataDefine.InstanceHeartBeat();

        heartBeat.setId(String.valueOf(applicationInstanceId));

        heartBeat.setHeartbeatTime(heartBeatTime);

        heartBeat.setApplicationInstanceId(applicationInstanceId);

        heartBeat.setHeartBeatTime(heartBeatTime);

        heartBeat.setInstanceId(applicationInstanceId);

        try {

            logger.debug("send to instance heart beat persistence worker, id: {}", heartBeat.getId());

            context.getClusterWorkerContext().lookup(InstHeartBeatPersistenceWorker.WorkerRole.INSTANCE).tell(heartBeat.toData());
@@ -111,7 +111,7 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 


        memoryPools.forEach(memoryPool -> {

            MemoryPoolMetricDataDefine.MemoryPoolMetric memoryPoolMetric = new MemoryPoolMetricDataDefine.MemoryPoolMetric();

            memoryPoolMetric.setId(timeBucket + Const.ID_SPLIT + applicationInstanceId + Const.ID_SPLIT + String.valueOf(memoryPool.getType().getNumber()));

            memoryPoolMetric.setId(timeBucket + Const.ID_SPLIT + applicationInstanceId + Const.ID_SPLIT + memoryPool.getIsHeap() + Const.ID_SPLIT + String.valueOf(memoryPool.getType().getNumber()));

            memoryPoolMetric.setApplicationInstanceId(applicationInstanceId);

            memoryPoolMetric.setPoolType(memoryPool.getType().getNumber());

            memoryPoolMetric.setHeap(memoryPool.getIsHeap());
@@ -139,6 +139,7 @@ public class JVMMetricsServiceHandler extends JVMMetricsServiceGrpc.JVMMetricsSe 
            gcMetric.setCount(gc.getCount());

            gcMetric.setTime(gc.getTime());

            gcMetric.setTimeBucket(timeBucket);

            gcMetric.setS5TimeBucket(TimeBucketUtils.INSTANCE.getFiveSecondTimeBucket(timeBucket));

            try {

                logger.debug("send to gc metric persistence worker, id: {}", gcMetric.getId());

                context.getClusterWorkerContext().lookup(GCMetricPersistenceWorker.WorkerRole.INSTANCE).tell(gcMetric.toData());