Merge pull request #18329 from jtattermusch/bump_protobuf370

Update protobuf dependency to v3.7.0

bazel/grpc_deps.bzl

@@ -124,8 +124,8 @@ def grpc_deps():
     if "com_google_protobuf" not in native.existing_rules():
         http_archive(
             name = "com_google_protobuf",
-            strip_prefix = "protobuf-66dc42d891a4fc8e9190c524fd67961688a37bbe",
-            url = "https://github.com/google/protobuf/archive/66dc42d891a4fc8e9190c524fd67961688a37bbe.tar.gz",
+            strip_prefix = "protobuf-582743bf40c5d3639a70f98f183914a2c0cd0680",
+            url = "https://github.com/google/protobuf/archive/582743bf40c5d3639a70f98f183914a2c0cd0680.tar.gz",
         )
 
     if "com_github_nanopb_nanopb" not in native.existing_rules():

grpc.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
   s.platform      = Gem::Platform::RUBY
 
-  s.add_dependency 'google-protobuf', '~> 3.1'
+  s.add_dependency 'google-protobuf', '~> 3.7'
   s.add_dependency 'googleapis-common-protos-types', '~> 1.0.0'
 
   s.add_development_dependency 'bundler',            '~> 1.9'

src/csharp/Grpc.Core/Version.csproj.include

@@ -2,6 +2,6 @@
 <Project>
   <PropertyGroup>
     <GrpcCsharpVersion>1.20.0-dev</GrpcCsharpVersion>
-    <GoogleProtobufVersion>3.6.1</GoogleProtobufVersion>
+    <GoogleProtobufVersion>3.7.0</GoogleProtobufVersion>
   </PropertyGroup>
 </Project>

src/csharp/Grpc.Examples/MathGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2015 gRPC authors.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/csharp/Grpc.HealthCheck/Health.cs

@@ -296,7 +296,7 @@ namespace Grpc.Health.V1 {
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
           case 8: {
-            status_ = (global::Grpc.Health.V1.HealthCheckResponse.Types.ServingStatus) input.ReadEnum();
+            Status = (global::Grpc.Health.V1.HealthCheckResponse.Types.ServingStatus) input.ReadEnum();
             break;
           }
         }

src/csharp/Grpc.HealthCheck/HealthGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2015 The gRPC Authors
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/csharp/Grpc.IntegrationTesting/BenchmarkServiceGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2015 gRPC authors.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/csharp/Grpc.IntegrationTesting/Control.cs

@@ -1502,7 +1502,7 @@ namespace Grpc.Testing {
       }
       if (other.securityParams_ != null) {
         if (securityParams_ == null) {
-          securityParams_ = new global::Grpc.Testing.SecurityParams();
+          SecurityParams = new global::Grpc.Testing.SecurityParams();
         }
         SecurityParams.MergeFrom(other.SecurityParams);
       }
@@ -1520,19 +1520,19 @@ namespace Grpc.Testing {
       }
       if (other.loadParams_ != null) {
         if (loadParams_ == null) {
-          loadParams_ = new global::Grpc.Testing.LoadParams();
+          LoadParams = new global::Grpc.Testing.LoadParams();
         }
         LoadParams.MergeFrom(other.LoadParams);
       }
       if (other.payloadConfig_ != null) {
         if (payloadConfig_ == null) {
-          payloadConfig_ = new global::Grpc.Testing.PayloadConfig();
+          PayloadConfig = new global::Grpc.Testing.PayloadConfig();
         }
         PayloadConfig.MergeFrom(other.PayloadConfig);
       }
       if (other.histogramParams_ != null) {
         if (histogramParams_ == null) {
-          histogramParams_ = new global::Grpc.Testing.HistogramParams();
+          HistogramParams = new global::Grpc.Testing.HistogramParams();
         }
         HistogramParams.MergeFrom(other.HistogramParams);
       }
