all: update to proto 3.5.0

.travis.yml

@@ -5,7 +5,7 @@ language: java
 env:
   global:
     - GRADLE_OPTS=-Xmx512m
-    - PROTOBUF_VERSION=3.4.0
+    - PROTOBUF_VERSION=3.5.0
     - LDFLAGS=-L/tmp/protobuf/lib
     - CXXFLAGS=-I/tmp/protobuf/include
     - LD_LIBRARY_PATH=/tmp/protobuf/lib

COMPILING.md

@@ -33,7 +33,7 @@ For Linux, Mac and MinGW:
 ```
 $ git clone https://github.com/google/protobuf.git
 $ cd protobuf
-$ git checkout v3.4.0
+$ git checkout v3.5.0
 $ ./autogen.sh
 $ ./configure
 $ make
@@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for
 Gradle to find protobuf:
 ```
 .\gradlew install ^
-    -PvcProtobufInclude=C:\path\to\protobuf-3.4.0\src ^
+    -PvcProtobufInclude=C:\path\to\protobuf-3.5.0\src ^
-    -PvcProtobufLibs=C:\path\to\protobuf-3.4.0\vsprojects\Release ^
+    -PvcProtobufLibs=C:\path\to\protobuf-3.5.0\vsprojects\Release ^
     -PtargetArch=x86_32
 ```
 
 Since specifying those properties every build is bothersome, you can instead
 create ``<project-root>\gradle.properties`` with contents like:
 ```
