From 1fe6579258f92e2b21bd5106ba02195934ddcbbd Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 30 Nov 2016 21:50:31 +0800 Subject: [PATCH] 1. remove data-carrier. 2.restore test case. 3. ready to suppor multi-constructor enhance. --- skywalking-alarm/pom.xml | 5 ----- .../enhance/ClassEnhancePluginDefine.java | 4 +++- .../src/test/java/StorageClient.java | 4 ++-- .../src/test/java/StorageThread.java | 13 ++++++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/skywalking-alarm/pom.xml b/skywalking-alarm/pom.xml index 956e0ac02..716f1f7ce 100644 --- a/skywalking-alarm/pom.xml +++ b/skywalking-alarm/pom.xml @@ -71,11 +71,6 @@ HikariCP 2.4.3 - - com.a.eye - data-carrier - 1.0 - diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index 500c69d5c..a52493b35 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -68,7 +68,9 @@ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePlugi constructorInterceptor = "com.a.eye.skywalking.plugin.interceptor.assist.DefaultConstructorInterceptor"; } - newClassBuilder = newClassBuilder.defineField(contextAttrName, EnhancedClassInstanceContext.class, ACC_PRIVATE).constructor(any()).intercept(SuperMethodCall.INSTANCE + newClassBuilder = newClassBuilder.defineField(contextAttrName, EnhancedClassInstanceContext.class, ACC_PRIVATE); + + newClassBuilder = newClassBuilder.constructor(any()).intercept(SuperMethodCall.INSTANCE .andThen(MethodDelegation.to(new ClassConstructorInterceptor(constructorInterceptor)).appendParameterBinder(FieldProxy.Binder.install(FieldGetter.class, FieldSetter.class)))); if(existedMethodsInterceptPoints) { diff --git a/skywalking-storage-center/skywalking-storage/src/test/java/StorageClient.java b/skywalking-storage-center/skywalking-storage/src/test/java/StorageClient.java index c09ac5c8a..9374bac48 100644 --- a/skywalking-storage-center/skywalking-storage/src/test/java/StorageClient.java +++ b/skywalking-storage-center/skywalking-storage/src/test/java/StorageClient.java @@ -2,8 +2,8 @@ import java.util.concurrent.CountDownLatch; public class StorageClient { - private static int THREAD_COUNT = 1; - private static final long COUNT = 1; + private static int THREAD_COUNT = 4; + private static final long COUNT = 1_000_000_000; public static void main(String[] args) throws InterruptedException { diff --git a/skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java b/skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java index cfe134541..8eed09bc9 100644 --- a/skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java +++ b/skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java @@ -23,7 +23,7 @@ public class StorageThread extends Thread { StorageThread(long count, CountDownLatch countDownLatch, int index) { listener = new MyStorageClientListener(); - client = new Client("127.0.0.1", 23000).newSpanStorageClient(listener); + client = new Client("10.128.7.241", 34000).newSpanStorageClient(listener); this.count = count; this.countDownLatch = countDownLatch; this.index = index; @@ -40,22 +40,25 @@ public class StorageThread extends Thread { RequestSpan requestSpan = RequestSpan.newBuilder().setSpanType(1).setAddress(NetUtils.getLocalAddress().toString()).setApplicationId("1").setCallType("1").setLevelId(0) .setProcessNo(19287).setStartDate(System.currentTimeMillis()) .setTraceId(TraceId.newBuilder().addSegments(201611).addSegments(value).addSegments(8504828).addSegments(2277).addSegments(53).addSegments(3).build()) - .setUserId("1").setViewPointId("http://localhost:8080/wwww/test/helloWorld").build(); + .setUserId("1").setViewPointId("http://localhost:8080/wwww/test/helloWorld").setRouteKey(i).build(); AckSpan ackSpan = AckSpan.newBuilder().setLevelId(0).setCost(10).setTraceId( TraceId.newBuilder().addSegments(201611).addSegments(value).addSegments(8504828).addSegments(2277).addSegments(53).addSegments(3) - .build()).setStatusCode(0).setViewpointId("http://localhost:8080/wwww/test/helloWorld").build(); + .build()).setStatusCode(0).setViewpointId("http://localhost:8080/wwww/test/helloWorld").setRouteKey(i).build(); requestSpanList.add(requestSpan); ackSpanList.add(ackSpan); cycle++; - if (cycle == 1) { + if (cycle == 10) { client.sendACKSpan(ackSpanList); client.sendRequestSpan(requestSpanList); cycle = 0; while (!listener.isCompleted) { - LockSupport.parkNanos(1); + try { + Thread.sleep(1L); + } catch (InterruptedException e) { + } } listener.begin(); ackSpanList.clear();