Skip to content

interop-testing: aggregate accumulated stats by RPC methods in xDS test client #7603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 11, 2020
Merged

interop-testing: aggregate accumulated stats by RPC methods in xDS test client #7603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0f7910
Count accumulated RPC stats by methods.
voidzcy Nov 9, 2020
19a56ec
Fix style
voidzcy Nov 9, 2020
5641cde
Improve code readability by delaying map entry null-check.
voidzcy Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 35 additions & 14 deletions interop-testing/src/main/java/io/grpc/testing/integration/XdsTestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.logging.Level;
import java.util.logging.Logger;
Expand All @@ -73,9 +72,9 @@ public final class XdsTestClient {
private final Set<XdsStatsWatcher> watchers = new HashSet<>();
private final Object lock = new Object();
private final List<ManagedChannel> channels = new ArrayList<>();
private final AtomicInteger rpcsStarted = new AtomicInteger();
private final AtomicInteger rpcsFailed = new AtomicInteger();
private final AtomicInteger rpcsSucceeded = new AtomicInteger();
private final Map<String, Integer> rpcsStartedByMethod = new HashMap<>();
private final Map<String, Integer> rpcsFailedByMethod = new HashMap<>();
private final Map<String, Integer> rpcsSucceededByMethod = new HashMap<>();

private int numChannels = 1;
private boolean printResponse = false;
Expand Down Expand Up @@ -333,7 +332,6 @@ public void onError(Throwable t) {
@Override
public void onNext(EmptyProtos.Empty response) {}
});
rpcsStarted.getAndIncrement();
} else if (rpcType == RpcType.UNARY_CALL) {
SimpleRequest request = SimpleRequest.newBuilder().setFillServerId(true).build();
stub.unaryCall(
Expand Down Expand Up @@ -373,19 +371,39 @@ public void onNext(SimpleResponse response) {
}
}
});
rpcsStarted.getAndIncrement();
} else {
throw new AssertionError("Unknown RPC type: " + rpcType);
}
synchronized (lock) {
Integer startedBase = rpcsStartedByMethod.get(rpcType.name());
if (startedBase == null) {
startedBase = 0;
}
rpcsStartedByMethod.put(rpcType.name(), startedBase + 1);
}
}

private void handleRpcCompleted(long requestId, RpcType rpcType, String hostname,
Set<XdsStatsWatcher> watchers) {
rpcsSucceeded.getAndIncrement();
synchronized (lock) {
Integer succeededBase = rpcsSucceededByMethod.get(rpcType.name());
if (succeededBase == null) {
succeededBase = 0;
}
rpcsSucceededByMethod.put(rpcType.name(), succeededBase + 1);
}
notifyWatchers(watchers, rpcType, requestId, hostname);
}

private void handleRpcError(long requestId, RpcType rpcType, String hostname,
Set<XdsStatsWatcher> watchers) {
rpcsFailed.getAndIncrement();
synchronized (lock) {
Integer failedBase = rpcsFailedByMethod.get(rpcType.name());
if (failedBase == null) {
failedBase = 0;
}
rpcsFailedByMethod.put(rpcType.name(), failedBase + 1);
}
notifyWatchers(watchers, rpcType, requestId, hostname);
}
}
Expand Down Expand Up @@ -457,12 +475,15 @@ public void getClientStats(
@Override
public void getClientAccumulatedStats(LoadBalancerAccumulatedStatsRequest request,
StreamObserver<LoadBalancerAccumulatedStatsResponse> responseObserver) {
responseObserver.onNext(
LoadBalancerAccumulatedStatsResponse.newBuilder()
.setNumRpcsStarted(rpcsStarted.get())
.setNumRpcsSucceeded(rpcsSucceeded.get())
.setNumRpcsFailed(rpcsFailed.get())
.build());
LoadBalancerAccumulatedStatsResponse.Builder responseBuilder =
LoadBalancerAccumulatedStatsResponse.newBuilder();
synchronized (lock) {
responseBuilder
.putAllNumRpcsStartedByMethod(rpcsStartedByMethod)
.putAllNumRpcsSucceededByMethod(rpcsSucceededByMethod)
.putAllNumRpcsFailedByMethod(rpcsFailedByMethod);
}
responseObserver.onNext(responseBuilder.build());
responseObserver.onCompleted();
}
}
Expand Down
12 changes: 6 additions & 6 deletions interop-testing/src/main/proto/grpc/testing/messages.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,12 +208,12 @@ message LoadBalancerAccumulatedStatsRequest {}

// Accumulated stats for RPCs sent by a test client.
message LoadBalancerAccumulatedStatsResponse {
// The total number of RPCs have ever issued.
int32 num_rpcs_started = 1;
// The total number of RPCs have ever completed successfully.
int32 num_rpcs_succeeded = 2;
// The total number of RPCs have ever failed.
int32 num_rpcs_failed = 3;
// The total number of RPCs have ever issued for each type.
map<string, int32> num_rpcs_started_by_method = 1;
// The total number of RPCs have ever completed successfully for each type.
map<string, int32> num_rpcs_succeeded_by_method = 2;
// The total number of RPCs have ever failed for each type.
map<string, int32> num_rpcs_failed_by_method = 3;
}

// Configurations for a test client.
Expand Down