-vcProtobufInclude=C:\\path\\to\\protobuf-3.4.0\\src
+vcProtobufInclude=C:\\path\\to\\protobuf-3.5.0\\src
-vcProtobufLibs=C:\\path\\to\\protobuf-3.4.0\\vsprojects\\Release
+vcProtobufLibs=C:\\path\\to\\protobuf-3.5.0\\vsprojects\\Release
 targetArch=x86_32
 ```
 

README.md

@@ -85,7 +85,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
       <artifactId>protobuf-maven-plugin</artifactId>
       <version>0.5.0</version>
       <configuration>
-        <protocArtifact>com.google.protobuf:protoc:3.4.0:exe:${os.detected.classifier}</protocArtifact>
+        <protocArtifact>com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
         <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
@@ -123,7 +123,7 @@ buildscript {
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:3.4.0"
+    artifact = "com.google.protobuf:protoc:3.5.0"
   }
   plugins {
     grpc {

android-interop-testing/app/build.gradle

@@ -30,7 +30,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.4.0'
+        artifact = 'com.google.protobuf:protoc:3.5.0'
     }
     plugins {
         grpc {

benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java

@@ -432,6 +432,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -903,6 +906,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -1320,6 +1326,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2202,6 +2211,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2803,6 +2815,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3846,6 +3861,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6457,6 +6475,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7037,6 +7058,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7528,6 +7552,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8531,6 +8558,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10121,6 +10151,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -11015,6 +11048,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -11727,6 +11763,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -12121,6 +12160,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12579,6 +12621,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -13086,6 +13131,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -14481,6 +14529,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -15355,6 +15406,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -17145,6 +17199,9 @@ public final class Control {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -20158,7 +20215,7 @@ public final class Control {
       "ad\"C\n\016SecurityParams\022\023\n\013use_test_ca\030\001 \001(" +
       "\010\022\034\n\024server_host_override\030\002 \001(\t\"M\n\nChann" +
       "elArg\022\014\n\004name\030\001 \001(\t\022\023\n\tstr_value\030\002 \001(\tH\000" +
-      "\022\023\n\tint_value\030\003 \001(\005H\000B\007\n\005value\"\275\004\n\014Clien",
+      "\022\023\n\tint_value\030\003 \001(\005H\000B\007\n\005value\"\275\004\n\014Clien" +
       "tConfig\022\026\n\016server_targets\030\001 \003(\t\022-\n\013clien" +
       "t_type\030\002 \001(\0162\030.grpc.testing.ClientType\0225" +
       "\n\017security_params\030\003 \001(\0132\034.grpc.testing.S" +
@@ -20168,7 +20225,7 @@ public final class Control {
       " \001(\0162\025.grpc.testing.RpcType\022-\n\013load_para" +
       "ms\030\n \001(\0132\030.grpc.testing.LoadParams\0223\n\016pa" +
       "yload_config\030\013 \001(\0132\033.grpc.testing.Payloa" +
-      "dConfig\0227\n\020histogram_params\030\014 \001(\0132\035.grpc",
+      "dConfig\0227\n\020histogram_params\030\014 \001(\0132\035.grpc" +
       ".testing.HistogramParams\022\021\n\tcore_list\030\r " +
       "\003(\005\022\022\n\ncore_limit\030\016 \001(\005\022\030\n\020other_client_" +
       "api\030\017 \001(\t\022.\n\014channel_args\030\020 \003(\0132\030.grpc.t" +
@@ -20178,7 +20235,7 @@ public final class Control {
       "t\030\001 \001(\010\"h\n\nClientArgs\022+\n\005setup\030\001 \001(\0132\032.g" +
       "rpc.testing.ClientConfigH\000\022\"\n\004mark\030\002 \001(\013" +
       "2\022.grpc.testing.MarkH\000B\t\n\007argtype\"\264\002\n\014Se" +
-      "rverConfig\022-\n\013server_type\030\001 \001(\0162\030.grpc.t",
+      "rverConfig\022-\n\013server_type\030\001 \001(\0162\030.grpc.t" +
       "esting.ServerType\0225\n\017security_params\030\002 \001" +
       "(\0132\034.grpc.testing.SecurityParams\022\014\n\004port" +
       "\030\004 \001(\005\022\034\n\024async_server_threads\030\007 \001(\005\022\022\n\n" +
@@ -20188,7 +20245,7 @@ public final class Control {
       "source_quota_size\030\351\007 \001(\005\"h\n\nServerArgs\022+" +
       "\n\005setup\030\001 \001(\0132\032.grpc.testing.ServerConfi" +
       "gH\000\022\"\n\004mark\030\002 \001(\0132\022.grpc.testing.MarkH\000B" +
-      "\t\n\007argtype\"U\n\014ServerStatus\022(\n\005stats\030\001 \001(",
+      "\t\n\007argtype\"U\n\014ServerStatus\022(\n\005stats\030\001 \001(" +
       "\0132\031.grpc.testing.ServerStats\022\014\n\004port\030\002 \001" +
       "(\005\022\r\n\005cores\030\003 \001(\005\"\r\n\013CoreRequest\"\035\n\014Core" +
       "Response\022\r\n\005cores\030\001 \001(\005\"\006\n\004Void\"\375\001\n\010Scen" +
@@ -20198,7 +20255,7 @@ public final class Control {
       ".testing.ServerConfig\022\023\n\013num_servers\030\005 \001" +
       "(\005\022\026\n\016warmup_seconds\030\006 \001(\005\022\031\n\021benchmark_" +
       "seconds\030\007 \001(\005\022 \n\030spawn_local_worker_coun" +
-      "t\030\010 \001(\005\"6\n\tScenarios\022)\n\tscenarios\030\001 \003(\0132",
+      "t\030\010 \001(\005\"6\n\tScenarios\022)\n\tscenarios\030\001 \003(\0132" +
       "\026.grpc.testing.Scenario\"\274\003\n\025ScenarioResu" +
       "ltSummary\022\013\n\003qps\030\001 \001(\001\022\033\n\023qps_per_server" +
       "_core\030\002 \001(\001\022\032\n\022server_system_time\030\003 \001(\001\022" +
@@ -20208,7 +20265,7 @@ public final class Control {
       "\022\n\nlatency_95\030\t \001(\001\022\022\n\nlatency_99\030\n \001(\001\022" +
       "\023\n\013latency_999\030\013 \001(\001\022\030\n\020server_cpu_usage" +
       "\030\014 \001(\001\022&\n\036successful_requests_per_second" +
-      "\030\r \001(\001\022\"\n\032failed_requests_per_second\030\016 \001",
+      "\030\r \001(\001\022\"\n\032failed_requests_per_second\030\016 \001" +
       "(\001\022 \n\030client_polls_per_request\030\017 \001(\001\022 \n\030" +
       "server_polls_per_request\030\020 \001(\001\"\203\003\n\016Scena" +
       "rioResult\022(\n\010scenario\030\001 \001(\0132\026.grpc.testi" +
@@ -20218,7 +20275,7 @@ public final class Control {
       "tats\030\004 \003(\0132\031.grpc.testing.ServerStats\022\024\n" +
       "\014server_cores\030\005 \003(\005\0224\n\007summary\030\006 \001(\0132#.g" +
       "rpc.testing.ScenarioResultSummary\022\026\n\016cli" +
-      "ent_success\030\007 \003(\010\022\026\n\016server_success\030\010 \003(",
+      "ent_success\030\007 \003(\010\022\026\n\016server_success\030\010 \003(" +
       "\010\0229\n\017request_results\030\t \003(\0132 .grpc.testin" +
       "g.RequestResultCount*A\n\nClientType\022\017\n\013SY" +
       "NC_CLIENT\020\000\022\020\n\014ASYNC_CLIENT\020\001\022\020\n\014OTHER_C" +

benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java

@@ -161,6 +161,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -660,6 +663,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1264,6 +1270,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2002,6 +2011,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3757,6 +3769,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4753,6 +4768,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5650,6 +5668,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6171,6 +6192,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7100,6 +7124,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8553,6 +8580,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9182,6 +9212,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9655,6 +9688,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10316,7 +10352,7 @@ public final class Messages {
       "\rresponse_size\030\002 \001(\005\022&\n\007payload\030\003 \001(\0132\025." +
       "grpc.testing.Payload\022\025\n\rfill_username\030\004 " +
       "\001(\010\022\030\n\020fill_oauth_scope\030\005 \001(\010\0224\n\023respons" +
-      "e_compressed\030\006 \001(\0132\027.grpc.testing.BoolVa",
+      "e_compressed\030\006 \001(\0132\027.grpc.testing.BoolVa" +
       "lue\0221\n\017response_status\030\007 \001(\0132\030.grpc.test" +
       "ing.EchoStatus\0222\n\021expect_compressed\030\010 \001(" +
       "\0132\027.grpc.testing.BoolValue\"_\n\016SimpleResp" +
@@ -10326,7 +10362,7 @@ public final class Messages {
       "oad\030\001 \001(\0132\025.grpc.testing.Payload\0222\n\021expe" +
       "ct_compressed\030\002 \001(\0132\027.grpc.testing.BoolV" +
       "alue\"=\n\032StreamingInputCallResponse\022\037\n\027ag" +
-      "gregated_payload_size\030\001 \001(\005\"d\n\022ResponseP",
+      "gregated_payload_size\030\001 \001(\005\"d\n\022ResponseP" +
       "arameters\022\014\n\004size\030\001 \001(\005\022\023\n\013interval_us\030\002" +
       " \001(\005\022+\n\ncompressed\030\003 \001(\0132\027.grpc.testing." +
       "BoolValue\"\350\001\n\032StreamingOutputCallRequest" +
@@ -10336,7 +10372,7 @@ public final class Messages {
       "load\030\003 \001(\0132\025.grpc.testing.Payload\0221\n\017res" +
       "ponse_status\030\007 \001(\0132\030.grpc.testing.EchoSt" +
       "atus\"E\n\033StreamingOutputCallResponse\022&\n\007p" +
-      "ayload\030\001 \001(\0132\025.grpc.testing.Payload\"3\n\017R",
+      "ayload\030\001 \001(\0132\025.grpc.testing.Payload\"3\n\017R" +
       "econnectParams\022 \n\030max_reconnect_backoff_" +
       "ms\030\001 \001(\005\"3\n\rReconnectInfo\022\016\n\006passed\030\001 \001(" +
       "\010\022\022\n\nbackoff_ms\030\002 \003(\005*\037\n\013PayloadType\022\020\n\014" +

benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java

@@ -55,6 +55,9 @@ public final class Payloads {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -566,6 +569,9 @@ public final class Payloads {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1070,6 +1076,9 @@ public final class Payloads {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -1500,6 +1509,9 @@ public final class Payloads {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2574,7 +2586,7 @@ public final class Payloads {
       "sH\000\0228\n\rsimple_params\030\002 \001(\0132\037.grpc.testin" +
       "g.SimpleProtoParamsH\000\022:\n\016complex_params\030" +
       "\003 \001(\0132 .grpc.testing.ComplexProtoParamsH" +
-      "\000B\t\n\007payloadB$\n\030io.grpc.benchmarks.proto",
+      "\000B\t\n\007payloadB$\n\030io.grpc.benchmarks.proto" +
       "B\010Payloadsb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =

benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java

@@ -32,7 +32,7 @@ public final class Services {
       "nse(\0010\001\022R\n\023StreamingFromClient\022\033.grpc.te" +
       "sting.SimpleRequest\032\034.grpc.testing.Simpl" +
       "eResponse(\001\022R\n\023StreamingFromServer\022\033.grp" +
-      "c.testing.SimpleRequest\032\034.grpc.testing.S",
+      "c.testing.SimpleRequest\032\034.grpc.testing.S" +
       "impleResponse0\001\022R\n\021StreamingBothWays\022\033.g" +
       "rpc.testing.SimpleRequest\032\034.grpc.testing" +
       ".SimpleResponse(\0010\0012\227\002\n\rWorkerService\022E\n" +
@@ -42,7 +42,7 @@ public final class Services {
       "ng.ClientStatus(\0010\001\022B\n\tCoreCount\022\031.grpc." +
       "testing.CoreRequest\032\032.grpc.testing.CoreR" +
       "esponse\0224\n\nQuitWorker\022\022.grpc.testing.Voi" +
-      "d\032\022.grpc.testing.Void2^\n\030ReportQpsScenar",
+      "d\032\022.grpc.testing.Void2^\n\030ReportQpsScenar" +
       "ioService\022B\n\016ReportScenario\022\034.grpc.testi" +
       "ng.ScenarioResult\032\022.grpc.testing.VoidB$\n" +
       "\030io.grpc.benchmarks.protoB\010Servicesb\006pro" +

benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java

@@ -104,6 +104,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -967,6 +970,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1556,6 +1562,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2420,6 +2429,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3022,6 +3034,9 @@ public final class Stats {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4359,7 +4374,7 @@ public final class Stats {
       "HistogramData\022\016\n\006bucket\030\001 \003(\r\022\020\n\010min_see" +
       "n\030\002 \001(\001\022\020\n\010max_seen\030\003 \001(\001\022\013\n\003sum\030\004 \001(\001\022\026" +
       "\n\016sum_of_squares\030\005 \001(\001\022\r\n\005count\030\006 \001(\001\"8\n" +
-      "\022RequestResultCount\022\023\n\013status_code\030\001 \001(\005",
+      "\022RequestResultCount\022\023\n\013status_code\030\001 \001(\005" +
       "\022\r\n\005count\030\002 \001(\003\"\315\001\n\013ClientStats\022.\n\tlaten" +
       "cies\030\001 \001(\0132\033.grpc.testing.HistogramData\022" +
       "\024\n\014time_elapsed\030\002 \001(\001\022\021\n\ttime_user\030\003 \001(\001" +

build.gradle

@@ -98,7 +98,7 @@ subprojects {
 
         nettyVersion = '4.1.17.Final'
         guavaVersion = '19.0'
-        protobufVersion = '3.4.0'
+        protobufVersion = '3.5.0'
         protocVersion = protobufVersion
         protobufNanoVersion = '3.0.0-alpha-5'
 

buildscripts/kokoro/unix.sh

@@ -7,7 +7,7 @@
 set -exu -o pipefail
 
 export GRADLE_OPTS=-Xmx512m
-export PROTOBUF_VERSION=3.4.0
+export PROTOBUF_VERSION=3.5.0
 export LDFLAGS=-L/tmp/protobuf/lib
 export CXXFLAGS=-I/tmp/protobuf/include
 export LD_LIBRARY_PATH=/tmp/protobuf/lib

buildscripts/make_dependencies.bat

@@ -4,7 +4,7 @@ REM 7za is in http://www.7-zip.org/a/7z1507-extra.7z
 REM Prerequisite:
 REM   7za.exe in current directory or PATH
 
-set PROTOBUF_VER=3.4.0
+set PROTOBUF_VER=3.5.0
 set CMAKE_NAME=cmake-3.3.2-win32-x86
 
 if not exist "protobuf-%PROTOBUF_VER%\cmake\build\Release\" (

compiler/Dockerfile

@@ -2,7 +2,7 @@ FROM protoc-artifacts:latest
 
 RUN scl enable devtoolset-1.1 'bash -c "cd /protobuf && \
     git fetch && \
-    git checkout v3.4.0 && \
+    git checkout v3.5.0 && \
     ./autogen.sh && \
     CXXFLAGS=-m32 ./configure --disable-shared --prefix=/protobuf-32 && \
     make clean && make -j$(nproc) && make -j$(nproc) install"'

examples/android/helloworld/app/build.gradle

@@ -28,7 +28,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.4.0'
+        artifact = 'com.google.protobuf:protoc:3.5.0'
     }
     plugins {
         javalite {

examples/android/routeguide/app/build.gradle

@@ -25,7 +25,7 @@ android {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.4.0'
+        artifact = 'com.google.protobuf:protoc:3.5.0'
     }
     plugins {
         javalite {

examples/build.gradle

@@ -37,7 +37,7 @@ dependencies {
 
 protobuf {
   protoc {
-    artifact = 'com.google.protobuf:protoc:3.4.0'
+    artifact = 'com.google.protobuf:protoc:3.5.0'
   }
   plugins {
     grpc {

examples/pom.xml

@@ -67,7 +67,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.5.0</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:3.4.0:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:3.5.0:exe:${os.detected.classifier}</protocArtifact>
           <pluginId>grpc-java</pluginId>
           <pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
         </configuration>

grpclb/src/generated/main/java/io/grpc/grpclb/ClientStats.java

@@ -38,6 +38,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

grpclb/src/generated/main/java/io/grpc/grpclb/ClientStatsPerToken.java

@@ -34,6 +34,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceRequest.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

grpclb/src/generated/main/java/io/grpc/grpclb/InitialLoadBalanceResponse.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceRequest.java

@@ -28,6 +28,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalanceResponse.java

@@ -28,6 +28,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

grpclb/src/generated/main/java/io/grpc/grpclb/LoadBalancerProto.java

@@ -72,7 +72,7 @@ public final class LoadBalancerProto {
       "load_balance_request_type\")\n\031InitialLoad" +
       "BalanceRequest\022\014\n\004name\030\001 \001(\t\"D\n\023ClientSt" +
       "atsPerToken\022\032\n\022load_balance_token\030\001 \001(\t\022" +
-      "\021\n\tnum_calls\030\002 \001(\003\"\244\002\n\013ClientStats\022-\n\tti",
+      "\021\n\tnum_calls\030\002 \001(\003\"\244\002\n\013ClientStats\022-\n\tti" +
       "mestamp\030\001 \001(\0132\032.google.protobuf.Timestam" +
       "p\022\031\n\021num_calls_started\030\002 \001(\003\022\032\n\022num_call" +
       "s_finished\030\003 \001(\003\0225\n-num_calls_finished_w" +
@@ -82,7 +82,7 @@ public final class LoadBalancerProto {
       "1.ClientStatsPerTokenJ\004\010\004\020\005J\004\010\005\020\006\"\246\001\n\023Lo" +
       "adBalanceResponse\022B\n\020initial_response\030\001 " +
       "\001(\0132&.grpc.lb.v1.InitialLoadBalanceRespo" +
-      "nseH\000\022-\n\013server_list\030\002 \001(\0132\026.grpc.lb.v1.",
+      "nseH\000\022-\n\013server_list\030\002 \001(\0132\026.grpc.lb.v1." +
       "ServerListH\000B\034\n\032load_balance_response_ty" +
       "pe\"}\n\032InitialLoadBalanceResponse\022\036\n\026load" +
       "_balancer_delegate\030\001 \001(\t\022?\n\034client_stats" +
@@ -92,7 +92,7 @@ public final class LoadBalancerProto {
       "ip_address\030\001 \001(\014\022\014\n\004port\030\002 \001(\005\022\032\n\022load_b" +
       "alance_token\030\003 \001(\t\022\014\n\004drop\030\004 \001(\010J\004\010\005\020\0062b" +
       "\n\014LoadBalancer\022R\n\013BalanceLoad\022\036.grpc.lb." +
-      "v1.LoadBalanceRequest\032\037.grpc.lb.v1.LoadB",
+      "v1.LoadBalanceRequest\032\037.grpc.lb.v1.LoadB" +
       "alanceResponse(\0010\001B%\n\016io.grpc.grpclbB\021Lo" +
       "adBalancerProtoP\001b\006proto3"
     };

grpclb/src/generated/main/java/io/grpc/grpclb/Server.java

@@ -37,6 +37,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

grpclb/src/generated/main/java/io/grpc/grpclb/ServerList.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

interop-testing/src/generated/main/java/com/google/protobuf/EmptyProtos.java

@@ -52,6 +52,9 @@ public final class EmptyProtos {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {

interop-testing/src/generated/main/java/io/grpc/testing/integration/Messages.java

@@ -213,6 +213,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -817,6 +820,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1555,6 +1561,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3310,6 +3319,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4254,6 +4266,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4828,6 +4843,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5725,6 +5743,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6246,6 +6267,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7175,6 +7199,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8628,6 +8655,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9257,6 +9287,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9730,6 +9763,9 @@ public final class Messages {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10391,7 +10427,7 @@ public final class Messages {
       "(\0162\031.grpc.testing.PayloadType\022\025\n\rrespons" +
       "e_size\030\002 \001(\005\022&\n\007payload\030\003 \001(\0132\025.grpc.tes" +
       "ting.Payload\022\025\n\rfill_username\030\004 \001(\010\022\030\n\020f" +
-      "ill_oauth_scope\030\005 \001(\010\0227\n\023response_compre",
+      "ill_oauth_scope\030\005 \001(\010\0227\n\023response_compre" +
       "ssed\030\006 \001(\0132\032.google.protobuf.BoolValue\0221" +
       "\n\017response_status\030\007 \001(\0132\030.grpc.testing.E" +
       "choStatus\0225\n\021expect_compressed\030\010 \001(\0132\032.g" +
@@ -10401,7 +10437,7 @@ public final class Messages {
       "\t\"\036\n\rSimpleContext\022\r\n\005value\030\001 \001(\t\"z\n\031Str" +
       "eamingInputCallRequest\022&\n\007payload\030\001 \001(\0132" +
       "\025.grpc.testing.Payload\0225\n\021expect_compres" +
-      "sed\030\002 \001(\0132\032.google.protobuf.BoolValue\"=\n",
+      "sed\030\002 \001(\0132\032.google.protobuf.BoolValue\"=\n" +
       "\032StreamingInputCallResponse\022\037\n\027aggregate" +
       "d_payload_size\030\001 \001(\005\"g\n\022ResponseParamete" +
       "rs\022\014\n\004size\030\001 \001(\005\022\023\n\013interval_us\030\002 \001(\005\022.\n" +
@@ -10411,7 +10447,7 @@ public final class Messages {
       "adType\022=\n\023response_parameters\030\002 \003(\0132 .gr" +
       "pc.testing.ResponseParameters\022&\n\007payload" +
       "\030\003 \001(\0132\025.grpc.testing.Payload\0221\n\017respons" +
-      "e_status\030\007 \001(\0132\030.grpc.testing.EchoStatus",
+      "e_status\030\007 \001(\0132\030.grpc.testing.EchoStatus" +
       "\"E\n\033StreamingOutputCallResponse\022&\n\007paylo" +
       "ad\030\001 \001(\0132\025.grpc.testing.Payload\"3\n\017Recon" +
       "nectParams\022 \n\030max_reconnect_backoff_ms\030\001" +

interop-testing/src/generated/main/java/io/grpc/testing/integration/Metrics.java

@@ -80,6 +80,9 @@ public final class Metrics {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -980,6 +983,9 @@ public final class Metrics {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1495,6 +1501,9 @@ public final class Metrics {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -1883,7 +1892,7 @@ public final class Metrics {
       "llGauges\022\032.grpc.testing.EmptyMessage\032\033.g" +
       "rpc.testing.GaugeResponse0\001\022C\n\010GetGauge\022" +
       "\032.grpc.testing.GaugeRequest\032\033.grpc.testi" +
-      "ng.GaugeResponseB\035\n\033io.grpc.testing.inte",
+      "ng.GaugeResponseB\035\n\033io.grpc.testing.inte" +
       "grationb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =

interop-testing/src/generated/main/java/io/grpc/testing/integration/Test.java

@@ -32,7 +32,7 @@ public final class Test {
       "impleRequest\032\034.grpc.testing.SimpleRespon" +
       "se\022O\n\022CacheableUnaryCall\022\033.grpc.testing." +
       "SimpleRequest\032\034.grpc.testing.SimpleRespo" +
-      "nse\022l\n\023StreamingOutputCall\022(.grpc.testin",
+      "nse\022l\n\023StreamingOutputCall\022(.grpc.testin" +
       "g.StreamingOutputCallRequest\032).grpc.test" +
       "ing.StreamingOutputCallResponse0\001\022i\n\022Str" +
       "eamingInputCall\022\'.grpc.testing.Streaming" +
@@ -42,7 +42,7 @@ public final class Test {
       "\032).grpc.testing.StreamingOutputCallRespo" +
       "nse(\0010\001\022i\n\016HalfDuplexCall\022(.grpc.testing" +
       ".StreamingOutputCallRequest\032).grpc.testi" +
-      "ng.StreamingOutputCallResponse(\0010\001\022=\n\021Un",
+      "ng.StreamingOutputCallResponse(\0010\001\022=\n\021Un" +
       "implementedCall\022\023.grpc.testing.Empty\032\023.g" +
       "rpc.testing.Empty2U\n\024UnimplementedServic" +
       "e\022=\n\021UnimplementedCall\022\023.grpc.testing.Em" +

repositories.bzl

@@ -139,8 +139,8 @@ def com_google_protobuf():
   native.http_archive(
       name = "com_google_protobuf",
       sha256 = "542703acadc3f690d998f4641e1b988f15ba57ebca05fdfb1cd9095bec007948",
-      strip_prefix = "protobuf-3.4.0",
+      strip_prefix = "protobuf-3.5.0",
-      urls = ["https://github.com/google/protobuf/archive/v3.4.0.zip"],
+      urls = ["https://github.com/google/protobuf/archive/v3.5.0.zip"],
   )
 
 def com_google_protobuf_java():
@@ -149,8 +149,8 @@ def com_google_protobuf_java():
   native.http_archive(
       name = "com_google_protobuf_java",
       sha256 = "542703acadc3f690d998f4641e1b988f15ba57ebca05fdfb1cd9095bec007948",
-      strip_prefix = "protobuf-3.4.0",
+      strip_prefix = "protobuf-3.5.0",
-      urls = ["https://github.com/google/protobuf/archive/v3.4.0.zip"],
+      urls = ["https://github.com/google/protobuf/archive/v3.5.0.zip"],
   )
 
 def com_google_protobuf_nano_protobuf_javanano():

services/src/generated/main/java/com/google/instrumentation/stats/proto/CensusProto.java

@@ -69,6 +69,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -650,6 +653,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1269,6 +1275,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1646,6 +1655,9 @@ public final class CensusProto {
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3587,6 +3599,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3746,6 +3761,9 @@ public final class CensusProto {
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5852,6 +5870,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6676,6 +6697,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6820,6 +6844,9 @@ public final class CensusProto {
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8851,6 +8878,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -9826,6 +9856,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -10598,6 +10631,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -12259,6 +12295,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -13576,6 +13615,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -14476,6 +14518,9 @@ public final class CensusProto {
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -15559,7 +15604,7 @@ public final class CensusProto {
       "umentation.MeasurementDescriptor.Measure" +
       "mentUnit\032\276\001\n\017MeasurementUnit\022\017\n\007power10\030" +
       "\001 \001(\005\022K\n\nnumerators\030\002 \003(\01627.google.instr" +
-      "umentation.MeasurementDescriptor.BasicUn",
+      "umentation.MeasurementDescriptor.BasicUn" +
       "it\022M\n\014denominators\030\003 \003(\01627.google.instru" +
       "mentation.MeasurementDescriptor.BasicUni" +
       "t\"`\n\tBasicUnit\022\013\n\007UNKNOWN\020\000\022\n\n\006SCALAR\020\001\022" +
