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

fix client batch send performance issue, and test case performance issue.

This commit is contained in:
wusheng 2016-11-23 21:19:47 +08:00
parent 34f6bb9d46
commit aabb247443
3 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skywalking-network/src/main/java/com/a/eye/skywalking/network/Client.java
View File

@ -17,7 +17,7 @@ public class Client {
}
public SpanStorageClient newSpanStorageConsumer() {
public SpanStorageClient newSpanStorageClient() {
return new SpanStorageClient(spanStorageStub);
}

28
skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/client/SpanStorageClient.java
View File

@ -16,7 +16,7 @@ public class SpanStorageClient {
this.spanStorageStub = spanStorageStub;
}
public void consumeRequestSpan(RequestSpan... requestSpan) {
public void sendRequestSpan(RequestSpan... requestSpan) {
StreamObserver<RequestSpan> requestSpanStreamObserver =
spanStorageStub.storageRequestSpan(new StreamObserver<SendResult>() {
@Override
@ -36,19 +36,19 @@ public class SpanStorageClient {
for (RequestSpan span : requestSpan) {
requestSpanStreamObserver.onNext(span);
while (!((CallStreamObserver<RequestSpan>) requestSpanStreamObserver).isReady()) {
try {
Thread.currentThread().sleep(1);
} catch (InterruptedException e) {
throw new ConsumeSpanDataFailedException(e);
}
}
while (!((CallStreamObserver<RequestSpan>) requestSpanStreamObserver).isReady()) {
try {
Thread.currentThread().sleep(1);
} catch (InterruptedException e) {
throw new ConsumeSpanDataFailedException(e);
}
}
requestSpanStreamObserver.onCompleted();
}
public void consumeACKSpan(AckSpan... ackSpan) {
public void sendACKSpan(AckSpan... ackSpan) {
StreamObserver<AckSpan> ackSpanStreamObserver =
spanStorageStub.storageACKSpan(new StreamObserver<SendResult>() {
@Override
@ -68,12 +68,12 @@ public class SpanStorageClient {
for (AckSpan span : ackSpan) {
ackSpanStreamObserver.onNext(span);
while (!((CallStreamObserver<AckSpan>) ackSpanStreamObserver).isReady()) {
try {
Thread.currentThread().sleep(1);
} catch (InterruptedException e) {
throw new ConsumeSpanDataFailedException(e);
}
}
while (!((CallStreamObserver<AckSpan>) ackSpanStreamObserver).isReady()) {
try {
Thread.currentThread().sleep(1);
} catch (InterruptedException e) {
throw new ConsumeSpanDataFailedException(e);
}
}

40
skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java
View File

@ -5,42 +5,50 @@ import com.a.eye.skywalking.network.grpc.TraceId;
import com.a.eye.skywalking.network.grpc.client.SpanStorageClient;
import com.a.eye.skywalking.storage.util.NetUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
public class StorageThread extends Thread {
private SpanStorageClient consumer;
private SpanStorageClient client;
private long count;
private CountDownLatch countDownLatch;
StorageThread(long count, CountDownLatch countDownLatch) {
consumer = new Client("10.128.7.241", 34000).newSpanStorageConsumer();
client = new Client("10.128.7.241", 34000).newSpanStorageClient();
this.count = count;
this.countDownLatch = countDownLatch;
}
@Override
public void run() {
RequestSpan[] requestSpanList = new RequestSpan[10];
AckSpan[] ackSpanList = new AckSpan[10];
int cycle = 0;
for (int i = 0; i < count; i++) {
long value = System.currentTimeMillis();
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();
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();
AckSpan ackSpan = AckSpan.newBuilder().setLevelId(0).setCost(10).setTraceId(
TraceId.newBuilder().addSegments(201611).addSegments(value).addSegments(8504828).addSegments(2277)
.addSegments(Thread.currentThread().getId()).addSegments(3).build()).setStatusCode(0)
.setViewpointId("http://localhost:8080/wwww/test/helloWorld").build();
TraceId.newBuilder().addSegments(201611).addSegments(value).addSegments(8504828).addSegments(2277).addSegments(Thread.currentThread().getId()).addSegments(3)
.build()).setStatusCode(0).setViewpointId("http://localhost:8080/wwww/test/helloWorld").build();
if (cycle == 10) {
client.sendACKSpan(ackSpanList);
client.sendRequestSpan(requestSpanList);
cycle = 0;
} else {
requestSpanList[cycle] = requestSpan;
ackSpanList[cycle] = ackSpan;
cycle++;
}
consumer.consumeACKSpan(ackSpan);
consumer.consumeRequestSpan(requestSpan);
if (i % 1_000 == 0) {
if (i % 10_000 == 0) {
System.out.println(i + " " + value);
}
}