kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

independent data carrier project

This commit is contained in:
ascrutae 2017-07-14 10:07:17 +08:00
parent 28b6d8faa4
commit 8143a5b096
27 changed files with 74 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apm-commons/apm-datacarrier/pom.xml Normal file
View File

@ -0,0 +1,14 @@
<?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>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-datacarrier</artifactId>
</project>

14
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/DataCarrier.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/DataCarrier.java
View File

@ -1,11 +1,11 @@
package org.skywalking.apm.agent.core.datacarrier;
package org.skywalking.apm.commons.datacarrier;
import org.skywalking.apm.agent.core.datacarrier.buffer.BufferStrategy;
import org.skywalking.apm.agent.core.datacarrier.buffer.Channels;
import org.skywalking.apm.agent.core.datacarrier.consumer.ConsumerPool;
import org.skywalking.apm.agent.core.datacarrier.consumer.IConsumer;
import org.skywalking.apm.agent.core.datacarrier.partition.IDataPartitioner;
import org.skywalking.apm.agent.core.datacarrier.partition.SimpleRollingPartitioner;
import org.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
import org.skywalking.apm.commons.datacarrier.buffer.Channels;
import org.skywalking.apm.commons.datacarrier.consumer.ConsumerPool;
import org.skywalking.apm.commons.datacarrier.consumer.IConsumer;
import org.skywalking.apm.commons.datacarrier.partition.IDataPartitioner;
import org.skywalking.apm.commons.datacarrier.partition.SimpleRollingPartitioner;
/**
* DataCarrier main class.

4
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/buffer/Buffer.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/buffer/Buffer.java
View File

@ -1,7 +1,7 @@
package org.skywalking.apm.agent.core.datacarrier.buffer;
package org.skywalking.apm.commons.datacarrier.buffer;
import java.util.LinkedList;
import org.skywalking.apm.agent.core.datacarrier.common.AtomicRangeInteger;
import org.skywalking.apm.commons.datacarrier.common.AtomicRangeInteger;
/**
* Created by wusheng on 2016/10/25.

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/buffer/BufferStrategy.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/buffer/BufferStrategy.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier.buffer;
package org.skywalking.apm.commons.datacarrier.buffer;
/**
* Created by wusheng on 2016/10/25.

4
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/buffer/Channels.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/buffer/Channels.java
View File

@ -1,6 +1,6 @@
package org.skywalking.apm.agent.core.datacarrier.buffer;
package org.skywalking.apm.commons.datacarrier.buffer;
import org.skywalking.apm.agent.core.datacarrier.partition.IDataPartitioner;
import org.skywalking.apm.commons.datacarrier.partition.IDataPartitioner;
/**
* Channels of Buffer

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/common/AtomicRangeInteger.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/common/AtomicRangeInteger.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier.common;
package org.skywalking.apm.commons.datacarrier.common;
import java.io.Serializable;
import java.util.concurrent.atomic.AtomicInteger;

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/consumer/ConsumerCannotBeCreatedException.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/consumer/ConsumerCannotBeCreatedException.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier.consumer;
package org.skywalking.apm.commons.datacarrier.consumer;
/**
* Created by wusheng on 2016/11/15.

6
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/consumer/ConsumerPool.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/consumer/ConsumerPool.java
View File

@ -1,9 +1,9 @@
package org.skywalking.apm.agent.core.datacarrier.consumer;
package org.skywalking.apm.commons.datacarrier.consumer;
import java.util.ArrayList;
import java.util.concurrent.locks.ReentrantLock;
import org.skywalking.apm.agent.core.datacarrier.buffer.Buffer;
import org.skywalking.apm.agent.core.datacarrier.buffer.Channels;
import org.skywalking.apm.commons.datacarrier.buffer.Buffer;
import org.skywalking.apm.commons.datacarrier.buffer.Channels;
/**
* Pool of consumers

4
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/consumer/ConsumerThread.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/consumer/ConsumerThread.java
View File

@ -1,8 +1,8 @@
package org.skywalking.apm.agent.core.datacarrier.consumer;
package org.skywalking.apm.commons.datacarrier.consumer;
import java.util.LinkedList;
import java.util.List;
import org.skywalking.apm.agent.core.datacarrier.buffer.Buffer;
import org.skywalking.apm.commons.datacarrier.buffer.Buffer;
/**
* Created by wusheng on 2016/10/25.

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/consumer/IConsumer.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/consumer/IConsumer.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier.consumer;
package org.skywalking.apm.commons.datacarrier.consumer;
import java.util.List;

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/partition/IDataPartitioner.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/partition/IDataPartitioner.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier.partition;
package org.skywalking.apm.commons.datacarrier.partition;
/**
* Created by wusheng on 2016/10/25.

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/partition/ProducerThreadPartitioner.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitioner.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier.partition;
package org.skywalking.apm.commons.datacarrier.partition;
/**
* use threadid % total to partition

2
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/datacarrier/partition/SimpleRollingPartitioner.java → apm-commons/apm-datacarrier/src/main/java/org/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitioner.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier.partition;
package org.skywalking.apm.commons.datacarrier.partition;
/**
* use normal int to rolling.

17
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/datacarrier/DataCarrierTest.java → apm-commons/apm-datacarrier/src/test/java/org/skywalking/apm/commons/datacarrier/DataCarrierTest.java
View File

@ -1,16 +1,15 @@
package org.skywalking.apm.agent.core.datacarrier;
package org.skywalking.apm.commons.datacarrier;
import org.skywalking.apm.agent.core.datacarrier.buffer.Buffer;
import org.skywalking.apm.agent.core.datacarrier.buffer.BufferStrategy;
import org.skywalking.apm.agent.core.datacarrier.buffer.Channels;
import org.skywalking.apm.agent.core.datacarrier.consumer.IConsumer;
import org.skywalking.apm.agent.core.datacarrier.partition.ProducerThreadPartitioner;
import org.skywalking.apm.agent.core.datacarrier.partition.SimpleRollingPartitioner;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import org.powermock.api.support.membermodification.MemberModifier;
import java.util.List;
import org.skywalking.apm.commons.datacarrier.buffer.Buffer;
import org.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
import org.skywalking.apm.commons.datacarrier.buffer.Channels;
import org.skywalking.apm.commons.datacarrier.consumer.IConsumer;
import org.skywalking.apm.commons.datacarrier.partition.ProducerThreadPartitioner;
import org.skywalking.apm.commons.datacarrier.partition.SimpleRollingPartitioner;
/**
* Created by wusheng on 2016/10/25.

2
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/datacarrier/SampleData.java → apm-commons/apm-datacarrier/src/test/java/org/skywalking/apm/commons/datacarrier/SampleData.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier;
package org.skywalking.apm.commons.datacarrier;
/**
* Created by wusheng on 2016/10/25.

6
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/datacarrier/common/AtomicRangeIntegerTest.java → apm-commons/apm-datacarrier/src/test/java/org/skywalking/apm/commons/datacarrier/common/AtomicRangeIntegerTest.java
View File

@ -1,10 +1,12 @@
package org.skywalking.apm.agent.core.datacarrier.common;
package org.skywalking.apm.commons.datacarrier.common;
import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.*;
/**
* Created by wusheng on 2016/10/25.
* Created by xin on 2017/7/14.
*/
public class AtomicRangeIntegerTest {
@Test

10
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/datacarrier/consumer/ConsumerPoolTest.java → apm-commons/apm-datacarrier/src/test/java/org/skywalking/apm/commons/datacarrier/consumer/ConsumerPoolTest.java
View File

@ -1,12 +1,12 @@
package org.skywalking.apm.agent.core.datacarrier.consumer;
package org.skywalking.apm.commons.datacarrier.consumer;
import org.junit.Assert;
import org.junit.Test;
import org.powermock.api.support.membermodification.MemberModifier;
import org.skywalking.apm.agent.core.datacarrier.SampleData;
import org.skywalking.apm.agent.core.datacarrier.buffer.BufferStrategy;
import org.skywalking.apm.agent.core.datacarrier.buffer.Channels;
import org.skywalking.apm.agent.core.datacarrier.partition.SimpleRollingPartitioner;
import org.skywalking.apm.commons.datacarrier.SampleData;
import org.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
import org.skywalking.apm.commons.datacarrier.buffer.Channels;
import org.skywalking.apm.commons.datacarrier.partition.SimpleRollingPartitioner;
/**
* Created by wusheng on 2016/10/26.

6
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/datacarrier/consumer/ConsumerTest.java → apm-commons/apm-datacarrier/src/test/java/org/skywalking/apm/commons/datacarrier/consumer/ConsumerTest.java
View File

@ -1,4 +1,4 @@
package org.skywalking.apm.agent.core.datacarrier.consumer;
package org.skywalking.apm.commons.datacarrier.consumer;
import java.util.ArrayList;
import java.util.HashSet;
@ -7,8 +7,8 @@ import java.util.concurrent.LinkedBlockingQueue;
import org.junit.Assert;
import org.junit.Test;
import org.powermock.api.support.membermodification.MemberModifier;
import org.skywalking.apm.agent.core.datacarrier.DataCarrier;
import org.skywalking.apm.agent.core.datacarrier.SampleData;
import org.skywalking.apm.commons.datacarrier.DataCarrier;
import org.skywalking.apm.commons.datacarrier.SampleData;
/**
* Created by wusheng on 2016/10/26.

5
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/datacarrier/consumer/SampleConsumer.java → apm-commons/apm-datacarrier/src/test/java/org/skywalking/apm/commons/datacarrier/consumer/SampleConsumer.java
View File

@ -1,8 +1,7 @@
package org.skywalking.apm.agent.core.datacarrier.consumer;
package org.skywalking.apm.commons.datacarrier.consumer;
import java.util.List;
import org.skywalking.apm.agent.core.datacarrier.SampleData;
import org.skywalking.apm.commons.datacarrier.SampleData;
/**
* Created by wusheng on 2016/10/26.

6
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/datacarrier/partition/ProducerThreadPartitionerTest.java → apm-commons/apm-datacarrier/src/test/java/org/skywalking/apm/commons/datacarrier/partition/ProducerThreadPartitionerTest.java
View File

@ -1,15 +1,15 @@
package org.skywalking.apm.agent.core.datacarrier.partition;
package org.skywalking.apm.commons.datacarrier.partition;
import org.junit.Assert;
import org.junit.Test;
import org.skywalking.apm.agent.core.datacarrier.SampleData;
import org.skywalking.apm.commons.datacarrier.SampleData;
/**
* Created by wusheng on 2016/10/25.
*/
public class ProducerThreadPartitionerTest {
@Test
public void testPartition(){
public void testPartition() {
int partitionNum = (int)Thread.currentThread().getId() % 10;
ProducerThreadPartitioner<SampleData> partitioner = new ProducerThreadPartitioner<SampleData>();
Assert.assertEquals(partitioner.partition(10, new SampleData()), partitionNum);

4
apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/datacarrier/partition/SimpleRollingPartitionerTest.java → apm-commons/apm-datacarrier/src/test/java/org/skywalking/apm/commons/datacarrier/partition/SimpleRollingPartitionerTest.java
View File

@ -1,8 +1,8 @@
package org.skywalking.apm.agent.core.datacarrier.partition;
package org.skywalking.apm.commons.datacarrier.partition;
import org.junit.Assert;
import org.junit.Test;
import org.skywalking.apm.agent.core.datacarrier.SampleData;
import org.skywalking.apm.commons.datacarrier.SampleData;
/**
* Created by wusheng on 2016/10/25.

31
apm-commons/apm-logging-log4j2/pom.xml
View File

@ -1,31 +0,0 @@
<?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>apm-commons</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-logging-log4j2</artifactId>
<dependencies>
<dependency>
<groupId>org.skywalking</groupId>
<artifactId>apm-logging-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.8</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.8</version>
</dependency>
</dependencies>
</project>

76
apm-commons/apm-logging-log4j2/src/main/java/org/skywalking/apm/logging/log4j2/Log4j2Logger.java
View File

@ -1,76 +0,0 @@
package org.skywalking.apm.logging.log4j2;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.skywalking.apm.logging.ILog;
/**
* @author wusheng
*/
public class Log4j2Logger implements ILog {
private Logger delegateLogger;
Log4j2Logger(Class<?> targetClass) {
delegateLogger = LogManager.getFormatterLogger(targetClass);
}
@Override
public void info(String format) {
delegateLogger.info(format);
}
@Override
public void info(String format, Object... arguments) {
delegateLogger.info(format, arguments);
}
@Override
public void warn(String format, Object... arguments) {
delegateLogger.warn(format, arguments);
}
@Override
public void error(String format, Throwable e) {
delegateLogger.error(format, e);
}
@Override
public void error(Throwable e, String format, Object... arguments) {
delegateLogger.error(format, e, arguments);
}
@Override
public boolean isDebugEnable() {
return delegateLogger.isDebugEnabled();
}
@Override
public boolean isInfoEnable() {
return delegateLogger.isInfoEnabled();
}
@Override
public boolean isWarnEnable() {
return delegateLogger.isWarnEnabled();
}
@Override
public boolean isErrorEnable() {
return delegateLogger.isErrorEnabled();
}
@Override
public void debug(String format) {
delegateLogger.debug(format);
}
@Override
public void debug(String format, Object... arguments) {
delegateLogger.debug(format, arguments);
}
@Override
public void error(String format) {
delegateLogger.error(format);
}
}

16
apm-commons/apm-logging-log4j2/src/main/java/org/skywalking/apm/logging/log4j2/Log4j2Resolver.java
View File

@ -1,16 +0,0 @@
package org.skywalking.apm.logging.log4j2;
import org.skywalking.apm.logging.ILog;
import org.skywalking.apm.logging.LogResolver;
/**
* The <code>LogResolver</code> is an implementation of {@link LogResolver},
*
* @author wusheng
*/
public class Log4j2Resolver implements LogResolver {
@Override
public ILog getLogger(Class<?> clazz) {
return new Log4j2Logger(clazz);
}
}

2
apm-commons/pom.xml
View File

@ -13,7 +13,7 @@
<modules>
<module>apm-util</module>
<module>apm-logging-api</module>
<module>apm-logging-log4j2</module>
<module>apm-datacarrier</module>
</modules>
<name>apm-commons</name>

5
apm-sniffer/apm-agent-core/pom.xml
View File

@ -95,6 +95,11 @@
</exclusions>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.skywalking</groupId>
<artifactId>apm-datacarrier</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>
<extensions>

6
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
View File

@ -8,9 +8,9 @@ import org.skywalking.apm.agent.core.boot.ServiceManager;
import org.skywalking.apm.agent.core.context.TracingContext;
import org.skywalking.apm.agent.core.context.TracingContextListener;
import org.skywalking.apm.agent.core.context.trace.TraceSegment;
import org.skywalking.apm.agent.core.datacarrier.DataCarrier;
import org.skywalking.apm.agent.core.datacarrier.buffer.BufferStrategy;
import org.skywalking.apm.agent.core.datacarrier.consumer.IConsumer;
import org.skywalking.apm.commons.datacarrier.DataCarrier;
import org.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
import org.skywalking.apm.commons.datacarrier.consumer.IConsumer;
import org.skywalking.apm.logging.ILog;
import org.skywalking.apm.logging.LogManager;
import org.skywalking.apm.network.proto.Downstream;