1 files changed, 38 insertions, 17 deletions

diff --git a/test/cpp/qps/user_data.proto b/test/cpp/qps/user_data.proto
index 9c941cae2c..27d0049cf0 100644
--- a/test/cpp/qps/user_data.proto
+++ b/test/cpp/qps/user_data.proto
@@ -29,7 +29,9 @@
 
 syntax = "proto2";
 
-package UserData;
+import "test/cpp/qps/qpstest.proto";
+
+package grpc.testing;
 
 service UserDataTransfer {
   // Sends client info
@@ -42,37 +44,56 @@ service UserDataTransfer {
 
 //Metrics to be stored
 message Metrics {
-  required double qps = 1;
-  required double perc_lat_50 = 2;
-  required double perc_lat_90 = 3;
-  required double perc_lat_95 = 4;
-  required double perc_lat_99 = 5;
-  required double perc_lat_99_point_9 = 6;
+  optional double qps = 1;
+  optional double qps_per_core = 2;
+  optional double perc_lat_50 = 3;
+  optional double perc_lat_90 = 4;
+  optional double perc_lat_95 = 5;
+  optional double perc_lat_99 = 6;
+  optional double perc_lat_99_point_9 = 7;
+  optional double server_system_time = 8;
+  optional double server_user_time = 9;
+  optional double client_system_time = 10;
+  optional double client_user_time = 11;
 }
 
 //Timestamped details
 message DataDetails {
-  required string timestamp = 1;
-  required Metrics metrics = 2;
+  optional string timestamp = 1;
+  optional string test_name = 2;
+  optional Metrics metrics = 3;
+  optional ClientConfig client_config = 4;
+  optional ServerConfig server_config = 5;
 }
 
 //User details
 message UserDetails {
-  required string id = 1;
-  required string name = 2;
-  required string link = 3;
+  optional string id = 1;
+  optional string email = 2;
+  optional bool verified_email = 3;
+  optional string name = 4;
+  optional string given_name = 5;
+  optional string family_name = 6;
+  optional string link = 7;
+  optional string picture = 8;
+  optional string gender = 9;
+  optional string locale = 10;
+  optional string hd = 11;
 }
 
 //Stored to database
 message SingleUserDetails {
   repeated DataDetails data_details = 1;
-  required UserDetails user_details = 2;
+  optional UserDetails user_details = 2;
 }
 
 //Request for storing a single user's data
 message SingleUserRecordRequest {
-  required string access_token = 1;
-  required Metrics metrics = 2;
+  optional string access_token = 1;
+  optional string test_name = 2;
+  optional Metrics metrics = 3;
+  optional ClientConfig client_config = 4;
+  optional ServerConfig server_config = 5;
 }
 
 //Reply to request for storing single user's data
@@ -81,12 +102,12 @@ message SingleUserRecordReply {
 
 //Request for retrieving single user's data
 message SingleUserRetrieveRequest {
-  required string client_id = 1;
+  optional string user_id = 1;
 }
 
 //Reply for request to retrieve single user's data
 message SingleUserRetrieveReply {
-  required SingleUserDetails details = 1;
+  optional SingleUserDetails details = 1;
 }
 
 //Request for retrieving all users' data