Commit 7d463fbd authored by ascrutae's avatar ascrutae
Browse files

Merge commit '533be469' into feature/3.0 

# Conflicts:
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java
#	skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java
parents d8d916a2 533be469

pom.xml

+48 −48
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

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

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

<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">

	<modelVersion>4.0.0</modelVersion>
@@ -31,6 +30,7 @@ 
		<module>skywalking-commons</module>

		<module>skywalking-sniffer</module>

		<module>skywalking-application-toolkit</module>

		<module>skywalking-collector</module>

	</modules>

	<packaging>pom</packaging>
@@ -50,6 +50,7 @@ 
	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<compiler.version>1.8</compiler.version>

		<scala.compiler.version>2.11.7</scala.compiler.version>

		<powermock.version>1.6.4</powermock.version>

		<docker.plugin.version>0.4.13</docker.plugin.version>

		<skywalking.version>2.1-2017</skywalking.version>
@@ -161,5 +162,4 @@ 
            </plugin>

        </plugins>

    </build>



</project>

skywalking-collector/pom.xml

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

<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/maven-v4_0_0.xsd">

    <modelVersion>4.0.0</modelVersion>

    <modules>

        <module>skywalking-collector-cluster</module>

        <module>skywalking-collector-worker</module>

    </modules>

    <parent>

        <artifactId>skywalking</artifactId>

        <groupId>com.a.eye</groupId>

        <version>3.0-2017</version>

    </parent>

    <artifactId>skywalking-collector</artifactId>

    <packaging>pom</packaging>



    <properties>

        <akka.version>2.4.17</akka.version>

    </properties>



    <dependencies>

        <dependency>

            <groupId>com.typesafe.akka</groupId>

            <artifactId>akka-cluster_2.11</artifactId>

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

        </dependency>

        <dependency>

            <groupId>com.typesafe.akka</groupId>

            <artifactId>akka-testkit_2.11</artifactId>

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

            <scope>test</scope>

        </dependency>

        <dependency>

            <groupId>com.a.eye</groupId>

            <artifactId>skywalking-logging-api</artifactId>

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

        </dependency>

    </dependencies>

</project>

skywalking-collector/skywalking-collector-cluster/pom.xml

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

<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>skywalking-collector</artifactId>

        <groupId>com.a.eye</groupId>

        <version>3.0-2017</version>

    </parent>

    <modelVersion>4.0.0</modelVersion>



    <artifactId>skywalking-collector-cluster</artifactId>

    <packaging>jar</packaging>



    <properties>

    </properties>



    <dependencies>

        <dependency>

            <groupId>com.a.eye</groupId>

            <artifactId>skywalking-util</artifactId>

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

        </dependency>

        <dependency>

            <groupId>com.lmax</groupId>

            <artifactId>disruptor</artifactId>

            <version>3.3.6</version>

        </dependency>

    </dependencies>

</project>

skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractAsyncMember.java

0 → 100644
+37 −0
Original line number Diff line number Diff line 
package com.a.eye.skywalking.collector.actor;



import akka.actor.ActorRef;

import com.a.eye.skywalking.collector.queue.EndOfBatchCommand;

import com.a.eye.skywalking.collector.queue.MessageHolder;

import com.lmax.disruptor.RingBuffer;



/**

 * @author pengys5

 */

public abstract class AbstractAsyncMember extends AbstractMember {



    private RingBuffer<MessageHolder> ringBuffer;



    public AbstractAsyncMember(RingBuffer<MessageHolder> ringBuffer, ActorRef actorRef) {

        super(actorRef);

        this.ringBuffer = ringBuffer;

    }



    public void onEvent(MessageHolder event, long sequence, boolean endOfBatch) throws Exception {

        Object message = event.getMessage();

        event.reset();

        receive(message);

        if (endOfBatch) {

            receive(new EndOfBatchCommand());

        }

    }



    public void beTold(Object message) throws Exception {

        long sequence = ringBuffer.next();

        try {

            ringBuffer.get(sequence).setMessage(message);

        } finally {

            ringBuffer.publish(sequence);

        }

    }

}

skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractAsyncMemberProvider.java

0 → 100644
+44 −0
Original line number Diff line number Diff line 
package com.a.eye.skywalking.collector.actor;



import akka.actor.ActorRef;

import com.a.eye.skywalking.collector.queue.DaemonThreadFactory;

import com.a.eye.skywalking.collector.queue.MessageHolder;

import com.a.eye.skywalking.collector.queue.MessageHolderFactory;

import com.lmax.disruptor.EventHandler;

import com.lmax.disruptor.RingBuffer;

import com.lmax.disruptor.dsl.Disruptor;



import java.lang.reflect.Constructor;



/**

 * @author pengys5

 */

public abstract class AbstractAsyncMemberProvider<T extends EventHandler> extends AbstractMemberProvider<T> {



    public abstract int queueSize();



    @Override

    public T createWorker(ActorRef actorRef) throws Exception {

        if (memberClass() == null) {

            throw new IllegalArgumentException("cannot createInstance() with nothing obtained from memberClass()");

        }



        Constructor memberConstructor = memberClass().getDeclaredConstructor(new Class<?>[]{RingBuffer.class, ActorRef.class});

        memberConstructor.setAccessible(true);



        // Specify the size of the ring buffer, must be power of 2.

        int bufferSize = queueSize();

        // Construct the Disruptor

        Disruptor<MessageHolder> disruptor = new Disruptor<MessageHolder>(MessageHolderFactory.INSTANCE, bufferSize, DaemonThreadFactory.INSTANCE);



        RingBuffer<MessageHolder> ringBuffer = disruptor.getRingBuffer();

        T member = (T) memberConstructor.newInstance(ringBuffer, actorRef);



        // Connect the handler

        disruptor.handleEventsWith(member);



        // Start the Disruptor, starts all threads running

        disruptor.start();

        return member;

    }

}