@@ -1572,14 +1572,14 @@ namespace Grpc.Testing {
             break;
           }
           case 16: {
-            clientType_ = (global::Grpc.Testing.ClientType) input.ReadEnum();
+            ClientType = (global::Grpc.Testing.ClientType) input.ReadEnum();
             break;
           }
           case 26: {
             if (securityParams_ == null) {
-              securityParams_ = new global::Grpc.Testing.SecurityParams();
+              SecurityParams = new global::Grpc.Testing.SecurityParams();
             }
-            input.ReadMessage(securityParams_);
+            input.ReadMessage(SecurityParams);
             break;
           }
           case 32: {
@@ -1595,28 +1595,28 @@ namespace Grpc.Testing {
             break;
           }
           case 64: {
-            rpcType_ = (global::Grpc.Testing.RpcType) input.ReadEnum();
+            RpcType = (global::Grpc.Testing.RpcType) input.ReadEnum();
             break;
           }
           case 82: {
             if (loadParams_ == null) {
-              loadParams_ = new global::Grpc.Testing.LoadParams();
+              LoadParams = new global::Grpc.Testing.LoadParams();
             }
-            input.ReadMessage(loadParams_);
+            input.ReadMessage(LoadParams);
             break;
           }
           case 90: {
             if (payloadConfig_ == null) {
-              payloadConfig_ = new global::Grpc.Testing.PayloadConfig();
+              PayloadConfig = new global::Grpc.Testing.PayloadConfig();
             }
-            input.ReadMessage(payloadConfig_);
+            input.ReadMessage(PayloadConfig);
             break;
           }
           case 98: {
             if (histogramParams_ == null) {
-              histogramParams_ = new global::Grpc.Testing.HistogramParams();
+              HistogramParams = new global::Grpc.Testing.HistogramParams();
             }
-            input.ReadMessage(histogramParams_);
+            input.ReadMessage(HistogramParams);
             break;
           }
           case 106:
@@ -1765,7 +1765,7 @@ namespace Grpc.Testing {
       }
       if (other.stats_ != null) {
         if (stats_ == null) {
-          stats_ = new global::Grpc.Testing.ClientStats();
+          Stats = new global::Grpc.Testing.ClientStats();
         }
         Stats.MergeFrom(other.Stats);
       }
@@ -1782,9 +1782,9 @@ namespace Grpc.Testing {
             break;
           case 10: {
             if (stats_ == null) {
-              stats_ = new global::Grpc.Testing.ClientStats();
+              Stats = new global::Grpc.Testing.ClientStats();
             }
-            input.ReadMessage(stats_);
+            input.ReadMessage(Stats);
             break;
           }
         }
@@ -2467,7 +2467,7 @@ namespace Grpc.Testing {
       }
       if (other.securityParams_ != null) {
         if (securityParams_ == null) {
-          securityParams_ = new global::Grpc.Testing.SecurityParams();
+          SecurityParams = new global::Grpc.Testing.SecurityParams();
         }
         SecurityParams.MergeFrom(other.SecurityParams);
       }
@@ -2482,7 +2482,7 @@ namespace Grpc.Testing {
       }
       if (other.payloadConfig_ != null) {
         if (payloadConfig_ == null) {
-          payloadConfig_ = new global::Grpc.Testing.PayloadConfig();
+          PayloadConfig = new global::Grpc.Testing.PayloadConfig();
         }
         PayloadConfig.MergeFrom(other.PayloadConfig);
       }
@@ -2509,14 +2509,14 @@ namespace Grpc.Testing {
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
           case 8: {
-            serverType_ = (global::Grpc.Testing.ServerType) input.ReadEnum();
+            ServerType = (global::Grpc.Testing.ServerType) input.ReadEnum();
             break;
           }
           case 18: {
             if (securityParams_ == null) {
-              securityParams_ = new global::Grpc.Testing.SecurityParams();
+              SecurityParams = new global::Grpc.Testing.SecurityParams();
             }
-            input.ReadMessage(securityParams_);
+            input.ReadMessage(SecurityParams);
             break;
           }
           case 32: {
@@ -2533,9 +2533,9 @@ namespace Grpc.Testing {
           }
           case 74: {
             if (payloadConfig_ == null) {
-              payloadConfig_ = new global::Grpc.Testing.PayloadConfig();
+              PayloadConfig = new global::Grpc.Testing.PayloadConfig();
             }
-            input.ReadMessage(payloadConfig_);
+            input.ReadMessage(PayloadConfig);
             break;
           }
           case 82:
@@ -2924,7 +2924,7 @@ namespace Grpc.Testing {
       }
       if (other.stats_ != null) {
         if (stats_ == null) {
-          stats_ = new global::Grpc.Testing.ServerStats();
+          Stats = new global::Grpc.Testing.ServerStats();
         }
         Stats.MergeFrom(other.Stats);
       }
@@ -2947,9 +2947,9 @@ namespace Grpc.Testing {
             break;
           case 10: {
             if (stats_ == null) {
-              stats_ = new global::Grpc.Testing.ServerStats();
+              Stats = new global::Grpc.Testing.ServerStats();
             }
-            input.ReadMessage(stats_);
+            input.ReadMessage(Stats);
             break;
           }
           case 16: {
@@ -3584,7 +3584,7 @@ namespace Grpc.Testing {
       }
       if (other.clientConfig_ != null) {
         if (clientConfig_ == null) {
-          clientConfig_ = new global::Grpc.Testing.ClientConfig();
+          ClientConfig = new global::Grpc.Testing.ClientConfig();
         }
         ClientConfig.MergeFrom(other.ClientConfig);
       }
@@ -3593,7 +3593,7 @@ namespace Grpc.Testing {
       }
       if (other.serverConfig_ != null) {
         if (serverConfig_ == null) {
-          serverConfig_ = new global::Grpc.Testing.ServerConfig();
+          ServerConfig = new global::Grpc.Testing.ServerConfig();
         }
         ServerConfig.MergeFrom(other.ServerConfig);
       }
@@ -3626,9 +3626,9 @@ namespace Grpc.Testing {
           }
           case 18: {
             if (clientConfig_ == null) {
-              clientConfig_ = new global::Grpc.Testing.ClientConfig();
+              ClientConfig = new global::Grpc.Testing.ClientConfig();
             }
-            input.ReadMessage(clientConfig_);
+            input.ReadMessage(ClientConfig);
             break;
           }
           case 24: {
@@ -3637,9 +3637,9 @@ namespace Grpc.Testing {
           }
           case 34: {
             if (serverConfig_ == null) {
-              serverConfig_ = new global::Grpc.Testing.ServerConfig();
+              ServerConfig = new global::Grpc.Testing.ServerConfig();
             }
-            input.ReadMessage(serverConfig_);
+            input.ReadMessage(ServerConfig);
             break;
           }
           case 40: {
@@ -4696,13 +4696,13 @@ namespace Grpc.Testing {
       }
       if (other.scenario_ != null) {
         if (scenario_ == null) {
-          scenario_ = new global::Grpc.Testing.Scenario();
+          Scenario = new global::Grpc.Testing.Scenario();
         }
         Scenario.MergeFrom(other.Scenario);
       }
       if (other.latencies_ != null) {
         if (latencies_ == null) {
-          latencies_ = new global::Grpc.Testing.HistogramData();
+          Latencies = new global::Grpc.Testing.HistogramData();
         }
         Latencies.MergeFrom(other.Latencies);
       }
@@ -4711,7 +4711,7 @@ namespace Grpc.Testing {
       serverCores_.Add(other.serverCores_);
       if (other.summary_ != null) {
         if (summary_ == null) {
-          summary_ = new global::Grpc.Testing.ScenarioResultSummary();
+          Summary = new global::Grpc.Testing.ScenarioResultSummary();
         }
         Summary.MergeFrom(other.Summary);
       }
@@ -4731,16 +4731,16 @@ namespace Grpc.Testing {
             break;
           case 10: {
             if (scenario_ == null) {
-              scenario_ = new global::Grpc.Testing.Scenario();
+              Scenario = new global::Grpc.Testing.Scenario();
             }
-            input.ReadMessage(scenario_);
+            input.ReadMessage(Scenario);
             break;
           }
           case 18: {
             if (latencies_ == null) {
-              latencies_ = new global::Grpc.Testing.HistogramData();
+              Latencies = new global::Grpc.Testing.HistogramData();
             }
-            input.ReadMessage(latencies_);
+            input.ReadMessage(Latencies);
             break;
           }
           case 26: {
@@ -4758,9 +4758,9 @@ namespace Grpc.Testing {
           }
           case 50: {
             if (summary_ == null) {
-              summary_ = new global::Grpc.Testing.ScenarioResultSummary();
+              Summary = new global::Grpc.Testing.ScenarioResultSummary();
             }
-            input.ReadMessage(summary_);
+            input.ReadMessage(Summary);
             break;
           }
           case 58:

src/csharp/Grpc.IntegrationTesting/EchoMessages.cs

@@ -864,7 +864,7 @@ namespace Grpc.Testing {
       }
       if (other.debugInfo_ != null) {
         if (debugInfo_ == null) {
-          debugInfo_ = new global::Grpc.Testing.DebugInfo();
+          DebugInfo = new global::Grpc.Testing.DebugInfo();
         }
         DebugInfo.MergeFrom(other.DebugInfo);
       }
@@ -876,7 +876,7 @@ namespace Grpc.Testing {
       }
       if (other.expectedError_ != null) {
         if (expectedError_ == null) {
-          expectedError_ = new global::Grpc.Testing.ErrorStatus();
+          ExpectedError = new global::Grpc.Testing.ErrorStatus();
         }
         ExpectedError.MergeFrom(other.ExpectedError);
       }
@@ -939,9 +939,9 @@ namespace Grpc.Testing {
           }
           case 90: {
             if (debugInfo_ == null) {
-              debugInfo_ = new global::Grpc.Testing.DebugInfo();
+              DebugInfo = new global::Grpc.Testing.DebugInfo();
             }
-            input.ReadMessage(debugInfo_);
+            input.ReadMessage(DebugInfo);
             break;
           }
           case 96: {
@@ -954,9 +954,9 @@ namespace Grpc.Testing {
           }
           case 114: {
             if (expectedError_ == null) {
-              expectedError_ = new global::Grpc.Testing.ErrorStatus();
+              ExpectedError = new global::Grpc.Testing.ErrorStatus();
             }
-            input.ReadMessage(expectedError_);
+            input.ReadMessage(ExpectedError);
             break;
           }
           case 120: {
@@ -1104,7 +1104,7 @@ namespace Grpc.Testing {
       }
       if (other.param_ != null) {
         if (param_ == null) {
-          param_ = new global::Grpc.Testing.RequestParams();
+          Param = new global::Grpc.Testing.RequestParams();
         }
         Param.MergeFrom(other.Param);
       }
@@ -1125,9 +1125,9 @@ namespace Grpc.Testing {
           }
           case 18: {
             if (param_ == null) {
-              param_ = new global::Grpc.Testing.RequestParams();
+              Param = new global::Grpc.Testing.RequestParams();
             }
-            input.ReadMessage(param_);
+            input.ReadMessage(Param);
             break;
           }
         }
@@ -1452,7 +1452,7 @@ namespace Grpc.Testing {
       }
       if (other.param_ != null) {
         if (param_ == null) {
-          param_ = new global::Grpc.Testing.ResponseParams();
+          Param = new global::Grpc.Testing.ResponseParams();
         }
         Param.MergeFrom(other.Param);
       }
@@ -1473,9 +1473,9 @@ namespace Grpc.Testing {
           }
           case 18: {
             if (param_ == null) {
-              param_ = new global::Grpc.Testing.ResponseParams();
+              Param = new global::Grpc.Testing.ResponseParams();
             }
-            input.ReadMessage(param_);
+            input.ReadMessage(Param);
             break;
           }
         }

src/csharp/Grpc.IntegrationTesting/Empty.cs

@@ -44,7 +44,6 @@ namespace Grpc.Testing {
   ///   service Foo {
   ///     rpc Bar (grpc.testing.Empty) returns (grpc.testing.Empty) { };
   ///   };
-  ///
   /// </summary>
   public sealed partial class Empty : pb::IMessage<Empty> {
     private static readonly pb::MessageParser<Empty> _parser = new pb::MessageParser<Empty>(() => new Empty());

src/csharp/Grpc.IntegrationTesting/EmptyServiceGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2018 gRPC authors.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/csharp/Grpc.IntegrationTesting/Messages.cs

@@ -379,7 +379,7 @@ namespace Grpc.Testing {
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
           case 8: {
-            type_ = (global::Grpc.Testing.PayloadType) input.ReadEnum();
+            Type = (global::Grpc.Testing.PayloadType) input.ReadEnum();
             break;
           }
           case 18: {
@@ -844,7 +844,7 @@ namespace Grpc.Testing {
       }
       if (other.payload_ != null) {
         if (payload_ == null) {
-          payload_ = new global::Grpc.Testing.Payload();
+          Payload = new global::Grpc.Testing.Payload();
         }
         Payload.MergeFrom(other.Payload);
       }
@@ -856,19 +856,19 @@ namespace Grpc.Testing {
       }
       if (other.responseCompressed_ != null) {
         if (responseCompressed_ == null) {
-          responseCompressed_ = new global::Grpc.Testing.BoolValue();
+          ResponseCompressed = new global::Grpc.Testing.BoolValue();
         }
         ResponseCompressed.MergeFrom(other.ResponseCompressed);
       }
       if (other.responseStatus_ != null) {
         if (responseStatus_ == null) {
-          responseStatus_ = new global::Grpc.Testing.EchoStatus();
+          ResponseStatus = new global::Grpc.Testing.EchoStatus();
         }
         ResponseStatus.MergeFrom(other.ResponseStatus);
       }
       if (other.expectCompressed_ != null) {
         if (expectCompressed_ == null) {
-          expectCompressed_ = new global::Grpc.Testing.BoolValue();
+          ExpectCompressed = new global::Grpc.Testing.BoolValue();
         }
         ExpectCompressed.MergeFrom(other.ExpectCompressed);
       }
@@ -884,7 +884,7 @@ namespace Grpc.Testing {
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
           case 8: {
-            responseType_ = (global::Grpc.Testing.PayloadType) input.ReadEnum();
+            ResponseType = (global::Grpc.Testing.PayloadType) input.ReadEnum();
             break;
           }
           case 16: {
@@ -893,9 +893,9 @@ namespace Grpc.Testing {
           }
           case 26: {
             if (payload_ == null) {
-              payload_ = new global::Grpc.Testing.Payload();
+              Payload = new global::Grpc.Testing.Payload();
             }
-            input.ReadMessage(payload_);
+            input.ReadMessage(Payload);
             break;
           }
           case 32: {
@@ -908,23 +908,23 @@ namespace Grpc.Testing {
           }
           case 50: {
             if (responseCompressed_ == null) {
-              responseCompressed_ = new global::Grpc.Testing.BoolValue();
+              ResponseCompressed = new global::Grpc.Testing.BoolValue();
             }
-            input.ReadMessage(responseCompressed_);
+            input.ReadMessage(ResponseCompressed);
             break;
           }
           case 58: {
             if (responseStatus_ == null) {
-              responseStatus_ = new global::Grpc.Testing.EchoStatus();
+              ResponseStatus = new global::Grpc.Testing.EchoStatus();
             }
-            input.ReadMessage(responseStatus_);
+            input.ReadMessage(ResponseStatus);
             break;
           }
           case 66: {
             if (expectCompressed_ == null) {
-              expectCompressed_ = new global::Grpc.Testing.BoolValue();
+              ExpectCompressed = new global::Grpc.Testing.BoolValue();
             }
-            input.ReadMessage(expectCompressed_);
+            input.ReadMessage(ExpectCompressed);
             break;
           }
         }
@@ -1095,7 +1095,7 @@ namespace Grpc.Testing {
       }
       if (other.payload_ != null) {
         if (payload_ == null) {
-          payload_ = new global::Grpc.Testing.Payload();
+          Payload = new global::Grpc.Testing.Payload();
         }
         Payload.MergeFrom(other.Payload);
       }
@@ -1118,9 +1118,9 @@ namespace Grpc.Testing {
             break;
           case 10: {
             if (payload_ == null) {
-              payload_ = new global::Grpc.Testing.Payload();
+              Payload = new global::Grpc.Testing.Payload();
             }
-            input.ReadMessage(payload_);
+            input.ReadMessage(Payload);
             break;
           }
           case 18: {
@@ -1277,13 +1277,13 @@ namespace Grpc.Testing {
       }
       if (other.payload_ != null) {
         if (payload_ == null) {
-          payload_ = new global::Grpc.Testing.Payload();
+          Payload = new global::Grpc.Testing.Payload();
         }
         Payload.MergeFrom(other.Payload);
       }
       if (other.expectCompressed_ != null) {
         if (expectCompressed_ == null) {
-          expectCompressed_ = new global::Grpc.Testing.BoolValue();
+          ExpectCompressed = new global::Grpc.Testing.BoolValue();
         }
         ExpectCompressed.MergeFrom(other.ExpectCompressed);
       }
@@ -1300,16 +1300,16 @@ namespace Grpc.Testing {
             break;
           case 10: {
             if (payload_ == null) {
-              payload_ = new global::Grpc.Testing.Payload();
+              Payload = new global::Grpc.Testing.Payload();
             }
-            input.ReadMessage(payload_);
+            input.ReadMessage(Payload);
             break;
           }
           case 18: {
             if (expectCompressed_ == null) {
-              expectCompressed_ = new global::Grpc.Testing.BoolValue();
+              ExpectCompressed = new global::Grpc.Testing.BoolValue();
             }
-            input.ReadMessage(expectCompressed_);
+            input.ReadMessage(ExpectCompressed);
             break;
           }
         }
@@ -1624,7 +1624,7 @@ namespace Grpc.Testing {
       }
       if (other.compressed_ != null) {
         if (compressed_ == null) {
-          compressed_ = new global::Grpc.Testing.BoolValue();
+          Compressed = new global::Grpc.Testing.BoolValue();
         }
         Compressed.MergeFrom(other.Compressed);
       }
@@ -1649,9 +1649,9 @@ namespace Grpc.Testing {
           }
           case 26: {
             if (compressed_ == null) {
-              compressed_ = new global::Grpc.Testing.BoolValue();
+              Compressed = new global::Grpc.Testing.BoolValue();
             }
-            input.ReadMessage(compressed_);
+            input.ReadMessage(Compressed);
             break;
           }
         }
@@ -1846,13 +1846,13 @@ namespace Grpc.Testing {
       responseParameters_.Add(other.responseParameters_);
       if (other.payload_ != null) {
         if (payload_ == null) {
-          payload_ = new global::Grpc.Testing.Payload();
+          Payload = new global::Grpc.Testing.Payload();
         }
         Payload.MergeFrom(other.Payload);
       }
       if (other.responseStatus_ != null) {
         if (responseStatus_ == null) {
-          responseStatus_ = new global::Grpc.Testing.EchoStatus();
+          ResponseStatus = new global::Grpc.Testing.EchoStatus();
         }
         ResponseStatus.MergeFrom(other.ResponseStatus);
       }
@@ -1868,7 +1868,7 @@ namespace Grpc.Testing {
             _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
             break;
           case 8: {
-            responseType_ = (global::Grpc.Testing.PayloadType) input.ReadEnum();
+            ResponseType = (global::Grpc.Testing.PayloadType) input.ReadEnum();
             break;
           }
           case 18: {
@@ -1877,16 +1877,16 @@ namespace Grpc.Testing {
           }
           case 26: {
             if (payload_ == null) {
-              payload_ = new global::Grpc.Testing.Payload();
+              Payload = new global::Grpc.Testing.Payload();
             }
-            input.ReadMessage(payload_);
+            input.ReadMessage(Payload);
             break;
           }
           case 58: {
             if (responseStatus_ == null) {
-              responseStatus_ = new global::Grpc.Testing.EchoStatus();
+              ResponseStatus = new global::Grpc.Testing.EchoStatus();
             }
-            input.ReadMessage(responseStatus_);
+            input.ReadMessage(ResponseStatus);
             break;
           }
         }
@@ -2008,7 +2008,7 @@ namespace Grpc.Testing {
       }
       if (other.payload_ != null) {
         if (payload_ == null) {
-          payload_ = new global::Grpc.Testing.Payload();
+          Payload = new global::Grpc.Testing.Payload();
         }
         Payload.MergeFrom(other.Payload);
       }
@@ -2025,9 +2025,9 @@ namespace Grpc.Testing {
             break;
           case 10: {
             if (payload_ == null) {
-              payload_ = new global::Grpc.Testing.Payload();
+              Payload = new global::Grpc.Testing.Payload();
             }
-            input.ReadMessage(payload_);
+            input.ReadMessage(Payload);
             break;
           }
         }

src/csharp/Grpc.IntegrationTesting/MetricsGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2015-2016 gRPC authors.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,7 +19,7 @@
 //
 // Contains the definitions for a metrics service and the type of metrics
 // exposed by the service.
-// 
+//
 // Currently, 'Gauge' (i.e a metric that represents the measured value of
 // something at an instant of time) is the only metric type supported by the
 // service.

src/csharp/Grpc.IntegrationTesting/ReportQpsScenarioServiceGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2015 gRPC authors.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/csharp/Grpc.IntegrationTesting/Stats.cs

@@ -328,7 +328,7 @@ namespace Grpc.Testing {
       }
       if (other.coreStats_ != null) {
         if (coreStats_ == null) {
-          coreStats_ = new global::Grpc.Core.Stats();
+          CoreStats = new global::Grpc.Core.Stats();
         }
         CoreStats.MergeFrom(other.CoreStats);
       }
@@ -369,9 +369,9 @@ namespace Grpc.Testing {
           }
           case 58: {
             if (coreStats_ == null) {
-              coreStats_ = new global::Grpc.Core.Stats();
+              CoreStats = new global::Grpc.Core.Stats();
             }
-            input.ReadMessage(coreStats_);
+            input.ReadMessage(CoreStats);
             break;
           }
         }
@@ -1210,7 +1210,7 @@ namespace Grpc.Testing {
       }
       if (other.latencies_ != null) {
         if (latencies_ == null) {
-          latencies_ = new global::Grpc.Testing.HistogramData();
+          Latencies = new global::Grpc.Testing.HistogramData();
         }
         Latencies.MergeFrom(other.Latencies);
       }
@@ -1229,7 +1229,7 @@ namespace Grpc.Testing {
       }
       if (other.coreStats_ != null) {
         if (coreStats_ == null) {
-          coreStats_ = new global::Grpc.Core.Stats();
+          CoreStats = new global::Grpc.Core.Stats();
         }
         CoreStats.MergeFrom(other.CoreStats);
       }
@@ -1246,9 +1246,9 @@ namespace Grpc.Testing {
             break;
           case 10: {
             if (latencies_ == null) {
-              latencies_ = new global::Grpc.Testing.HistogramData();
+              Latencies = new global::Grpc.Testing.HistogramData();
             }
-            input.ReadMessage(latencies_);
+            input.ReadMessage(Latencies);
             break;
           }
           case 17: {
@@ -1273,9 +1273,9 @@ namespace Grpc.Testing {
           }
           case 58: {
             if (coreStats_ == null) {
-              coreStats_ = new global::Grpc.Core.Stats();
+              CoreStats = new global::Grpc.Core.Stats();
             }
-            input.ReadMessage(coreStats_);
+            input.ReadMessage(CoreStats);
             break;
           }
         }

src/csharp/Grpc.IntegrationTesting/TestGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2015-2016 gRPC authors.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/csharp/Grpc.IntegrationTesting/WorkerServiceGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2015 gRPC authors.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/csharp/Grpc.Reflection/Reflection.cs

@@ -850,7 +850,7 @@ namespace Grpc.Reflection.V1Alpha {
       }
       if (other.originalRequest_ != null) {
         if (originalRequest_ == null) {
-          originalRequest_ = new global::Grpc.Reflection.V1Alpha.ServerReflectionRequest();
+          OriginalRequest = new global::Grpc.Reflection.V1Alpha.ServerReflectionRequest();
         }
         OriginalRequest.MergeFrom(other.OriginalRequest);
       }
@@ -898,9 +898,9 @@ namespace Grpc.Reflection.V1Alpha {
           }
           case 18: {
             if (originalRequest_ == null) {
-              originalRequest_ = new global::Grpc.Reflection.V1Alpha.ServerReflectionRequest();
+              OriginalRequest = new global::Grpc.Reflection.V1Alpha.ServerReflectionRequest();
             }
-            input.ReadMessage(originalRequest_);
+            input.ReadMessage(OriginalRequest);
             break;
           }
           case 34: {

src/csharp/Grpc.Reflection/ReflectionGrpc.cs

@@ -4,13 +4,13 @@
 // </auto-generated>
 // Original file comments:
 // Copyright 2016 gRPC authors.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

src/ruby/bin/math_pb.rb

@@ -4,22 +4,24 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "math.DivArgs" do
-    optional :dividend, :int64, 1
-    optional :divisor, :int64, 2
-  end
-  add_message "math.DivReply" do
-    optional :quotient, :int64, 1
-    optional :remainder, :int64, 2
-  end
-  add_message "math.FibArgs" do
-    optional :limit, :int64, 1
-  end
-  add_message "math.Num" do
-    optional :num, :int64, 1
-  end
-  add_message "math.FibReply" do
-    optional :count, :int64, 1
+  add_file("math.proto", :syntax => :proto3) do
+    add_message "math.DivArgs" do
+      optional :dividend, :int64, 1
+      optional :divisor, :int64, 2
+    end
+    add_message "math.DivReply" do
+      optional :quotient, :int64, 1
+      optional :remainder, :int64, 2
+    end
+    add_message "math.FibArgs" do
+      optional :limit, :int64, 1
+    end
+    add_message "math.Num" do
+      optional :num, :int64, 1
+    end
+    add_message "math.FibReply" do
+      optional :count, :int64, 1
+    end
   end
 end
 

src/ruby/pb/grpc/health/v1/health_pb.rb

@@ -4,16 +4,19 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.health.v1.HealthCheckRequest" do
-    optional :service, :string, 1
-  end
-  add_message "grpc.health.v1.HealthCheckResponse" do
-    optional :status, :enum, 1, "grpc.health.v1.HealthCheckResponse.ServingStatus"
-  end
-  add_enum "grpc.health.v1.HealthCheckResponse.ServingStatus" do
-    value :UNKNOWN, 0
-    value :SERVING, 1
-    value :NOT_SERVING, 2
+  add_file("grpc/health/v1/health.proto", :syntax => :proto3) do
+    add_message "grpc.health.v1.HealthCheckRequest" do
+      optional :service, :string, 1
+    end
+    add_message "grpc.health.v1.HealthCheckResponse" do
+      optional :status, :enum, 1, "grpc.health.v1.HealthCheckResponse.ServingStatus"
+    end
+    add_enum "grpc.health.v1.HealthCheckResponse.ServingStatus" do
+      value :UNKNOWN, 0
+      value :SERVING, 1
+      value :NOT_SERVING, 2
+      value :SERVICE_UNKNOWN, 3
+    end
   end
 end
 

src/ruby/pb/grpc/health/v1/health_services_pb.rb

@@ -34,7 +34,25 @@ module Grpc
           self.unmarshal_class_method = :decode
           self.service_name = 'grpc.health.v1.Health'
 
+          # If the requested service is unknown, the call will fail with status
+          # NOT_FOUND.
           rpc :Check, HealthCheckRequest, HealthCheckResponse
+          # Performs a watch for the serving status of the requested service.
+          # The server will immediately send back a message indicating the current
+          # serving status.  It will then subsequently send a new message whenever
+          # the service's serving status changes.
+          #
+          # If the requested service is unknown when the call is received, the
+          # server will send a message setting the serving status to
+          # SERVICE_UNKNOWN but will *not* terminate the call.  If at some
+          # future point, the serving status of the service becomes known, the
+          # server will send a new message with the service's serving status.
+          #
+          # If the call terminates with status UNIMPLEMENTED, then clients
+          # should assume this method is not supported and should not retry the
+          # call.  If the call terminates with any other status (including OK),
+          # clients should retry the call with appropriate exponential backoff.
+          rpc :Watch, HealthCheckRequest, stream(HealthCheckResponse)
         end
 
         Stub = Service.rpc_stub_class

src/ruby/pb/src/proto/grpc/testing/empty_pb.rb

@@ -4,7 +4,9 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.testing.Empty" do
+  add_file("src/proto/grpc/testing/empty.proto", :syntax => :proto3) do
+    add_message "grpc.testing.Empty" do
+    end
   end
 end
 

src/ruby/pb/src/proto/grpc/testing/messages_pb.rb

@@ -4,62 +4,64 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.testing.BoolValue" do
-    optional :value, :bool, 1
-  end
-  add_message "grpc.testing.Payload" do
-    optional :type, :enum, 1, "grpc.testing.PayloadType"
-    optional :body, :bytes, 2
-  end
-  add_message "grpc.testing.EchoStatus" do
-    optional :code, :int32, 1
-    optional :message, :string, 2
-  end
-  add_message "grpc.testing.SimpleRequest" do
-    optional :response_type, :enum, 1, "grpc.testing.PayloadType"
-    optional :response_size, :int32, 2
-    optional :payload, :message, 3, "grpc.testing.Payload"
-    optional :fill_username, :bool, 4
-    optional :fill_oauth_scope, :bool, 5
-    optional :response_compressed, :message, 6, "grpc.testing.BoolValue"
-    optional :response_status, :message, 7, "grpc.testing.EchoStatus"
-    optional :expect_compressed, :message, 8, "grpc.testing.BoolValue"
-  end
-  add_message "grpc.testing.SimpleResponse" do
-    optional :payload, :message, 1, "grpc.testing.Payload"
-    optional :username, :string, 2
-    optional :oauth_scope, :string, 3
-  end
-  add_message "grpc.testing.StreamingInputCallRequest" do
-    optional :payload, :message, 1, "grpc.testing.Payload"
-    optional :expect_compressed, :message, 2, "grpc.testing.BoolValue"
-  end
-  add_message "grpc.testing.StreamingInputCallResponse" do
-    optional :aggregated_payload_size, :int32, 1
-  end
-  add_message "grpc.testing.ResponseParameters" do
-    optional :size, :int32, 1
-    optional :interval_us, :int32, 2
-    optional :compressed, :message, 3, "grpc.testing.BoolValue"
-  end
-  add_message "grpc.testing.StreamingOutputCallRequest" do
-    optional :response_type, :enum, 1, "grpc.testing.PayloadType"
-    repeated :response_parameters, :message, 2, "grpc.testing.ResponseParameters"
-    optional :payload, :message, 3, "grpc.testing.Payload"
-    optional :response_status, :message, 7, "grpc.testing.EchoStatus"
-  end
-  add_message "grpc.testing.StreamingOutputCallResponse" do
-    optional :payload, :message, 1, "grpc.testing.Payload"
-  end
-  add_message "grpc.testing.ReconnectParams" do
-    optional :max_reconnect_backoff_ms, :int32, 1
-  end
-  add_message "grpc.testing.ReconnectInfo" do
-    optional :passed, :bool, 1
-    repeated :backoff_ms, :int32, 2
-  end
-  add_enum "grpc.testing.PayloadType" do
-    value :COMPRESSABLE, 0
+  add_file("src/proto/grpc/testing/messages.proto", :syntax => :proto3) do
+    add_message "grpc.testing.BoolValue" do
+      optional :value, :bool, 1
+    end
+    add_message "grpc.testing.Payload" do
+      optional :type, :enum, 1, "grpc.testing.PayloadType"
+      optional :body, :bytes, 2
+    end
+    add_message "grpc.testing.EchoStatus" do
+      optional :code, :int32, 1
+      optional :message, :string, 2
+    end
+    add_message "grpc.testing.SimpleRequest" do
+      optional :response_type, :enum, 1, "grpc.testing.PayloadType"
+      optional :response_size, :int32, 2
+      optional :payload, :message, 3, "grpc.testing.Payload"
+      optional :fill_username, :bool, 4
+      optional :fill_oauth_scope, :bool, 5
+      optional :response_compressed, :message, 6, "grpc.testing.BoolValue"
+      optional :response_status, :message, 7, "grpc.testing.EchoStatus"
+      optional :expect_compressed, :message, 8, "grpc.testing.BoolValue"
+    end
+    add_message "grpc.testing.SimpleResponse" do
+      optional :payload, :message, 1, "grpc.testing.Payload"
+      optional :username, :string, 2
+      optional :oauth_scope, :string, 3
+    end
+    add_message "grpc.testing.StreamingInputCallRequest" do
+      optional :payload, :message, 1, "grpc.testing.Payload"
+      optional :expect_compressed, :message, 2, "grpc.testing.BoolValue"
+    end
+    add_message "grpc.testing.StreamingInputCallResponse" do
+      optional :aggregated_payload_size, :int32, 1
+    end
+    add_message "grpc.testing.ResponseParameters" do
+      optional :size, :int32, 1
+      optional :interval_us, :int32, 2
+      optional :compressed, :message, 3, "grpc.testing.BoolValue"
+    end
+    add_message "grpc.testing.StreamingOutputCallRequest" do
+      optional :response_type, :enum, 1, "grpc.testing.PayloadType"
+      repeated :response_parameters, :message, 2, "grpc.testing.ResponseParameters"
+      optional :payload, :message, 3, "grpc.testing.Payload"
+      optional :response_status, :message, 7, "grpc.testing.EchoStatus"
+    end
+    add_message "grpc.testing.StreamingOutputCallResponse" do
+      optional :payload, :message, 1, "grpc.testing.Payload"
+    end
+    add_message "grpc.testing.ReconnectParams" do
+      optional :max_reconnect_backoff_ms, :int32, 1
+    end
+    add_message "grpc.testing.ReconnectInfo" do
+      optional :passed, :bool, 1
+      repeated :backoff_ms, :int32, 2
+    end
+    add_enum "grpc.testing.PayloadType" do
+      value :COMPRESSABLE, 0
+    end
   end
 end
 

src/ruby/pb/src/proto/grpc/testing/test_pb.rb

@@ -6,6 +6,8 @@ require 'google/protobuf'
 require 'src/proto/grpc/testing/empty_pb'
 require 'src/proto/grpc/testing/messages_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("src/proto/grpc/testing/test.proto", :syntax => :proto3) do
+  end
 end
 
 module Grpc

src/ruby/qps/src/proto/grpc/core/stats_pb.rb

@@ -4,22 +4,24 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.core.Bucket" do
-    optional :start, :double, 1
-    optional :count, :uint64, 2
-  end
-  add_message "grpc.core.Histogram" do
-    repeated :buckets, :message, 1, "grpc.core.Bucket"
-  end
-  add_message "grpc.core.Metric" do
-    optional :name, :string, 1
-    oneof :value do
-      optional :count, :uint64, 10
-      optional :histogram, :message, 11, "grpc.core.Histogram"
+  add_file("src/proto/grpc/core/stats.proto", :syntax => :proto3) do
+    add_message "grpc.core.Bucket" do
+      optional :start, :double, 1
+      optional :count, :uint64, 2
+    end
+    add_message "grpc.core.Histogram" do
+      repeated :buckets, :message, 1, "grpc.core.Bucket"
+    end
+    add_message "grpc.core.Metric" do
+      optional :name, :string, 1
+      oneof :value do
+        optional :count, :uint64, 10
+        optional :histogram, :message, 11, "grpc.core.Histogram"
+      end
+    end
+    add_message "grpc.core.Stats" do
+      repeated :metrics, :message, 1, "grpc.core.Metric"
     end
-  end
-  add_message "grpc.core.Stats" do
-    repeated :metrics, :message, 1, "grpc.core.Metric"
   end
 end
 

src/ruby/qps/src/proto/grpc/testing/benchmark_service_pb.rb

@@ -5,6 +5,8 @@ require 'google/protobuf'
 
 require 'src/proto/grpc/testing/messages_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("src/proto/grpc/testing/benchmark_service.proto", :syntax => :proto3) do
+  end
 end
 
 module Grpc

src/ruby/qps/src/proto/grpc/testing/control_pb.rb

@@ -6,152 +6,157 @@ require 'google/protobuf'
 require 'src/proto/grpc/testing/payloads_pb'
 require 'src/proto/grpc/testing/stats_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.testing.PoissonParams" do
-    optional :offered_load, :double, 1
-  end
-  add_message "grpc.testing.ClosedLoopParams" do
-  end
-  add_message "grpc.testing.LoadParams" do
-    oneof :load do
-      optional :closed_loop, :message, 1, "grpc.testing.ClosedLoopParams"
-      optional :poisson, :message, 2, "grpc.testing.PoissonParams"
+  add_file("src/proto/grpc/testing/control.proto", :syntax => :proto3) do
+    add_message "grpc.testing.PoissonParams" do
+      optional :offered_load, :double, 1
     end
-  end
-  add_message "grpc.testing.SecurityParams" do
-    optional :use_test_ca, :bool, 1
-    optional :server_host_override, :string, 2
-    optional :cred_type, :string, 3
-  end
-  add_message "grpc.testing.ChannelArg" do
-    optional :name, :string, 1
-    oneof :value do
-      optional :str_value, :string, 2
-      optional :int_value, :int32, 3
+    add_message "grpc.testing.ClosedLoopParams" do
     end
-  end
-  add_message "grpc.testing.ClientConfig" do
-    repeated :server_targets, :string, 1
-    optional :client_type, :enum, 2, "grpc.testing.ClientType"
-    optional :security_params, :message, 3, "grpc.testing.SecurityParams"
-    optional :outstanding_rpcs_per_channel, :int32, 4
-    optional :client_channels, :int32, 5
-    optional :async_client_threads, :int32, 7
-    optional :rpc_type, :enum, 8, "grpc.testing.RpcType"
-    optional :load_params, :message, 10, "grpc.testing.LoadParams"
-    optional :payload_config, :message, 11, "grpc.testing.PayloadConfig"
-    optional :histogram_params, :message, 12, "grpc.testing.HistogramParams"
-    repeated :core_list, :int32, 13
-    optional :core_limit, :int32, 14
-    optional :other_client_api, :string, 15
-    repeated :channel_args, :message, 16, "grpc.testing.ChannelArg"
-    optional :threads_per_cq, :int32, 17
-    optional :messages_per_stream, :int32, 18
-    optional :use_coalesce_api, :bool, 19
-  end
-  add_message "grpc.testing.ClientStatus" do
-    optional :stats, :message, 1, "grpc.testing.ClientStats"
-  end
-  add_message "grpc.testing.Mark" do
-    optional :reset, :bool, 1
-  end
-  add_message "grpc.testing.ClientArgs" do
-    oneof :argtype do
-      optional :setup, :message, 1, "grpc.testing.ClientConfig"
-      optional :mark, :message, 2, "grpc.testing.Mark"
+    add_message "grpc.testing.LoadParams" do
+      oneof :load do
+        optional :closed_loop, :message, 1, "grpc.testing.ClosedLoopParams"
+        optional :poisson, :message, 2, "grpc.testing.PoissonParams"
+      end
     end
-  end
-  add_message "grpc.testing.ServerConfig" do
-    optional :server_type, :enum, 1, "grpc.testing.ServerType"
-    optional :security_params, :message, 2, "grpc.testing.SecurityParams"
-    optional :port, :int32, 4
-    optional :async_server_threads, :int32, 7
-    optional :core_limit, :int32, 8
-    optional :payload_config, :message, 9, "grpc.testing.PayloadConfig"
-    repeated :core_list, :int32, 10
-    optional :other_server_api, :string, 11
-    optional :threads_per_cq, :int32, 12
-    optional :resource_quota_size, :int32, 1001
-    repeated :channel_args, :message, 1002, "grpc.testing.ChannelArg"
-  end
-  add_message "grpc.testing.ServerArgs" do
-    oneof :argtype do
-      optional :setup, :message, 1, "grpc.testing.ServerConfig"
-      optional :mark, :message, 2, "grpc.testing.Mark"
+    add_message "grpc.testing.SecurityParams" do
+      optional :use_test_ca, :bool, 1
+      optional :server_host_override, :string, 2
+      optional :cred_type, :string, 3
+    end
+    add_message "grpc.testing.ChannelArg" do
+      optional :name, :string, 1
+      oneof :value do
+        optional :str_value, :string, 2
+        optional :int_value, :int32, 3
+      end
+    end
+    add_message "grpc.testing.ClientConfig" do
+      repeated :server_targets, :string, 1
+      optional :client_type, :enum, 2, "grpc.testing.ClientType"
+      optional :security_params, :message, 3, "grpc.testing.SecurityParams"
+      optional :outstanding_rpcs_per_channel, :int32, 4
+      optional :client_channels, :int32, 5
+      optional :async_client_threads, :int32, 7
+      optional :rpc_type, :enum, 8, "grpc.testing.RpcType"
+      optional :load_params, :message, 10, "grpc.testing.LoadParams"
+      optional :payload_config, :message, 11, "grpc.testing.PayloadConfig"
+      optional :histogram_params, :message, 12, "grpc.testing.HistogramParams"
+      repeated :core_list, :int32, 13
+      optional :core_limit, :int32, 14
+      optional :other_client_api, :string, 15
+      repeated :channel_args, :message, 16, "grpc.testing.ChannelArg"
+      optional :threads_per_cq, :int32, 17
+      optional :messages_per_stream, :int32, 18
+      optional :use_coalesce_api, :bool, 19
+      optional :median_latency_collection_interval_millis, :int32, 20
+    end
+    add_message "grpc.testing.ClientStatus" do
+      optional :stats, :message, 1, "grpc.testing.ClientStats"
+    end
+    add_message "grpc.testing.Mark" do
+      optional :reset, :bool, 1
+    end
+    add_message "grpc.testing.ClientArgs" do
+      oneof :argtype do
+        optional :setup, :message, 1, "grpc.testing.ClientConfig"
+        optional :mark, :message, 2, "grpc.testing.Mark"
+      end
+    end
+    add_message "grpc.testing.ServerConfig" do
+      optional :server_type, :enum, 1, "grpc.testing.ServerType"
+      optional :security_params, :message, 2, "grpc.testing.SecurityParams"
+      optional :port, :int32, 4
+      optional :async_server_threads, :int32, 7
+      optional :core_limit, :int32, 8
+      optional :payload_config, :message, 9, "grpc.testing.PayloadConfig"
+      repeated :core_list, :int32, 10
+      optional :other_server_api, :string, 11
+      optional :threads_per_cq, :int32, 12
+      optional :resource_quota_size, :int32, 1001
+      repeated :channel_args, :message, 1002, "grpc.testing.ChannelArg"
+    end
+    add_message "grpc.testing.ServerArgs" do
+      oneof :argtype do
+        optional :setup, :message, 1, "grpc.testing.ServerConfig"
+        optional :mark, :message, 2, "grpc.testing.Mark"
+      end
+    end
+    add_message "grpc.testing.ServerStatus" do
+      optional :stats, :message, 1, "grpc.testing.ServerStats"
+      optional :port, :int32, 2
+      optional :cores, :int32, 3
+    end
+    add_message "grpc.testing.CoreRequest" do
+    end
+    add_message "grpc.testing.CoreResponse" do
+      optional :cores, :int32, 1
+    end
+    add_message "grpc.testing.Void" do
+    end
+    add_message "grpc.testing.Scenario" do
+      optional :name, :string, 1
+      optional :client_config, :message, 2, "grpc.testing.ClientConfig"
+      optional :num_clients, :int32, 3
+      optional :server_config, :message, 4, "grpc.testing.ServerConfig"
+      optional :num_servers, :int32, 5
+      optional :warmup_seconds, :int32, 6
+      optional :benchmark_seconds, :int32, 7
+      optional :spawn_local_worker_count, :int32, 8
+    end
+    add_message "grpc.testing.Scenarios" do
+      repeated :scenarios, :message, 1, "grpc.testing.Scenario"
+    end
+    add_message "grpc.testing.ScenarioResultSummary" do
+      optional :qps, :double, 1
+      optional :qps_per_server_core, :double, 2
+      optional :server_system_time, :double, 3
+      optional :server_user_time, :double, 4
+      optional :client_system_time, :double, 5
+      optional :client_user_time, :double, 6
+      optional :latency_50, :double, 7
+      optional :latency_90, :double, 8
+      optional :latency_95, :double, 9
+      optional :latency_99, :double, 10
+      optional :latency_999, :double, 11
+      optional :server_cpu_usage, :double, 12
+      optional :successful_requests_per_second, :double, 13
+      optional :failed_requests_per_second, :double, 14
+      optional :client_polls_per_request, :double, 15
+      optional :server_polls_per_request, :double, 16
+      optional :server_queries_per_cpu_sec, :double, 17
+      optional :client_queries_per_cpu_sec, :double, 18
+    end
+    add_message "grpc.testing.ScenarioResult" do
+      optional :scenario, :message, 1, "grpc.testing.Scenario"
+      optional :latencies, :message, 2, "grpc.testing.HistogramData"
+      repeated :client_stats, :message, 3, "grpc.testing.ClientStats"
+      repeated :server_stats, :message, 4, "grpc.testing.ServerStats"
+      repeated :server_cores, :int32, 5
+      optional :summary, :message, 6, "grpc.testing.ScenarioResultSummary"
+      repeated :client_success, :bool, 7
+      repeated :server_success, :bool, 8
+      repeated :request_results, :message, 9, "grpc.testing.RequestResultCount"
+    end
+    add_enum "grpc.testing.ClientType" do
+      value :SYNC_CLIENT, 0
+      value :ASYNC_CLIENT, 1
+      value :OTHER_CLIENT, 2
+      value :CALLBACK_CLIENT, 3
+    end
+    add_enum "grpc.testing.ServerType" do
+      value :SYNC_SERVER, 0
+      value :ASYNC_SERVER, 1
+      value :ASYNC_GENERIC_SERVER, 2
+      value :OTHER_SERVER, 3
+      value :CALLBACK_SERVER, 4
+    end
+    add_enum "grpc.testing.RpcType" do
+      value :UNARY, 0
+      value :STREAMING, 1
+      value :STREAMING_FROM_CLIENT, 2
+      value :STREAMING_FROM_SERVER, 3
+      value :STREAMING_BOTH_WAYS, 4
     end
-  end
-  add_message "grpc.testing.ServerStatus" do
-    optional :stats, :message, 1, "grpc.testing.ServerStats"
-    optional :port, :int32, 2
-    optional :cores, :int32, 3
-  end
-  add_message "grpc.testing.CoreRequest" do
-  end
-  add_message "grpc.testing.CoreResponse" do
-    optional :cores, :int32, 1
-  end
-  add_message "grpc.testing.Void" do
-  end
-  add_message "grpc.testing.Scenario" do
-    optional :name, :string, 1
-    optional :client_config, :message, 2, "grpc.testing.ClientConfig"
-    optional :num_clients, :int32, 3
-    optional :server_config, :message, 4, "grpc.testing.ServerConfig"
-    optional :num_servers, :int32, 5
-    optional :warmup_seconds, :int32, 6
-    optional :benchmark_seconds, :int32, 7
-    optional :spawn_local_worker_count, :int32, 8
-  end
-  add_message "grpc.testing.Scenarios" do
-    repeated :scenarios, :message, 1, "grpc.testing.Scenario"
-  end
-  add_message "grpc.testing.ScenarioResultSummary" do
-    optional :qps, :double, 1
-    optional :qps_per_server_core, :double, 2
-    optional :server_system_time, :double, 3
-    optional :server_user_time, :double, 4
-    optional :client_system_time, :double, 5
-    optional :client_user_time, :double, 6
-    optional :latency_50, :double, 7
-    optional :latency_90, :double, 8
-    optional :latency_95, :double, 9
-    optional :latency_99, :double, 10
-    optional :latency_999, :double, 11
-    optional :server_cpu_usage, :double, 12
-    optional :successful_requests_per_second, :double, 13
-    optional :failed_requests_per_second, :double, 14
-    optional :client_polls_per_request, :double, 15
-    optional :server_polls_per_request, :double, 16
-    optional :server_queries_per_cpu_sec, :double, 17
-    optional :client_queries_per_cpu_sec, :double, 18
-  end
-  add_message "grpc.testing.ScenarioResult" do
-    optional :scenario, :message, 1, "grpc.testing.Scenario"
-    optional :latencies, :message, 2, "grpc.testing.HistogramData"
-    repeated :client_stats, :message, 3, "grpc.testing.ClientStats"
-    repeated :server_stats, :message, 4, "grpc.testing.ServerStats"
-    repeated :server_cores, :int32, 5
-    optional :summary, :message, 6, "grpc.testing.ScenarioResultSummary"
-    repeated :client_success, :bool, 7
-    repeated :server_success, :bool, 8
-    repeated :request_results, :message, 9, "grpc.testing.RequestResultCount"
-  end
-  add_enum "grpc.testing.ClientType" do
-    value :SYNC_CLIENT, 0
-    value :ASYNC_CLIENT, 1
-    value :OTHER_CLIENT, 2
-  end
-  add_enum "grpc.testing.ServerType" do
-    value :SYNC_SERVER, 0
-    value :ASYNC_SERVER, 1
-    value :ASYNC_GENERIC_SERVER, 2
-    value :OTHER_SERVER, 3
-  end
-  add_enum "grpc.testing.RpcType" do
-    value :UNARY, 0
-    value :STREAMING, 1
-    value :STREAMING_FROM_CLIENT, 2
-    value :STREAMING_FROM_SERVER, 3
-    value :STREAMING_BOTH_WAYS, 4
   end
 end
 

src/ruby/qps/src/proto/grpc/testing/messages_pb.rb

@@ -4,62 +4,64 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.testing.BoolValue" do
-    optional :value, :bool, 1
-  end
-  add_message "grpc.testing.Payload" do
-    optional :type, :enum, 1, "grpc.testing.PayloadType"
-    optional :body, :bytes, 2
-  end
-  add_message "grpc.testing.EchoStatus" do
-    optional :code, :int32, 1
-    optional :message, :string, 2
-  end
-  add_message "grpc.testing.SimpleRequest" do
-    optional :response_type, :enum, 1, "grpc.testing.PayloadType"
-    optional :response_size, :int32, 2
-    optional :payload, :message, 3, "grpc.testing.Payload"
-    optional :fill_username, :bool, 4
-    optional :fill_oauth_scope, :bool, 5
-    optional :response_compressed, :message, 6, "grpc.testing.BoolValue"
-    optional :response_status, :message, 7, "grpc.testing.EchoStatus"
-    optional :expect_compressed, :message, 8, "grpc.testing.BoolValue"
-  end
-  add_message "grpc.testing.SimpleResponse" do
-    optional :payload, :message, 1, "grpc.testing.Payload"
-    optional :username, :string, 2
-    optional :oauth_scope, :string, 3
-  end
-  add_message "grpc.testing.StreamingInputCallRequest" do
-    optional :payload, :message, 1, "grpc.testing.Payload"
-    optional :expect_compressed, :message, 2, "grpc.testing.BoolValue"
-  end
-  add_message "grpc.testing.StreamingInputCallResponse" do
-    optional :aggregated_payload_size, :int32, 1
-  end
-  add_message "grpc.testing.ResponseParameters" do
-    optional :size, :int32, 1
-    optional :interval_us, :int32, 2
-    optional :compressed, :message, 3, "grpc.testing.BoolValue"
-  end
-  add_message "grpc.testing.StreamingOutputCallRequest" do
-    optional :response_type, :enum, 1, "grpc.testing.PayloadType"
-    repeated :response_parameters, :message, 2, "grpc.testing.ResponseParameters"
-    optional :payload, :message, 3, "grpc.testing.Payload"
-    optional :response_status, :message, 7, "grpc.testing.EchoStatus"
-  end
-  add_message "grpc.testing.StreamingOutputCallResponse" do
-    optional :payload, :message, 1, "grpc.testing.Payload"
-  end
-  add_message "grpc.testing.ReconnectParams" do
-    optional :max_reconnect_backoff_ms, :int32, 1
-  end
-  add_message "grpc.testing.ReconnectInfo" do
-    optional :passed, :bool, 1
-    repeated :backoff_ms, :int32, 2
-  end
-  add_enum "grpc.testing.PayloadType" do
-    value :COMPRESSABLE, 0
+  add_file("src/proto/grpc/testing/messages.proto", :syntax => :proto3) do
+    add_message "grpc.testing.BoolValue" do
+      optional :value, :bool, 1
+    end
+    add_message "grpc.testing.Payload" do
+      optional :type, :enum, 1, "grpc.testing.PayloadType"
+      optional :body, :bytes, 2
+    end
+    add_message "grpc.testing.EchoStatus" do
+      optional :code, :int32, 1
+      optional :message, :string, 2
+    end
+    add_message "grpc.testing.SimpleRequest" do
+      optional :response_type, :enum, 1, "grpc.testing.PayloadType"
+      optional :response_size, :int32, 2
+      optional :payload, :message, 3, "grpc.testing.Payload"
+      optional :fill_username, :bool, 4
+      optional :fill_oauth_scope, :bool, 5
+      optional :response_compressed, :message, 6, "grpc.testing.BoolValue"
+      optional :response_status, :message, 7, "grpc.testing.EchoStatus"
+      optional :expect_compressed, :message, 8, "grpc.testing.BoolValue"
+    end
+    add_message "grpc.testing.SimpleResponse" do
+      optional :payload, :message, 1, "grpc.testing.Payload"
+      optional :username, :string, 2
+      optional :oauth_scope, :string, 3
+    end
+    add_message "grpc.testing.StreamingInputCallRequest" do
+      optional :payload, :message, 1, "grpc.testing.Payload"
+      optional :expect_compressed, :message, 2, "grpc.testing.BoolValue"
+    end
+    add_message "grpc.testing.StreamingInputCallResponse" do
+      optional :aggregated_payload_size, :int32, 1
+    end
+    add_message "grpc.testing.ResponseParameters" do
+      optional :size, :int32, 1
+      optional :interval_us, :int32, 2
+      optional :compressed, :message, 3, "grpc.testing.BoolValue"
+    end
+    add_message "grpc.testing.StreamingOutputCallRequest" do
+      optional :response_type, :enum, 1, "grpc.testing.PayloadType"
+      repeated :response_parameters, :message, 2, "grpc.testing.ResponseParameters"
+      optional :payload, :message, 3, "grpc.testing.Payload"
+      optional :response_status, :message, 7, "grpc.testing.EchoStatus"
+    end
+    add_message "grpc.testing.StreamingOutputCallResponse" do
+      optional :payload, :message, 1, "grpc.testing.Payload"
+    end
+    add_message "grpc.testing.ReconnectParams" do
+      optional :max_reconnect_backoff_ms, :int32, 1
+    end
+    add_message "grpc.testing.ReconnectInfo" do
+      optional :passed, :bool, 1
+      repeated :backoff_ms, :int32, 2
+    end
+    add_enum "grpc.testing.PayloadType" do
+      value :COMPRESSABLE, 0
+    end
   end
 end
 

src/ruby/qps/src/proto/grpc/testing/payloads_pb.rb

@@ -4,21 +4,23 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.testing.ByteBufferParams" do
-    optional :req_size, :int32, 1
-    optional :resp_size, :int32, 2
-  end
-  add_message "grpc.testing.SimpleProtoParams" do
-    optional :req_size, :int32, 1
-    optional :resp_size, :int32, 2
-  end
-  add_message "grpc.testing.ComplexProtoParams" do
-  end
-  add_message "grpc.testing.PayloadConfig" do
-    oneof :payload do
-      optional :bytebuf_params, :message, 1, "grpc.testing.ByteBufferParams"
-      optional :simple_params, :message, 2, "grpc.testing.SimpleProtoParams"
-      optional :complex_params, :message, 3, "grpc.testing.ComplexProtoParams"
+  add_file("src/proto/grpc/testing/payloads.proto", :syntax => :proto3) do
+    add_message "grpc.testing.ByteBufferParams" do
+      optional :req_size, :int32, 1
+      optional :resp_size, :int32, 2
+    end
+    add_message "grpc.testing.SimpleProtoParams" do
+      optional :req_size, :int32, 1
+      optional :resp_size, :int32, 2
+    end
+    add_message "grpc.testing.ComplexProtoParams" do
+    end
+    add_message "grpc.testing.PayloadConfig" do
+      oneof :payload do
+        optional :bytebuf_params, :message, 1, "grpc.testing.ByteBufferParams"
+        optional :simple_params, :message, 2, "grpc.testing.SimpleProtoParams"
+        optional :complex_params, :message, 3, "grpc.testing.ComplexProtoParams"
+      end
     end
   end
 end

src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_pb.rb

@@ -5,6 +5,8 @@ require 'google/protobuf'
 
 require 'src/proto/grpc/testing/control_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("src/proto/grpc/testing/report_qps_scenario_service.proto", :syntax => :proto3) do
+  end
 end
 
 module Grpc

src/ruby/qps/src/proto/grpc/testing/stats_pb.rb

@@ -5,39 +5,41 @@ require 'google/protobuf'
 
 require 'src/proto/grpc/core/stats_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "grpc.testing.ServerStats" do
-    optional :time_elapsed, :double, 1
-    optional :time_user, :double, 2
-    optional :time_system, :double, 3
-    optional :total_cpu_time, :uint64, 4
-    optional :idle_cpu_time, :uint64, 5
-    optional :cq_poll_count, :uint64, 6
-    optional :core_stats, :message, 7, "grpc.core.Stats"
-  end
-  add_message "grpc.testing.HistogramParams" do
-    optional :resolution, :double, 1
-    optional :max_possible, :double, 2
-  end
-  add_message "grpc.testing.HistogramData" do
-    repeated :bucket, :uint32, 1
-    optional :min_seen, :double, 2
-    optional :max_seen, :double, 3
-    optional :sum, :double, 4
-    optional :sum_of_squares, :double, 5
-    optional :count, :double, 6
-  end
-  add_message "grpc.testing.RequestResultCount" do
-    optional :status_code, :int32, 1
-    optional :count, :int64, 2
-  end
-  add_message "grpc.testing.ClientStats" do
-    optional :latencies, :message, 1, "grpc.testing.HistogramData"
-    optional :time_elapsed, :double, 2
-    optional :time_user, :double, 3
-    optional :time_system, :double, 4
-    repeated :request_results, :message, 5, "grpc.testing.RequestResultCount"
-    optional :cq_poll_count, :uint64, 6
-    optional :core_stats, :message, 7, "grpc.core.Stats"
+  add_file("src/proto/grpc/testing/stats.proto", :syntax => :proto3) do
+    add_message "grpc.testing.ServerStats" do
+      optional :time_elapsed, :double, 1
+      optional :time_user, :double, 2
+      optional :time_system, :double, 3
+      optional :total_cpu_time, :uint64, 4
+      optional :idle_cpu_time, :uint64, 5
+      optional :cq_poll_count, :uint64, 6
+      optional :core_stats, :message, 7, "grpc.core.Stats"
+    end
+    add_message "grpc.testing.HistogramParams" do
+      optional :resolution, :double, 1
+      optional :max_possible, :double, 2
+    end
+    add_message "grpc.testing.HistogramData" do
+      repeated :bucket, :uint32, 1
+      optional :min_seen, :double, 2
+      optional :max_seen, :double, 3
+      optional :sum, :double, 4
+      optional :sum_of_squares, :double, 5
+      optional :count, :double, 6
+    end
+    add_message "grpc.testing.RequestResultCount" do
+      optional :status_code, :int32, 1
+      optional :count, :int64, 2
+    end
+    add_message "grpc.testing.ClientStats" do
+      optional :latencies, :message, 1, "grpc.testing.HistogramData"
+      optional :time_elapsed, :double, 2
+      optional :time_user, :double, 3
+      optional :time_system, :double, 4
+      repeated :request_results, :message, 5, "grpc.testing.RequestResultCount"
+      optional :cq_poll_count, :uint64, 6
+      optional :core_stats, :message, 7, "grpc.core.Stats"
+    end
   end
 end
 

src/ruby/qps/src/proto/grpc/testing/worker_service_pb.rb

@@ -5,6 +5,8 @@ require 'google/protobuf'
 
 require 'src/proto/grpc/testing/control_pb'
 Google::Protobuf::DescriptorPool.generated_pool.build do
+  add_file("src/proto/grpc/testing/worker_service.proto", :syntax => :proto3) do
+  end
 end
 
 module Grpc

templates/grpc.gemspec.template

@@ -31,7 +31,7 @@
     s.require_paths = %w( src/ruby/lib src/ruby/bin src/ruby/pb )
     s.platform      = Gem::Platform::RUBY
 
-    s.add_dependency 'google-protobuf', '~> 3.1'
+    s.add_dependency 'google-protobuf', '~> 3.7'
     s.add_dependency 'googleapis-common-protos-types', '~> 1.0.0'
 
     s.add_development_dependency 'bundler',            '~> 1.9'

templates/src/csharp/Grpc.Core/Version.csproj.include.template

@@ -4,6 +4,6 @@
   <Project>
     <PropertyGroup>
       <GrpcCsharpVersion>${settings.csharp_version}</GrpcCsharpVersion>
-      <GoogleProtobufVersion>3.6.1</GoogleProtobufVersion>
+      <GoogleProtobufVersion>3.7.0</GoogleProtobufVersion>
     </PropertyGroup>
   </Project>

third_party/protobuf

@@ -1 +1 @@
-Subproject commit 48cb18e5c419ddd23d9badcfe4e9df7bde1979b2
+Subproject commit 582743bf40c5d3639a70f98f183914a2c0cd0680

tools/run_tests/sanity/check_submodules.sh

@@ -38,7 +38,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
  ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0)
  6599cac0965be8e5a835ab7a5684bbef033d5ad0 third_party/libcxx (heads/release_60)
  9245d481eb3e890f708ff2d7dadf2a10c04748ba third_party/libcxxabi (heads/release_60)
- 48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 third_party/protobuf (v3.6.0.1-37-g48cb18e5)
+ 582743bf40c5d3639a70f98f183914a2c0cd0680 third_party/protobuf (v3.7.0-rc.2-20-g582743bf)
  e143189bf6f37b3957fb31743df6a1bcf4a8c685 third_party/protoc-gen-validate (v0.0.10)
  9ce4a77f61c134bbed28bfd5be5cd7dc0e80f5e3 third_party/upb (heads/upbc-cpp)
  cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11)