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

1. add TraceSearchClient to support sync and async search. 2.adjust SpanStorageServer and AsyncTraceSearchServer to process onError on server side.

This commit is contained in:
wusheng 2016-12-03 18:30:49 +08:00
parent b73e0366d1
commit 2f057f8bef
9 changed files with 83 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
public class Client {
private ManagedChannel channel;
private ManagedChannel channel;
public Client(String ip, int address) {
channel = ManagedChannelBuilder.forAddress(ip, address).usePlaintext(true).build();
@ -17,16 +17,15 @@ public class Client {
return new SpanStorageClient(channel, listener);
}
public TraceSearchClient newTraceSearchClient(StorageClientListener listener){
return new TraceSearchClient(channel, listener);
public TraceSearchClient newTraceSearchClient() {
return new TraceSearchClient(channel);
}
public void shutdown(){
public void shutdown() {
channel.shutdownNow();
}
public boolean isShutdown(){
public boolean isShutdown() {
return channel.isShutdown() || channel.isTerminated();
}
}

41
skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/client/TraceSearchClient.java
View File

@ -1,18 +1,49 @@
package com.a.eye.skywalking.network.grpc.client;
import com.a.eye.skywalking.network.grpc.AsyncTraceSearchServiceGrpc;
import com.a.eye.skywalking.network.grpc.QueryTask;
import com.a.eye.skywalking.network.grpc.SearchResult;
import com.a.eye.skywalking.network.grpc.TraceSearchServiceGrpc;
import com.a.eye.skywalking.network.listener.client.StorageClientListener;
import com.a.eye.skywalking.network.listener.client.SearchClientListener;
import io.grpc.ManagedChannel;
import io.grpc.stub.StreamObserver;
/**
* Created by wusheng on 2016/11/26.
*/
public class TraceSearchClient {
private final AsyncTraceSearchServiceGrpc.AsyncTraceSearchServiceStub traceSearchServiceStub;
private final TraceSearchServiceGrpc.TraceSearchServiceBlockingStub traceSearchServiceBlockingStub;
private final TraceSearchServiceGrpc.TraceSearchServiceStub traceSearchServiceStub;
public TraceSearchClient(ManagedChannel channel, StorageClientListener listener) {
this.traceSearchServiceStub = TraceSearchServiceGrpc.newStub(channel);
public TraceSearchClient(ManagedChannel channel) {
this.traceSearchServiceStub = AsyncTraceSearchServiceGrpc.newStub(channel);
this.traceSearchServiceBlockingStub = TraceSearchServiceGrpc.newBlockingStub(channel);
}
public void search(QueryTask queryTask, final SearchClientListener listener){
StreamObserver<SearchResult> serverStreamObserver = new StreamObserver<SearchResult>() {
@Override
public void onNext(SearchResult searchResult) {
listener.onReturn(searchResult);
}
@Override
public void onError(Throwable throwable) {
listener.onError(throwable);
}
@Override
public void onCompleted() {
listener.onFinished();
}
};
StreamObserver<QueryTask> searchResult = traceSearchServiceStub.search(serverStreamObserver);
searchResult.onNext(queryTask);
searchResult.onCompleted();
}
public SearchResult search(QueryTask queryTask){
return traceSearchServiceBlockingStub.search(queryTask);
}
}

17
skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/server/AsyncTraceSearchServer.java
View File

@ -4,7 +4,7 @@ import com.a.eye.skywalking.network.grpc.AsyncTraceSearchServiceGrpc;
import com.a.eye.skywalking.network.grpc.QueryTask;
import com.a.eye.skywalking.network.grpc.SearchResult;
import com.a.eye.skywalking.network.grpc.Span;
import com.a.eye.skywalking.network.listener.server.AsyncTraceSearchServerListener;
import com.a.eye.skywalking.network.listener.server.TraceSearchListener;
import io.grpc.stub.StreamObserver;
import java.util.List;
@ -14,9 +14,9 @@ import java.util.List;
*/
public class AsyncTraceSearchServer extends AsyncTraceSearchServiceGrpc.AsyncTraceSearchServiceImplBase {
private AsyncTraceSearchServerListener searchListener;
private TraceSearchListener searchListener;
public AsyncTraceSearchServer(AsyncTraceSearchServerListener searchListener) {
public AsyncTraceSearchServer(TraceSearchListener searchListener) {
this.searchListener = searchListener;
}
@ -34,11 +34,20 @@ public class AsyncTraceSearchServer extends AsyncTraceSearchServiceGrpc.AsyncTra
@Override
public void onError(Throwable t) {
SearchResult.Builder builder = SearchResult.newBuilder();
builder = builder.setTaskId(taskId);
responseObserver.onNext(builder.build());
responseObserver.onCompleted();
}
@Override
public void onCompleted() {
responseObserver.onNext(SearchResult.newBuilder().addAllSpans(spans).setTaskId(taskId).build());
SearchResult.Builder builder = SearchResult.newBuilder();
if(spans != null) {
builder = builder.addAllSpans(spans);
}
builder = builder.setTaskId(taskId);
responseObserver.onNext(builder.build());
responseObserver.onCompleted();
}
};

5
skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/server/SpanStorageServer.java
View File

@ -10,6 +10,7 @@ import io.grpc.stub.StreamObserver;
public class SpanStorageServer extends SpanStorageServiceGrpc.SpanStorageServiceImplBase {
private SpanStorageServerListener listener;
public SpanStorageServer(SpanStorageServerListener listener) {
this.listener = listener;
}
@ -24,6 +25,8 @@ public class SpanStorageServer extends SpanStorageServiceGrpc.SpanStorageService
@Override
public void onError(Throwable t) {
responseObserver.onNext(SendResult.newBuilder().setResult(false).build());
responseObserver.onCompleted();
}
@Override
@ -45,6 +48,8 @@ public class SpanStorageServer extends SpanStorageServiceGrpc.SpanStorageService
@Override
public void onError(Throwable t) {
responseObserver.onNext(SendResult.newBuilder().setResult(false).build());
responseObserver.onCompleted();
}
@Override

14
skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/server/TraceSearchServer.java
View File

@ -1,11 +1,11 @@
package com.a.eye.skywalking.network.grpc.server;
import com.a.eye.skywalking.network.grpc.SearchResult;
import com.a.eye.skywalking.network.grpc.TraceId;
import com.a.eye.skywalking.network.grpc.TraceSearchServiceGrpc;
import com.a.eye.skywalking.network.grpc.*;
import com.a.eye.skywalking.network.listener.server.TraceSearchListener;
import io.grpc.stub.StreamObserver;
import java.util.List;
/**
* Created by xin on 2016/11/12.
*/
@ -18,10 +18,10 @@ public class TraceSearchServer extends TraceSearchServiceGrpc.TraceSearchService
}
@Override
public void search(TraceId request, StreamObserver<SearchResult> responseObserver) {
// List<Span> spans = traceSearchListener.search(request.getTraceid());
// responseObserver.onNext(SearchResult.newBuilder().addAllSpans(spans).build());
// responseObserver.onCompleted();
public void search(QueryTask request, StreamObserver<SearchResult> responseObserver) {
List<Span> spans = traceSearchListener.search(request.getTraceId());
responseObserver.onNext(SearchResult.newBuilder().addAllSpans(spans).build());
responseObserver.onCompleted();
}
}

14
skywalking-network/src/main/java/com/a/eye/skywalking/network/listener/client/SearchClientListener.java Normal file
View File

@ -0,0 +1,14 @@
package com.a.eye.skywalking.network.listener.client;
import com.a.eye.skywalking.network.grpc.SearchResult;
/**
* Created by wusheng on 2016/12/3.
*/
public interface SearchClientListener {
void onError(Throwable throwable);
void onReturn(SearchResult result);
void onFinished();
}

13
skywalking-network/src/main/java/com/a/eye/skywalking/network/listener/server/AsyncTraceSearchServerListener.java
View File

@ -1,13 +0,0 @@
package com.a.eye.skywalking.network.listener.server;
import com.a.eye.skywalking.network.grpc.Span;
import com.a.eye.skywalking.network.grpc.TraceId;
import java.util.List;
/**
* Created by xin on 2016/11/15.
*/
public interface AsyncTraceSearchServerListener {
List<Span> search(TraceId traceId);
}

3
skywalking-network/src/main/java/com/a/eye/skywalking/network/listener/server/TraceSearchListener.java
View File

@ -1,9 +1,10 @@
package com.a.eye.skywalking.network.listener.server;
import com.a.eye.skywalking.network.grpc.Span;
import com.a.eye.skywalking.network.grpc.TraceId;
import java.util.List;
public interface TraceSearchListener{
List<Span> search(String traceId);
List<Span> search(TraceId traceId);
}

2
skywalking-network/src/main/proto/TraceSearchService.proto
View File

@ -11,7 +11,7 @@ service AsyncTraceSearchService {
}
service TraceSearchService {
rpc search (TraceId) returns (SearchResult) {
rpc search (QueryTask) returns (SearchResult) {
};
}