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

Rename ServiceStarter to ServiceManager. 

Finish the major codes of TraceSegmentProcessQueue and CollectorClientService.
This commit is contained in:
wusheng 2017-03-14 16:55:14 +08:00
parent 413f207ec7
commit 82ccb8dc23
17 changed files with 133 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java
View File

@ -1,7 +1,7 @@
package com.a.eye.skywalking.agent;
import com.a.eye.skywalking.agent.junction.SkyWalkingEnhanceMatcher;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.conf.Config;
import com.a.eye.skywalking.api.conf.SnifferConfigInitializer;
import com.a.eye.skywalking.api.logging.EasyLogResolver;
@ -54,7 +54,7 @@ public class SkyWalkingAgent {
final PluginFinder pluginFinder = new PluginFinder(new PluginBootstrap().loadPlugins());
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
new AgentBuilder.Default().type(enhanceClassMatcher(pluginFinder).and(not(isInterface()))).transform(new AgentBuilder.Transformer() {
public DynamicType.Builder<?> transform(DynamicType.Builder<?> builder, TypeDescription typeDescription, ClassLoader classLoader) {

6
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceStarter.java → skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java
View File

@ -8,12 +8,12 @@ import java.util.Map;
import java.util.ServiceLoader;
/**
* The <code>ServiceStarter</code> bases on {@link ServiceLoader},
* The <code>ServiceManager</code> bases on {@link ServiceLoader},
* load all {@link BootService} implementations.
*
* @author wusheng
*/
public enum ServiceStarter {
public enum ServiceManager {
INSTANCE;
private static ILog logger = LogManager.getLogger(StatusBootService.class);
@ -31,7 +31,7 @@ public enum ServiceStarter {
bootService.bootUp();
bootedServices.put(bootService.getClass(), bootService);
} catch (Exception e) {
logger.error(e, "ServiceStarter try to start [{}] fail.", bootService.getClass().getName());
logger.error(e, "ServiceManager try to start [{}] fail.", bootService.getClass().getName());
}
}
} finally {

51
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClientService.java
View File

@ -1,13 +1,62 @@
package com.a.eye.skywalking.api.client;
import com.a.eye.skywalking.api.boot.BootService;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.queue.TraceSegmentProcessQueue;
import com.a.eye.skywalking.logging.ILog;
import com.a.eye.skywalking.logging.LogManager;
import com.a.eye.skywalking.trace.TraceSegment;
import java.util.List;
/**
* @author wusheng
*/
public class CollectorClientService implements BootService {
public class CollectorClientService implements Runnable, BootService {
private static ILog logger = LogManager.getLogger(CollectorClientService.class);
private static long NO_DATA_SLEEP_TIME_MILLIS = 500;
/**
* Start a new {@link Thread} to get finished {@link TraceSegment} by {@link TraceSegmentProcessQueue#getCachedTraceSegments()}
*/
@Override
public void bootUp() {
Thread collectorClientThread = new Thread(this, "collectorClientThread");
collectorClientThread.start();
}
@Override
public void run() {
while (true) {
try {
TraceSegmentProcessQueue segmentProcessQueue = ServiceManager.INSTANCE.findService(TraceSegmentProcessQueue.class);
List<TraceSegment> cachedTraceSegments = segmentProcessQueue.getCachedTraceSegments();
if (cachedTraceSegments.size() > 0) {
for (TraceSegment segment : cachedTraceSegments) {
//TODO: wusheng
//send data
}
/**
* No sleep, when exist finished {@link TraceSegment}.
*/
} else {
try2Sleep(NO_DATA_SLEEP_TIME_MILLIS);
}
} catch (Throwable t) {
logger.error(t, "Send trace segments to collector failure.");
}
}
}
/**
* Try to sleep, and ignore the {@link InterruptedException}
*
* @param millis the length of time to sleep in milliseconds
*/
private void try2Sleep(long millis) {
try {
Thread.sleep(millis);
} catch (InterruptedException e) {
}
}
}

2
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java
View File

@ -16,7 +16,7 @@ public class Config {
}
public static class Disruptor{
public static int BUFFER_SIZE = 1024 * 4;
public static int BUFFER_SIZE = 512;
}

4
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java
View File

@ -19,6 +19,10 @@ public final class TraceSegmentHolder {
this.value = value;
}
public void clear(){
this.value = null;
}
public enum Factory implements EventFactory<TraceSegmentHolder> {
INSTANCE;

54
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java
View File

@ -4,10 +4,15 @@ import com.a.eye.skywalking.api.boot.StatusBootService;
import com.a.eye.skywalking.api.conf.Config;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.api.context.TracerContextListener;
import com.a.eye.skywalking.logging.ILog;
import com.a.eye.skywalking.logging.LogManager;
import com.a.eye.skywalking.trace.TraceSegment;
import com.lmax.disruptor.EventHandler;
import com.lmax.disruptor.RingBuffer;
import com.lmax.disruptor.dsl.Disruptor;
import com.lmax.disruptor.util.DaemonThreadFactory;
import java.util.LinkedList;
import java.util.List;
/**
* {@link TraceSegmentProcessQueue} is a proxy of {@link Disruptor}, High Performance Inter-Thread MQ.
@ -16,12 +21,19 @@ import com.lmax.disruptor.util.DaemonThreadFactory;
*
* Created by wusheng on 2017/2/17.
*/
public class TraceSegmentProcessQueue extends StatusBootService implements TracerContextListener {
public class TraceSegmentProcessQueue extends StatusBootService implements TracerContextListener, EventHandler<TraceSegmentHolder> {
private static ILog logger = LogManager.getLogger(TraceSegmentProcessQueue.class);
private Disruptor<TraceSegmentHolder> disruptor;
private RingBuffer<TraceSegmentHolder> buffer;
private TraceSegment[] secondLevelCache;
private volatile int cacheIndex;
public TraceSegmentProcessQueue() {
disruptor = new Disruptor<>(TraceSegmentHolder.Factory.INSTANCE, Config.Disruptor.BUFFER_SIZE, DaemonThreadFactory.INSTANCE);
secondLevelCache = new TraceSegment[Config.Disruptor.BUFFER_SIZE];
cacheIndex = 0;
disruptor.handleEventsWith(this);
buffer = disruptor.getRingBuffer();
}
@ -33,7 +45,7 @@ public class TraceSegmentProcessQueue extends StatusBootService implements Trace
@Override
public void afterFinished(TraceSegment traceSegment) {
if(isStarted()) {
if (isStarted()) {
long sequence = this.buffer.next(); // Grab the next sequence
try {
TraceSegmentHolder data = this.buffer.get(sequence);
@ -43,4 +55,42 @@ public class TraceSegmentProcessQueue extends StatusBootService implements Trace
}
}
}
@Override
public void onEvent(TraceSegmentHolder event, long sequence, boolean endOfBatch) throws Exception {
TraceSegment traceSegment = event.getValue();
try {
if (secondLevelCache[cacheIndex] == null) {
secondLevelCache[cacheIndex] = traceSegment;
}else{
/**
* If your application has very high throughput(also called tps/qps),
* this log message will be output in very high frequency.
* And this is not suppose to happen. Disable log.warn or expend {@link Config.Disruptor.BUFFER_SIZE}
*/
logger.warn("TraceSegmentProcessQueue has data conflict. Discard the new TraceSegment.");
}
/**
* increase the {@link #cacheIndex}, if it is out of range, reset it.
*/
cacheIndex++;
if (cacheIndex == secondLevelCache.length) {
cacheIndex = 0;
}
} finally {
event.clear();
}
}
public List<TraceSegment> getCachedTraceSegments(){
List<TraceSegment> segmentList = new LinkedList<>();
for (int i = 0; i < secondLevelCache.length; i++) {
TraceSegment segment = secondLevelCache[i];
if(segment != null){
segmentList.add(segment);
secondLevelCache[i] = null;
}
}
return segmentList;
}
}

1
skywalking-sniffer/skywalking-api/src/main/resources/META-INF/services/com.a.eye.skywalking.api.boot.BootService
View File

@ -1,2 +1,3 @@
com.a.eye.skywalking.api.queue.TraceSegmentProcessQueue
com.a.eye.skywalking.api.context.ContextManager
com.a.eye.skywalking.api.client.CollectorClientService

4
skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptorTest.java
View File

@ -1,6 +1,6 @@
package com.a.eye.skywalking.plugin.dubbo;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext;
import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
@ -60,7 +60,7 @@ public class DubboInterceptorTest {
@Before
public void setUp() throws Exception {
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
dubboInterceptor = new DubboInterceptor();
testParam = new RequestParamForTestBelow283();

4
skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java
View File

@ -1,6 +1,6 @@
package com.a.eye.skywalking.plugin.httpClient.v4;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext;
import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
@ -58,7 +58,7 @@ public class HttpClientExecuteInterceptorTest {
public void setUp() throws Exception {
mockTracerContextListener = new MockTracerContextListener();
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
httpClientExecuteInterceptor = new HttpClientExecuteInterceptor();
PowerMockito.mock(HttpHost.class);

6
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatementTest.java
View File

@ -1,13 +1,11 @@
package com.a.eye.skywalking.plugin.jdbc;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener;
import com.a.eye.skywalking.sniffer.mock.context.SegmentAssert;
import com.a.eye.skywalking.trace.LogData;
import com.a.eye.skywalking.trace.Span;
import com.a.eye.skywalking.trace.TraceSegment;
import com.a.eye.skywalking.trace.tag.Tags;
import com.mysql.cj.api.jdbc.JdbcConnection;
import org.hamcrest.CoreMatchers;
@ -90,7 +88,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
@Before
public void setUp() throws Exception {
mockTracerContextListener = new MockTracerContextListener();
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
swConnection = new SWConnection("jdbc:mysql://127.0.0.1:3306/test", new Properties(), jdbcConnection);
multiHostConnection = new SWConnection("jdbc:mysql://127.0.0.1:3306,127.0.0.1:3309/test", new Properties(), jdbcConnection);

4
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWConnectionTest.java
View File

@ -1,6 +1,6 @@
package com.a.eye.skywalking.plugin.jdbc;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener;
import com.a.eye.skywalking.sniffer.mock.context.SegmentAssert;
@ -47,7 +47,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Before
public void setUp() throws Exception {
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
mockTracerContextListener = new MockTracerContextListener();
swConnection = new SWConnection("jdbc:mysql://127.0.0.1:3306/test", new Properties(), jdbcConnection);
multiHostConnection = new SWConnection("jdbc:mysql://127.0.0.1:3306,127.0.0.1:3309/test", new Properties(), jdbcConnection);

6
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWStatementTest.java
View File

@ -1,13 +1,11 @@
package com.a.eye.skywalking.plugin.jdbc;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener;
import com.a.eye.skywalking.sniffer.mock.context.SegmentAssert;
import com.a.eye.skywalking.trace.LogData;
import com.a.eye.skywalking.trace.Span;
import com.a.eye.skywalking.trace.TraceSegment;
import com.a.eye.skywalking.trace.tag.Tags;
import com.mysql.cj.api.jdbc.JdbcConnection;
import org.hamcrest.CoreMatchers;
@ -50,7 +48,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void setUp() throws Exception {
mockTracerContextListener = new MockTracerContextListener();
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
swConnection = new SWConnection("jdbc:mysql://127.0.0.1:3306/test", new Properties(), jdbcConnection);
multiHostConnection = new SWConnection("jdbc:mysql://127.0.0.1:3306,127.0.0.1:3309/test", new Properties(), jdbcConnection);

6
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SwPreparedStatementTest.java
View File

@ -1,13 +1,11 @@
package com.a.eye.skywalking.plugin.jdbc;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener;
import com.a.eye.skywalking.sniffer.mock.context.SegmentAssert;
import com.a.eye.skywalking.trace.LogData;
import com.a.eye.skywalking.trace.Span;
import com.a.eye.skywalking.trace.TraceSegment;
import com.a.eye.skywalking.trace.tag.Tags;
import com.mysql.cj.api.jdbc.JdbcConnection;
import org.hamcrest.CoreMatchers;
@ -91,7 +89,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void setUp() throws Exception {
mockTracerContextListener = new MockTracerContextListener();
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
swConnection = new SWConnection("jdbc:mysql://127.0.0.1:3306/test", new Properties(), jdbcConnection);
multiHostConnection = new SWConnection("jdbc:mysql://127.0.0.1:3306,127.0.0.1:3309/test", new Properties(), jdbcConnection);

7
skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptorTest.java
View File

@ -1,6 +1,6 @@
package com.a.eye.skywalking.plugin.jedis.v2;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext;
import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
@ -20,8 +20,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import java.sql.SQLException;
import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.KEY_OF_REDIS_HOST;
import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.KEY_OF_REDIS_HOSTS;
import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.KEY_OF_REDIS_PORT;
@ -30,7 +28,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
@RunWith(MockitoJUnitRunner.class)
@ -47,7 +44,7 @@ public class JedisMethodInterceptorTest {
@Before
public void setUp() throws Exception {
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
interceptor = new JedisMethodInterceptor();
mockTracerContextListener = new MockTracerContextListener();

5
skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptorTest.java
View File

@ -1,10 +1,9 @@
package com.a.eye.skywalking.plugin.motan;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext;
import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
import com.a.eye.skywalking.plugin.motan.define.MotanConsumerInstrumentation;
import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener;
import com.a.eye.skywalking.sniffer.mock.context.SegmentAssert;
import com.a.eye.skywalking.trace.LogData;
@ -52,7 +51,7 @@ public class MotanConsumerInterceptorTest {
@Before
public void setUp() {
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
contextListener = new MockTracerContextListener();
invokeInterceptor = new MotanConsumerInterceptor();

4
skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptorTest.java
View File

@ -1,6 +1,6 @@
package com.a.eye.skywalking.plugin.tomcat78x;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.api.context.TracerContext;
import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext;
import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodInvokeContext;
@ -50,7 +50,7 @@ public class TomcatInterceptorTest {
@Before
public void setUp() throws Exception {
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
tomcatInterceptor = new TomcatInterceptor();
contextListener = new MockTracerContextListener();

4
skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java
View File

@ -1,6 +1,6 @@
package com.a.eye.skywalking.sniffer.mock;
import com.a.eye.skywalking.api.boot.ServiceStarter;
import com.a.eye.skywalking.api.boot.ServiceManager;
import com.a.eye.skywalking.sniffer.mock.context.MockTracerContextListener;
import com.a.eye.skywalking.sniffer.mock.context.SegmentAssert;
import com.a.eye.skywalking.sniffer.mock.trace.TraceSegmentBuilderFactory;
@ -15,7 +15,7 @@ import org.junit.Test;
public class MockTracerContextListenerTestCase {
@BeforeClass
public static void setup(){
ServiceStarter.INSTANCE.boot();
ServiceManager.INSTANCE.boot();
}
@Test