@@ -15569,7 +15614,7 @@ public final class CensusProto {
       "sum\030\003 \001(\001\022D\n\005range\030\004 \001(\01325.google.instru" +
       "mentation.DistributionAggregation.Range\022" +
       "\025\n\rbucket_counts\030\005 \003(\003\022)\n\004tags\030\006 \003(\0132\033.g" +
-      "oogle.instrumentation.Tag\032!\n\005Range\022\013\n\003mi",
+      "oogle.instrumentation.Tag\032!\n\005Range\022\013\n\003mi" +
       "n\030\001 \001(\001\022\013\n\003max\030\002 \001(\001\":\n!DistributionAggr" +
       "egationDescriptor\022\025\n\rbucket_bounds\030\001 \003(\001" +
       "\"\352\001\n\023IntervalAggregation\022G\n\tintervals\030\001 " +
@@ -15579,7 +15624,7 @@ public final class CensusProto {
       "rval_size\030\001 \001(\0132 .google.instrumentation" +
       ".Duration\022\r\n\005count\030\002 \001(\001\022\013\n\003sum\030\003 \001(\001\"r\n" +
       "\035IntervalAggregationDescriptor\022\027\n\017n_sub_" +
-      "intervals\030\001 \001(\005\0228\n\016interval_sizes\030\002 \003(\0132",
+      "intervals\030\001 \001(\005\0228\n\016interval_sizes\030\002 \003(\0132" +
       " .google.instrumentation.Duration\"!\n\003Tag" +
       "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"\257\002\n\016ViewDes" +
       "criptor\022\014\n\004name\030\001 \001(\t\022\023\n\013description\030\002 \001" +
@@ -15589,7 +15634,7 @@ public final class CensusProto {
       "ptorH\000\022]\n\030distribution_aggregation\030\005 \001(\013" +
       "29.google.instrumentation.DistributionAg" +
       "gregationDescriptorH\000\022\020\n\010tag_keys\030\006 \003(\tB" +
-      "\r\n\013aggregation\"\273\001\n\020DistributionView\022E\n\014a",
+      "\r\n\013aggregation\"\273\001\n\020DistributionView\022E\n\014a" +
       "ggregations\030\001 \003(\0132/.google.instrumentati" +
       "on.DistributionAggregation\0220\n\005start\030\002 \001(" +
       "\0132!.google.instrumentation.Timestamp\022.\n\003" +
@@ -15599,7 +15644,7 @@ public final class CensusProto {
       "egation\"\247\001\n\004View\022\021\n\tview_name\030\001 \001(\t\022E\n\021d" +
       "istribution_view\030\002 \001(\0132(.google.instrume" +
       "ntation.DistributionViewH\000\022=\n\rinterval_v" +
-      "iew\030\003 \001(\0132$.google.instrumentation.Inter",
+      "iew\030\003 \001(\0132$.google.instrumentation.Inter" +
       "valViewH\000B\006\n\004viewB5\n&com.google.instrume" +
       "ntation.stats.protoB\013CensusProtob\006proto3"
     };

services/src/generated/main/java/io/grpc/health/v1/HealthCheckRequest.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/health/v1/HealthCheckResponse.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CanonicalRpcStats.java

@@ -32,6 +32,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/instrumentation/v1alpha/CustomMonitoringData.java

@@ -32,6 +32,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/instrumentation/v1alpha/MonitoringDataGroup.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/instrumentation/v1alpha/MonitoringProto.java

@@ -67,7 +67,7 @@ public final class MonitoringProto {
       "on.v1alpha.StatsResponse\022N\n\031rpc_client_c" +
       "ompleted_rpcs\030\002 \001(\0132+.grpc.instrumentati" +
       "on.v1alpha.StatsResponse\022L\n\027rpc_client_s" +
-      "tarted_rpcs\030\003 \001(\0132+.grpc.instrumentation",
+      "tarted_rpcs\030\003 \001(\0132+.grpc.instrumentation" +
       ".v1alpha.StatsResponse\022L\n\027rpc_client_ela" +
       "psed_time\030\004 \001(\0132+.grpc.instrumentation.v" +
       "1alpha.StatsResponse\022S\n\036rpc_client_serve" +
@@ -77,7 +77,7 @@ public final class MonitoringProto {
       "on.v1alpha.StatsResponse\022N\n\031rpc_client_r" +
       "esponse_bytes\030\007 \001(\0132+.grpc.instrumentati" +
       "on.v1alpha.StatsResponse\022M\n\030rpc_client_r" +
-      "equest_count\030\010 \001(\0132+.grpc.instrumentatio",
+      "equest_count\030\010 \001(\0132+.grpc.instrumentatio" +
       "n.v1alpha.StatsResponse\022N\n\031rpc_client_re" +
       "sponse_count\030\t \001(\0132+.grpc.instrumentatio" +
       "n.v1alpha.StatsResponse\022F\n\021rpc_server_er" +
@@ -87,7 +87,7 @@ public final class MonitoringProto {
       "a.StatsResponse\022S\n\036rpc_server_server_ela" +
       "psed_time\030\014 \001(\0132+.grpc.instrumentation.v" +
       "1alpha.StatsResponse\022M\n\030rpc_server_reque" +
-      "st_bytes\030\r \001(\0132+.grpc.instrumentation.v1",
+      "st_bytes\030\r \001(\0132+.grpc.instrumentation.v1" +
       "alpha.StatsResponse\022N\n\031rpc_server_respon" +
       "se_bytes\030\016 \001(\0132+.grpc.instrumentation.v1" +
       "alpha.StatsResponse\022M\n\030rpc_server_reques" +
@@ -97,7 +97,7 @@ public final class MonitoringProto {
       "lpha.StatsResponse\022L\n\027rpc_server_elapsed" +
       "_time\030\021 \001(\0132+.grpc.instrumentation.v1alp" +
       "ha.StatsResponse\"q\n\014StatsRequest\022\022\n\nview" +
-      "_names\030\001 \003(\t\022\031\n\021measurement_names\030\002 \003(\t\022",
+      "_names\030\001 \003(\t\022\031\n\021measurement_names\030\002 \003(\t\022" +
       "2\n*dont_include_descriptors_in_first_res" +
       "ponse\030\003 \001(\010\"\313\001\n\rStatsResponse\022M\n\026measure" +
       "ment_descriptor\030\001 \001(\0132-.google.instrumen" +
@@ -107,7 +107,7 @@ public final class MonitoringProto {
       "trumentation.View\"\016\n\014TraceRequest\"\017\n\rTra" +
       "ceResponse\"#\n\023MonitoringDataGroup\022\014\n\004nam" +
       "e\030\001 \001(\t\">\n\024CustomMonitoringData\022&\n\010conte" +
-      "nts\030\001 \001(\0132\024.google.protobuf.Any2\265\004\n\nMoni",
+      "nts\030\001 \001(\0132\024.google.protobuf.Any2\265\004\n\nMoni" +
       "toring\022a\n\024GetCanonicalRpcStats\022\026.google." +
       "protobuf.Empty\032/.grpc.instrumentation.v1" +
       "alpha.CanonicalRpcStats\"\000\022e\n\010GetStats\022*." +
@@ -117,7 +117,7 @@ public final class MonitoringProto {
       "ation.v1alpha.StatsRequest\032+.grpc.instru" +
       "mentation.v1alpha.StatsResponse\"\0000\001\022m\n\020G" +
       "etRequestTraces\022*.grpc.instrumentation.v" +
-      "1alpha.TraceRequest\032+.grpc.instrumentati",
+      "1alpha.TraceRequest\032+.grpc.instrumentati" +
       "on.v1alpha.TraceResponse\"\000\022\202\001\n\027GetCustom" +
       "MonitoringData\0221.grpc.instrumentation.v1" +
       "alpha.MonitoringDataGroup\0322.grpc.instrum" +

services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsRequest.java

@@ -36,6 +36,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/instrumentation/v1alpha/StatsResponse.java

@@ -33,6 +33,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceRequest.java

@@ -32,6 +32,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {

services/src/generated/main/java/io/grpc/instrumentation/v1alpha/TraceResponse.java

@@ -32,6 +32,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {

services/src/generated/main/java/io/grpc/reflection/v1alpha/ErrorResponse.java

@@ -34,6 +34,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionNumberResponse.java

@@ -35,6 +35,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ExtensionRequest.java

@@ -35,6 +35,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/reflection/v1alpha/FileDescriptorResponse.java

@@ -35,6 +35,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ListServiceResponse.java

@@ -33,6 +33,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionProto.java

@@ -72,7 +72,7 @@ public final class ServerReflectionProto {
       "nsionRequestH\000\022\'\n\035all_extension_numbers_" +
       "of_type\030\006 \001(\tH\000\022\027\n\rlist_services\030\007 \001(\tH\000" +
       "B\021\n\017message_request\"E\n\020ExtensionRequest\022" +
-      "\027\n\017containing_type\030\001 \001(\t\022\030\n\020extension_nu",
+      "\027\n\017containing_type\030\001 \001(\t\022\030\n\020extension_nu" +
       "mber\030\002 \001(\005\"\321\003\n\030ServerReflectionResponse\022" +
       "\022\n\nvalid_host\030\001 \001(\t\022J\n\020original_request\030" +
       "\002 \001(\01320.grpc.reflection.v1alpha.ServerRe" +
@@ -82,7 +82,7 @@ public final class ServerReflectionProto {
       "mbers_response\030\005 \001(\01320.grpc.reflection.v" +
       "1alpha.ExtensionNumberResponseH\000\022N\n\026list" +
       "_services_response\030\006 \001(\0132,.grpc.reflecti" +
-      "on.v1alpha.ListServiceResponseH\000\022@\n\016erro",
+      "on.v1alpha.ListServiceResponseH\000\022@\n\016erro" +
       "r_response\030\007 \001(\0132&.grpc.reflection.v1alp" +
       "ha.ErrorResponseH\000B\022\n\020message_response\"7" +
       "\n\026FileDescriptorResponse\022\035\n\025file_descrip" +
@@ -92,7 +92,7 @@ public final class ServerReflectionProto {
       "ervice\030\001 \003(\0132(.grpc.reflection.v1alpha.S" +
       "erviceResponse\"\037\n\017ServiceResponse\022\014\n\004nam" +
       "e\030\001 \001(\t\":\n\rErrorResponse\022\022\n\nerror_code\030\001" +
-      " \001(\005\022\025\n\rerror_message\030\002 \001(\t2\223\001\n\020ServerRe",
+      " \001(\005\022\025\n\rerror_message\030\002 \001(\t2\223\001\n\020ServerRe" +
       "flection\022\177\n\024ServerReflectionInfo\0220.grpc." +
       "reflection.v1alpha.ServerReflectionReque" +
       "st\0321.grpc.reflection.v1alpha.ServerRefle" +

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionRequest.java

@@ -33,6 +33,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServerReflectionResponse.java

@@ -33,6 +33,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/main/java/io/grpc/reflection/v1alpha/ServiceResponse.java

@@ -34,6 +34,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/test/java/io/grpc/reflection/testing/DynamicReflectionTestProto.java

@@ -32,7 +32,7 @@ public final class DynamicReflectionTestProto {
       "esting.DynamicReply\"\0002s\n\025AnotherDynamicS" +
       "ervice\022Z\n\006Method\022\'.grpc.reflection.testi" +
       "ng.DynamicRequest\032%.grpc.reflection.test" +
-      "ing.DynamicReply\"\000B:\n\032io.grpc.reflection",
+      "ing.DynamicReply\"\000B:\n\032io.grpc.reflection" +
       ".testingB\032DynamicReflectionTestProtoP\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =

services/src/generated/test/java/io/grpc/reflection/testing/DynamicReply.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/test/java/io/grpc/reflection/testing/DynamicRequest.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/test/java/io/grpc/reflection/testing/EmptyMessage.java

@@ -28,6 +28,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {

services/src/generated/test/java/io/grpc/reflection/testing/NestedTypeOuter.java

@@ -28,6 +28,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -98,6 +101,9 @@ private static final long serialVersionUID = 0L;
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -178,6 +184,9 @@ private static final long serialVersionUID = 0L;
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
+        if (extensionRegistry == null) {
+          throw new java.lang.NullPointerException();
+        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/test/java/io/grpc/reflection/testing/ReflectionTestProto.java

@@ -44,7 +44,7 @@ public final class ReflectionTestProto {
       "grpc.reflection.testing.Request\032\036.grpc.r" +
       "eflection.testing.Reply\"\000:4\n\003bar\022\'.grpc." +
       "reflection.testing.ThirdLevelType\030d \001(\005B" +
-      "3\n\032io.grpc.reflection.testingB\023Reflectio",
+      "3\n\032io.grpc.reflection.testingB\023Reflectio" +
       "nTestProtoP\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =

services/src/generated/test/java/io/grpc/reflection/testing/Reply.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/test/java/io/grpc/reflection/testing/Request.java

@@ -29,6 +29,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/test/java/io/grpc/reflection/testing/ThirdLevelType.java

@@ -30,6 +30,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

services/src/generated/test/java/io/grpc/reflection/testing/TypeWithExtensions.java

@@ -30,6 +30,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleRequest.java

@@ -33,6 +33,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleResponse.java

@@ -33,6 +33,9 @@ private static final long serialVersionUID = 0L;
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();

testing-proto/src/generated/main/java/io/grpc/testing/protobuf/SimpleServiceProto.java

@@ -42,7 +42,7 @@ public final class SimpleServiceProto {
       "lientStreamingRpc\022\033.grpc.testing.SimpleR" +
       "equest\032\034.grpc.testing.SimpleResponse\"\000(\001" +
       "\022S\n\022ServerStreamingRpc\022\033.grpc.testing.Si" +
-      "mpleRequest\032\034.grpc.testing.SimpleRespons",
+      "mpleRequest\032\034.grpc.testing.SimpleRespons" +
       "e\"\0000\001\022S\n\020BidiStreamingRpc\022\033.grpc.testing" +
       ".SimpleRequest\032\034.grpc.testing.SimpleResp" +
       "onse\"\000(\0010\001B0\n\030io.grpc.testing.protobufB\022" +