all: update to proto 3.4.0

.travis.yml

@@ -5,7 +5,7 @@ language: java
 env:
   global:
     - GRADLE_OPTS=-Xmx512m
-    - PROTOBUF_VERSION=3.3.1
+    - PROTOBUF_VERSION=3.4.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.3.1
+$ git checkout v3.4.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.3.1\src ^
-    -PvcProtobufLibs=C:\path\to\protobuf-3.3.1\vsprojects\Release ^
+    -PvcProtobufInclude=C:\path\to\protobuf-3.4.0\src ^
+    -PvcProtobufLibs=C:\path\to\protobuf-3.4.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.3.1\\src
-vcProtobufLibs=C:\\path\\to\\protobuf-3.3.1\\vsprojects\\Release
+vcProtobufInclude=C:\\path\\to\\protobuf-3.4.0\\src
+vcProtobufLibs=C:\\path\\to\\protobuf-3.4.0\\vsprojects\\Release
 targetArch=x86_32
 ```
 

android-interop-testing/app/build.gradle

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

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

@@ -35,6 +35,7 @@ public final class Payloads {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ByteBufferParams)
       ByteBufferParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ByteBufferParams.newBuilder() to construct.
     private ByteBufferParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -47,7 +48,7 @@ public final class Payloads {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ByteBufferParams(
         com.google.protobuf.CodedInputStream input,
@@ -55,6 +56,8 @@ public final class Payloads {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -64,7 +67,8 @@ public final class Payloads {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -87,6 +91,7 @@ public final class Payloads {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -138,6 +143,7 @@ public final class Payloads {
       if (respSize_ != 0) {
         output.writeInt32(2, respSize_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -153,11 +159,11 @@ public final class Payloads {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, respSize_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -173,6 +179,7 @@ public final class Payloads {
           == other.getReqSize());
       result = result && (getRespSize()
           == other.getRespSize());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -353,7 +360,7 @@ public final class Payloads {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -366,12 +373,12 @@ public final class Payloads {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -391,6 +398,7 @@ public final class Payloads {
         if (other.getRespSize() != 0) {
           setRespSize(other.getRespSize());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -470,12 +478,12 @@ public final class Payloads {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -538,6 +546,7 @@ public final class Payloads {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.SimpleProtoParams)
       SimpleProtoParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use SimpleProtoParams.newBuilder() to construct.
     private SimpleProtoParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -550,7 +559,7 @@ public final class Payloads {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private SimpleProtoParams(
         com.google.protobuf.CodedInputStream input,
@@ -558,6 +567,8 @@ public final class Payloads {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -567,7 +578,8 @@ public final class Payloads {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -590,6 +602,7 @@ public final class Payloads {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -641,6 +654,7 @@ public final class Payloads {
       if (respSize_ != 0) {
         output.writeInt32(2, respSize_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -656,11 +670,11 @@ public final class Payloads {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, respSize_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -676,6 +690,7 @@ public final class Payloads {
           == other.getReqSize());
       result = result && (getRespSize()
           == other.getRespSize());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -856,7 +871,7 @@ public final class Payloads {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -869,12 +884,12 @@ public final class Payloads {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -894,6 +909,7 @@ public final class Payloads {
         if (other.getRespSize() != 0) {
           setRespSize(other.getRespSize());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -973,12 +989,12 @@ public final class Payloads {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1036,6 +1052,7 @@ public final class Payloads {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ComplexProtoParams)
       ComplexProtoParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ComplexProtoParams.newBuilder() to construct.
     private ComplexProtoParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1046,13 +1063,15 @@ public final class Payloads {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ComplexProtoParams(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1062,7 +1081,8 @@ public final class Payloads {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1075,6 +1095,7 @@ public final class Payloads {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1102,6 +1123,7 @@ public final class Payloads {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1109,11 +1131,11 @@ public final class Payloads {
       if (size != -1) return size;
 
       size = 0;
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1125,6 +1147,7 @@ public final class Payloads {
       io.grpc.benchmarks.proto.Payloads.ComplexProtoParams other = (io.grpc.benchmarks.proto.Payloads.ComplexProtoParams) obj;
 
       boolean result = true;
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1300,7 +1323,7 @@ public final class Payloads {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1313,12 +1336,12 @@ public final class Payloads {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1332,6 +1355,7 @@ public final class Payloads {
 
       public Builder mergeFrom(io.grpc.benchmarks.proto.Payloads.ComplexProtoParams other) {
         if (other == io.grpc.benchmarks.proto.Payloads.ComplexProtoParams.getDefaultInstance()) return this;
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1359,12 +1383,12 @@ public final class Payloads {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1410,6 +1434,10 @@ public final class Payloads {
       // @@protoc_insertion_point(interface_extends:grpc.testing.PayloadConfig)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+     */
+    boolean hasBytebufParams();
     /**
      * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
      */
@@ -1419,6 +1447,10 @@ public final class Payloads {
      */
     io.grpc.benchmarks.proto.Payloads.ByteBufferParamsOrBuilder getBytebufParamsOrBuilder();
 
+    /**
+     * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
+     */
+    boolean hasSimpleParams();
     /**
      * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
      */
@@ -1428,6 +1460,10 @@ public final class Payloads {
      */
     io.grpc.benchmarks.proto.Payloads.SimpleProtoParamsOrBuilder getSimpleParamsOrBuilder();
 
+    /**
+     * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
+     */
+    boolean hasComplexParams();
     /**
      * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
      */
@@ -1446,6 +1482,7 @@ public final class Payloads {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.PayloadConfig)
       PayloadConfigOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use PayloadConfig.newBuilder() to construct.
     private PayloadConfig(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1456,7 +1493,7 @@ public final class Payloads {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private PayloadConfig(
         com.google.protobuf.CodedInputStream input,
@@ -1464,6 +1501,8 @@ public final class Payloads {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1473,7 +1512,8 @@ public final class Payloads {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1528,6 +1568,7 @@ public final class Payloads {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1584,6 +1625,12 @@ public final class Payloads {
     }
 
     public static final int BYTEBUF_PARAMS_FIELD_NUMBER = 1;
+    /**
+     * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+     */
+    public boolean hasBytebufParams() {
+      return payloadCase_ == 1;
+    }
     /**
      * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
      */
@@ -1604,6 +1651,12 @@ public final class Payloads {
     }
 
     public static final int SIMPLE_PARAMS_FIELD_NUMBER = 2;
+    /**
+     * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
+     */
+    public boolean hasSimpleParams() {
+      return payloadCase_ == 2;
+    }
     /**
      * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
      */
@@ -1624,6 +1677,12 @@ public final class Payloads {
     }
 
     public static final int COMPLEX_PARAMS_FIELD_NUMBER = 3;
+    /**
+     * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
+     */
+    public boolean hasComplexParams() {
+      return payloadCase_ == 3;
+    }
     /**
      * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
      */
@@ -1664,6 +1723,7 @@ public final class Payloads {
       if (payloadCase_ == 3) {
         output.writeMessage(3, (io.grpc.benchmarks.proto.Payloads.ComplexProtoParams) payload_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1683,11 +1743,11 @@ public final class Payloads {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, (io.grpc.benchmarks.proto.Payloads.ComplexProtoParams) payload_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1718,6 +1778,7 @@ public final class Payloads {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1928,7 +1989,7 @@ public final class Payloads {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1941,12 +2002,12 @@ public final class Payloads {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1977,6 +2038,7 @@ public final class Payloads {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2020,6 +2082,12 @@ public final class Payloads {
 
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.ByteBufferParams, io.grpc.benchmarks.proto.Payloads.ByteBufferParams.Builder, io.grpc.benchmarks.proto.Payloads.ByteBufferParamsOrBuilder> bytebufParamsBuilder_;
+      /**
+       * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
+       */
+      public boolean hasBytebufParams() {
+        return payloadCase_ == 1;
+      }
       /**
        * <code>.grpc.testing.ByteBufferParams bytebuf_params = 1;</code>
        */
@@ -2150,6 +2218,12 @@ public final class Payloads {
 
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.SimpleProtoParams, io.grpc.benchmarks.proto.Payloads.SimpleProtoParams.Builder, io.grpc.benchmarks.proto.Payloads.SimpleProtoParamsOrBuilder> simpleParamsBuilder_;
+      /**
+       * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
+       */
+      public boolean hasSimpleParams() {
+        return payloadCase_ == 2;
+      }
       /**
        * <code>.grpc.testing.SimpleProtoParams simple_params = 2;</code>
        */
@@ -2280,6 +2354,12 @@ public final class Payloads {
 
       private com.google.protobuf.SingleFieldBuilderV3<
           io.grpc.benchmarks.proto.Payloads.ComplexProtoParams, io.grpc.benchmarks.proto.Payloads.ComplexProtoParams.Builder, io.grpc.benchmarks.proto.Payloads.ComplexProtoParamsOrBuilder> complexParamsBuilder_;
+      /**
+       * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
+       */
+      public boolean hasComplexParams() {
+        return payloadCase_ == 3;
+      }
       /**
        * <code>.grpc.testing.ComplexProtoParams complex_params = 3;</code>
        */
@@ -2409,12 +2489,12 @@ public final class Payloads {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 

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

@@ -80,6 +80,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ServerStats)
       ServerStatsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ServerStats.newBuilder() to construct.
     private ServerStats(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -96,7 +97,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ServerStats(
         com.google.protobuf.CodedInputStream input,
@@ -104,6 +105,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -113,7 +116,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -156,6 +160,7 @@ public final class Stats {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -280,6 +285,7 @@ public final class Stats {
       if (cqPollCount_ != 0L) {
         output.writeUInt64(6, cqPollCount_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -311,11 +317,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(6, cqPollCount_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -345,6 +351,7 @@ public final class Stats {
           == other.getIdleCpuTime());
       result = result && (getCqPollCount()
           == other.getCqPollCount());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -551,7 +558,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -564,12 +571,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -601,6 +608,7 @@ public final class Stats {
         if (other.getCqPollCount() != 0L) {
           setCqPollCount(other.getCqPollCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -859,12 +867,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -939,6 +947,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.HistogramParams)
       HistogramParamsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use HistogramParams.newBuilder() to construct.
     private HistogramParams(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -951,7 +960,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private HistogramParams(
         com.google.protobuf.CodedInputStream input,
@@ -959,6 +968,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -968,7 +979,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -991,6 +1003,7 @@ public final class Stats {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1050,6 +1063,7 @@ public final class Stats {
       if (maxPossible_ != 0D) {
         output.writeDouble(2, maxPossible_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1065,11 +1079,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(2, maxPossible_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1089,6 +1103,7 @@ public final class Stats {
           java.lang.Double.doubleToLongBits(getMaxPossible())
           == java.lang.Double.doubleToLongBits(
               other.getMaxPossible()));
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1275,7 +1290,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1288,12 +1303,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1313,6 +1328,7 @@ public final class Stats {
         if (other.getMaxPossible() != 0D) {
           setMaxPossible(other.getMaxPossible());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1416,12 +1432,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1516,6 +1532,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.HistogramData)
       HistogramDataOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use HistogramData.newBuilder() to construct.
     private HistogramData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1532,7 +1549,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private HistogramData(
         com.google.protobuf.CodedInputStream input,
@@ -1540,6 +1557,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1549,7 +1568,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1611,6 +1631,7 @@ public final class Stats {
         if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
           bucket_ = java.util.Collections.unmodifiableList(bucket_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1730,6 +1751,7 @@ public final class Stats {
       if (count_ != 0D) {
         output.writeDouble(6, count_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1771,11 +1793,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeDoubleSize(6, count_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1809,6 +1831,7 @@ public final class Stats {
           java.lang.Double.doubleToLongBits(getCount())
           == java.lang.Double.doubleToLongBits(
               other.getCount()));
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2027,7 +2050,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -2040,12 +2063,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2084,6 +2107,7 @@ public final class Stats {
         if (other.getCount() != 0D) {
           setCount(other.getCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2308,12 +2332,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -2376,6 +2400,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.RequestResultCount)
       RequestResultCountOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use RequestResultCount.newBuilder() to construct.
     private RequestResultCount(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -2388,7 +2413,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private RequestResultCount(
         com.google.protobuf.CodedInputStream input,
@@ -2396,6 +2421,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2405,7 +2432,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -2428,6 +2456,7 @@ public final class Stats {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -2479,6 +2508,7 @@ public final class Stats {
       if (count_ != 0L) {
         output.writeInt64(2, count_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -2494,11 +2524,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeInt64Size(2, count_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -2514,6 +2544,7 @@ public final class Stats {
           == other.getStatusCode());
       result = result && (getCount()
           == other.getCount());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -2695,7 +2726,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -2708,12 +2739,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -2733,6 +2764,7 @@ public final class Stats {
         if (other.getCount() != 0L) {
           setCount(other.getCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -2812,12 +2844,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -2967,6 +2999,7 @@ public final class Stats {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.ClientStats)
       ClientStatsOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use ClientStats.newBuilder() to construct.
     private ClientStats(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -2982,7 +3015,7 @@ public final class Stats {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private ClientStats(
         com.google.protobuf.CodedInputStream input,
@@ -2990,6 +3023,8 @@ public final class Stats {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -2999,7 +3034,8 @@ public final class Stats {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -3057,6 +3093,7 @@ public final class Stats {
         if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) {
           requestResults_ = java.util.Collections.unmodifiableList(requestResults_);
         }
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -3235,6 +3272,7 @@ public final class Stats {
       if (cqPollCount_ != 0L) {
         output.writeUInt64(6, cqPollCount_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -3266,11 +3304,11 @@ public final class Stats {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(6, cqPollCount_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -3303,6 +3341,7 @@ public final class Stats {
           .equals(other.getRequestResultsList());
       result = result && (getCqPollCount()
           == other.getCqPollCount());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -3535,7 +3574,7 @@ public final class Stats {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -3548,12 +3587,12 @@ public final class Stats {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -3608,6 +3647,7 @@ public final class Stats {
         if (other.getCqPollCount() != 0L) {
           setCqPollCount(other.getCqPollCount());
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -4229,12 +4269,12 @@ public final class Stats {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 

build.gradle

@@ -92,8 +92,8 @@ subprojects {
 
         nettyVersion = '4.1.14.Final'
         guavaVersion = '19.0'
-        protobufVersion = '3.3.1'
-        protocVersion = '3.3.0' // TODO(carl-mastrangelo): set this from protobufVersion when versions align again
+        protobufVersion = '3.4.0'
+        protocVersion = protobufVersion
         protobufNanoVersion = '3.0.0-alpha-5'
 
         configureProtoCompilation = {

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.3.1
+set PROTOBUF_VER=3.4.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.3.1 && \
+    git checkout v3.4.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

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

examples/android/routeguide/app/build.gradle

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

examples/build.gradle

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

examples/pom.xml

@@ -66,7 +66,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.5.0</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:3.4.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

@@ -15,6 +15,7 @@ public  final class ClientStats extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.ClientStats)
     ClientStatsOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ClientStats.newBuilder() to construct.
   private ClientStats(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -30,7 +31,7 @@ public  final class ClientStats extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ClientStats(
       com.google.protobuf.CodedInputStream input,
@@ -38,6 +39,8 @@ public  final class ClientStats extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -47,7 +50,8 @@ public  final class ClientStats extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -105,6 +109,7 @@ public  final class ClientStats extends
       if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
         callsFinishedWithDrop_ = java.util.Collections.unmodifiableList(callsFinishedWithDrop_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -292,6 +297,7 @@ public  final class ClientStats extends
     for (int i = 0; i < callsFinishedWithDrop_.size(); i++) {
       output.writeMessage(8, callsFinishedWithDrop_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -323,11 +329,11 @@ public  final class ClientStats extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(8, callsFinishedWithDrop_.get(i));
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -354,6 +360,7 @@ public  final class ClientStats extends
         == other.getNumCallsFinishedKnownReceived());
     result = result && getCallsFinishedWithDropList()
         .equals(other.getCallsFinishedWithDropList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -591,7 +598,7 @@ public  final class ClientStats extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -604,12 +611,12 @@ public  final class ClientStats extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -664,6 +671,7 @@ public  final class ClientStats extends
           }
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1312,12 +1320,12 @@ public  final class ClientStats extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class ClientStatsPerToken extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.ClientStatsPerToken)
     ClientStatsPerTokenOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ClientStatsPerToken.newBuilder() to construct.
   private ClientStatsPerToken(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,7 +27,7 @@ public  final class ClientStatsPerToken extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ClientStatsPerToken(
       com.google.protobuf.CodedInputStream input,
@@ -34,6 +35,8 @@ public  final class ClientStatsPerToken extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -43,7 +46,8 @@ public  final class ClientStatsPerToken extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +71,7 @@ public  final class ClientStatsPerToken extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -155,6 +160,7 @@ public  final class ClientStatsPerToken extends
     if (numCalls_ != 0L) {
       output.writeInt64(2, numCalls_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -169,11 +175,11 @@ public  final class ClientStatsPerToken extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt64Size(2, numCalls_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -189,6 +195,7 @@ public  final class ClientStatsPerToken extends
         .equals(other.getLoadBalanceToken());
     result = result && (getNumCalls()
         == other.getNumCalls());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -374,7 +381,7 @@ public  final class ClientStatsPerToken extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -387,12 +394,12 @@ public  final class ClientStatsPerToken extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -413,6 +420,7 @@ public  final class ClientStatsPerToken extends
       if (other.getNumCalls() != 0L) {
         setNumCalls(other.getNumCalls());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -567,12 +575,12 @@ public  final class ClientStatsPerToken extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -10,6 +10,7 @@ public  final class InitialLoadBalanceRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.InitialLoadBalanceRequest)
     InitialLoadBalanceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use InitialLoadBalanceRequest.newBuilder() to construct.
   private InitialLoadBalanceRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class InitialLoadBalanceRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private InitialLoadBalanceRequest(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class InitialLoadBalanceRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class InitialLoadBalanceRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -57,6 +61,7 @@ public  final class InitialLoadBalanceRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -131,6 +136,7 @@ public  final class InitialLoadBalanceRequest extends
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -141,11 +147,11 @@ public  final class InitialLoadBalanceRequest extends
     if (!getNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -159,6 +165,7 @@ public  final class InitialLoadBalanceRequest extends
     boolean result = true;
     result = result && getName()
         .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -334,7 +341,7 @@ public  final class InitialLoadBalanceRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -347,12 +354,12 @@ public  final class InitialLoadBalanceRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -370,6 +377,7 @@ public  final class InitialLoadBalanceRequest extends
         name_ = other.name_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -491,12 +499,12 @@ public  final class InitialLoadBalanceRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -10,6 +10,7 @@ public  final class InitialLoadBalanceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.InitialLoadBalanceResponse)
     InitialLoadBalanceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use InitialLoadBalanceResponse.newBuilder() to construct.
   private InitialLoadBalanceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class InitialLoadBalanceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private InitialLoadBalanceResponse(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class InitialLoadBalanceResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class InitialLoadBalanceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -70,6 +74,7 @@ public  final class InitialLoadBalanceResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -192,6 +197,7 @@ public  final class InitialLoadBalanceResponse extends
     if (clientStatsReportInterval_ != null) {
       output.writeMessage(2, getClientStatsReportInterval());
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -206,11 +212,11 @@ public  final class InitialLoadBalanceResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, getClientStatsReportInterval());
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -229,6 +235,7 @@ public  final class InitialLoadBalanceResponse extends
       result = result && getClientStatsReportInterval()
           .equals(other.getClientStatsReportInterval());
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -419,7 +426,7 @@ public  final class InitialLoadBalanceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -432,12 +439,12 @@ public  final class InitialLoadBalanceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -458,6 +465,7 @@ public  final class InitialLoadBalanceResponse extends
       if (other.hasClientStatsReportInterval()) {
         mergeClientStatsReportInterval(other.getClientStatsReportInterval());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -765,12 +773,12 @@ public  final class InitialLoadBalanceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -10,6 +10,7 @@ public  final class LoadBalanceRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.LoadBalanceRequest)
     LoadBalanceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use LoadBalanceRequest.newBuilder() to construct.
   private LoadBalanceRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -20,7 +21,7 @@ public  final class LoadBalanceRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private LoadBalanceRequest(
       com.google.protobuf.CodedInputStream input,
@@ -28,6 +29,8 @@ public  final class LoadBalanceRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -37,7 +40,8 @@ public  final class LoadBalanceRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -78,6 +82,7 @@ public  final class LoadBalanceRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -132,6 +137,16 @@ public  final class LoadBalanceRequest extends
   }
 
   public static final int INITIAL_REQUEST_FIELD_NUMBER = 1;
+  /**
+   * <pre>
+   * This message should be sent on the first request to the load balancer.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+   */
+  public boolean hasInitialRequest() {
+    return loadBalanceRequestTypeCase_ == 1;
+  }
   /**
    * <pre>
    * This message should be sent on the first request to the load balancer.
@@ -160,6 +175,17 @@ public  final class LoadBalanceRequest extends
   }
 
   public static final int CLIENT_STATS_FIELD_NUMBER = 2;
+  /**
+   * <pre>
+   * The client stats should be periodically reported to the load balancer
+   * based on the duration defined in the InitialLoadBalanceResponse.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
+   */
+  public boolean hasClientStats() {
+    return loadBalanceRequestTypeCase_ == 2;
+  }
   /**
    * <pre>
    * The client stats should be periodically reported to the load balancer
@@ -207,6 +233,7 @@ public  final class LoadBalanceRequest extends
     if (loadBalanceRequestTypeCase_ == 2) {
       output.writeMessage(2, (io.grpc.grpclb.ClientStats) loadBalanceRequestType_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -222,11 +249,11 @@ public  final class LoadBalanceRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, (io.grpc.grpclb.ClientStats) loadBalanceRequestType_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -253,6 +280,7 @@ public  final class LoadBalanceRequest extends
       case 0:
       default:
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -452,7 +480,7 @@ public  final class LoadBalanceRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -465,12 +493,12 @@ public  final class LoadBalanceRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -497,6 +525,7 @@ public  final class LoadBalanceRequest extends
           break;
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -540,6 +569,16 @@ public  final class LoadBalanceRequest extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.grpclb.InitialLoadBalanceRequest, io.grpc.grpclb.InitialLoadBalanceRequest.Builder, io.grpc.grpclb.InitialLoadBalanceRequestOrBuilder> initialRequestBuilder_;
+    /**
+     * <pre>
+     * This message should be sent on the first request to the load balancer.
+     * </pre>
+     *
+     * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+     */
+    public boolean hasInitialRequest() {
+      return loadBalanceRequestTypeCase_ == 1;
+    }
     /**
      * <pre>
      * This message should be sent on the first request to the load balancer.
@@ -702,6 +741,17 @@ public  final class LoadBalanceRequest extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.grpclb.ClientStats, io.grpc.grpclb.ClientStats.Builder, io.grpc.grpclb.ClientStatsOrBuilder> clientStatsBuilder_;
+    /**
+     * <pre>
+     * The client stats should be periodically reported to the load balancer
+     * based on the duration defined in the InitialLoadBalanceResponse.
+     * </pre>
+     *
+     * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
+     */
+    public boolean hasClientStats() {
+      return loadBalanceRequestTypeCase_ == 2;
+    }
     /**
      * <pre>
      * The client stats should be periodically reported to the load balancer
@@ -871,12 +921,12 @@ public  final class LoadBalanceRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -7,6 +7,14 @@ public interface LoadBalanceRequestOrBuilder extends
     // @@protoc_insertion_point(interface_extends:grpc.lb.v1.LoadBalanceRequest)
     com.google.protobuf.MessageOrBuilder {
 
+  /**
+   * <pre>
+   * This message should be sent on the first request to the load balancer.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.InitialLoadBalanceRequest initial_request = 1;</code>
+   */
+  boolean hasInitialRequest();
   /**
    * <pre>
    * This message should be sent on the first request to the load balancer.
@@ -24,6 +32,15 @@ public interface LoadBalanceRequestOrBuilder extends
    */
   io.grpc.grpclb.InitialLoadBalanceRequestOrBuilder getInitialRequestOrBuilder();
 
+  /**
+   * <pre>
+   * The client stats should be periodically reported to the load balancer
+   * based on the duration defined in the InitialLoadBalanceResponse.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.ClientStats client_stats = 2;</code>
+   */
+  boolean hasClientStats();
   /**
    * <pre>
    * The client stats should be periodically reported to the load balancer

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

@@ -10,6 +10,7 @@ public  final class LoadBalanceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.LoadBalanceResponse)
     LoadBalanceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use LoadBalanceResponse.newBuilder() to construct.
   private LoadBalanceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -20,7 +21,7 @@ public  final class LoadBalanceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private LoadBalanceResponse(
       com.google.protobuf.CodedInputStream input,
@@ -28,6 +29,8 @@ public  final class LoadBalanceResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -37,7 +40,8 @@ public  final class LoadBalanceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -78,6 +82,7 @@ public  final class LoadBalanceResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -132,6 +137,16 @@ public  final class LoadBalanceResponse extends
   }
 
   public static final int INITIAL_RESPONSE_FIELD_NUMBER = 1;
+  /**
+   * <pre>
+   * This message should be sent on the first response to the client.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+   */
+  public boolean hasInitialResponse() {
+    return loadBalanceResponseTypeCase_ == 1;
+  }
   /**
    * <pre>
    * This message should be sent on the first response to the client.
@@ -160,6 +175,17 @@ public  final class LoadBalanceResponse extends
   }
 
   public static final int SERVER_LIST_FIELD_NUMBER = 2;
+  /**
+   * <pre>
+   * Contains the list of servers selected by the load balancer. The client
+   * should send requests to these servers in the specified order.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
+   */
+  public boolean hasServerList() {
+    return loadBalanceResponseTypeCase_ == 2;
+  }
   /**
    * <pre>
    * Contains the list of servers selected by the load balancer. The client
@@ -207,6 +233,7 @@ public  final class LoadBalanceResponse extends
     if (loadBalanceResponseTypeCase_ == 2) {
       output.writeMessage(2, (io.grpc.grpclb.ServerList) loadBalanceResponseType_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -222,11 +249,11 @@ public  final class LoadBalanceResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(2, (io.grpc.grpclb.ServerList) loadBalanceResponseType_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -253,6 +280,7 @@ public  final class LoadBalanceResponse extends
       case 0:
       default:
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -452,7 +480,7 @@ public  final class LoadBalanceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -465,12 +493,12 @@ public  final class LoadBalanceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -497,6 +525,7 @@ public  final class LoadBalanceResponse extends
           break;
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -540,6 +569,16 @@ public  final class LoadBalanceResponse extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.grpclb.InitialLoadBalanceResponse, io.grpc.grpclb.InitialLoadBalanceResponse.Builder, io.grpc.grpclb.InitialLoadBalanceResponseOrBuilder> initialResponseBuilder_;
+    /**
+     * <pre>
+     * This message should be sent on the first response to the client.
+     * </pre>
+     *
+     * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+     */
+    public boolean hasInitialResponse() {
+      return loadBalanceResponseTypeCase_ == 1;
+    }
     /**
      * <pre>
      * This message should be sent on the first response to the client.
@@ -702,6 +741,17 @@ public  final class LoadBalanceResponse extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.grpclb.ServerList, io.grpc.grpclb.ServerList.Builder, io.grpc.grpclb.ServerListOrBuilder> serverListBuilder_;
+    /**
+     * <pre>
+     * Contains the list of servers selected by the load balancer. The client
+     * should send requests to these servers in the specified order.
+     * </pre>
+     *
+     * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
+     */
+    public boolean hasServerList() {
+      return loadBalanceResponseTypeCase_ == 2;
+    }
     /**
      * <pre>
      * Contains the list of servers selected by the load balancer. The client
@@ -871,12 +921,12 @@ public  final class LoadBalanceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -7,6 +7,14 @@ public interface LoadBalanceResponseOrBuilder extends
     // @@protoc_insertion_point(interface_extends:grpc.lb.v1.LoadBalanceResponse)
     com.google.protobuf.MessageOrBuilder {
 
+  /**
+   * <pre>
+   * This message should be sent on the first response to the client.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.InitialLoadBalanceResponse initial_response = 1;</code>
+   */
+  boolean hasInitialResponse();
   /**
    * <pre>
    * This message should be sent on the first response to the client.
@@ -24,6 +32,15 @@ public interface LoadBalanceResponseOrBuilder extends
    */
   io.grpc.grpclb.InitialLoadBalanceResponseOrBuilder getInitialResponseOrBuilder();
 
+  /**
+   * <pre>
+   * Contains the list of servers selected by the load balancer. The client
+   * should send requests to these servers in the specified order.
+   * </pre>
+   *
+   * <code>.grpc.lb.v1.ServerList server_list = 2;</code>
+   */
+  boolean hasServerList();
   /**
    * <pre>
    * Contains the list of servers selected by the load balancer. The client

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

@@ -15,6 +15,7 @@ public  final class Server extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.Server)
     ServerOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use Server.newBuilder() to construct.
   private Server(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -29,7 +30,7 @@ public  final class Server extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private Server(
       com.google.protobuf.CodedInputStream input,
@@ -37,6 +38,8 @@ public  final class Server extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -46,7 +49,8 @@ public  final class Server extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -80,6 +84,7 @@ public  final class Server extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -211,6 +216,7 @@ public  final class Server extends
     if (drop_ != false) {
       output.writeBool(4, drop_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -233,11 +239,11 @@ public  final class Server extends
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(4, drop_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -257,6 +263,7 @@ public  final class Server extends
         .equals(other.getLoadBalanceToken());
     result = result && (getDrop()
         == other.getDrop());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -453,7 +460,7 @@ public  final class Server extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -466,12 +473,12 @@ public  final class Server extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -498,6 +505,7 @@ public  final class Server extends
       if (other.getDrop() != false) {
         setDrop(other.getDrop());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -760,12 +768,12 @@ public  final class Server extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -10,6 +10,7 @@ public  final class ServerList extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.lb.v1.ServerList)
     ServerListOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ServerList.newBuilder() to construct.
   private ServerList(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class ServerList extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ServerList(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class ServerList extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class ServerList extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -63,6 +67,7 @@ public  final class ServerList extends
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         servers_ = java.util.Collections.unmodifiableList(servers_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -163,6 +168,7 @@ public  final class ServerList extends
     for (int i = 0; i < servers_.size(); i++) {
       output.writeMessage(1, servers_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -174,11 +180,11 @@ public  final class ServerList extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, servers_.get(i));
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -192,6 +198,7 @@ public  final class ServerList extends
     boolean result = true;
     result = result && getServersList()
         .equals(other.getServersList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -383,7 +390,7 @@ public  final class ServerList extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -396,12 +403,12 @@ public  final class ServerList extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -441,6 +448,7 @@ public  final class ServerList extends
           }
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -835,12 +843,12 @@ public  final class ServerList extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -34,6 +34,7 @@ public final class EmptyProtos {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.Empty)
       EmptyOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Empty.newBuilder() to construct.
     private Empty(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -62,8 +63,8 @@ public final class EmptyProtos {
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -117,7 +118,6 @@ public final class EmptyProtos {
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -309,7 +309,7 @@ public final class EmptyProtos {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -322,12 +322,12 @@ public final class EmptyProtos {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {

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

@@ -61,6 +61,7 @@ public final class Metrics {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.GaugeResponse)
       GaugeResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use GaugeResponse.newBuilder() to construct.
     private GaugeResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -72,7 +73,7 @@ public final class Metrics {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private GaugeResponse(
         com.google.protobuf.CodedInputStream input,
@@ -80,6 +81,8 @@ public final class Metrics {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -89,7 +92,8 @@ public final class Metrics {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -124,6 +128,7 @@ public final class Metrics {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -304,6 +309,7 @@ public final class Metrics {
       if (valueCase_ == 4) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 4, value_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -327,11 +333,11 @@ public final class Metrics {
       if (valueCase_ == 4) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, value_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -366,6 +372,7 @@ public final class Metrics {
         case 0:
         default:
       }
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -575,7 +582,7 @@ public final class Metrics {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -588,12 +595,12 @@ public final class Metrics {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -630,6 +637,7 @@ public final class Metrics {
             break;
           }
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -881,12 +889,12 @@ public final class Metrics {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -953,6 +961,7 @@ public final class Metrics {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.GaugeRequest)
       GaugeRequestOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use GaugeRequest.newBuilder() to construct.
     private GaugeRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -964,7 +973,7 @@ public final class Metrics {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private GaugeRequest(
         com.google.protobuf.CodedInputStream input,
@@ -972,6 +981,8 @@ public final class Metrics {
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
       int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -981,7 +992,8 @@ public final class Metrics {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1000,6 +1012,7 @@ public final class Metrics {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1064,6 +1077,7 @@ public final class Metrics {
       if (!getNameBytes().isEmpty()) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
       }
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1074,11 +1088,11 @@ public final class Metrics {
       if (!getNameBytes().isEmpty()) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
       }
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1092,6 +1106,7 @@ public final class Metrics {
       boolean result = true;
       result = result && getName()
           .equals(other.getName());
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1271,7 +1286,7 @@ public final class Metrics {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1284,12 +1299,12 @@ public final class Metrics {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1307,6 +1322,7 @@ public final class Metrics {
           name_ = other.name_;
           onChanged();
         }
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1403,12 +1419,12 @@ public final class Metrics {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 
@@ -1461,6 +1477,7 @@ public final class Metrics {
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.testing.EmptyMessage)
       EmptyMessageOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use EmptyMessage.newBuilder() to construct.
     private EmptyMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -1471,13 +1488,15 @@ public final class Metrics {
     @java.lang.Override
     public final com.google.protobuf.UnknownFieldSet
     getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+      return this.unknownFields;
     }
     private EmptyMessage(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
         boolean done = false;
         while (!done) {
@@ -1487,7 +1506,8 @@ public final class Metrics {
               done = true;
               break;
             default: {
-              if (!input.skipField(tag)) {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -1500,6 +1520,7 @@ public final class Metrics {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
     }
@@ -1527,6 +1548,7 @@ public final class Metrics {
 
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      unknownFields.writeTo(output);
     }
 
     public int getSerializedSize() {
@@ -1534,11 +1556,11 @@ public final class Metrics {
       if (size != -1) return size;
 
       size = 0;
+      size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -1550,6 +1572,7 @@ public final class Metrics {
       io.grpc.testing.integration.Metrics.EmptyMessage other = (io.grpc.testing.integration.Metrics.EmptyMessage) obj;
 
       boolean result = true;
+      result = result && unknownFields.equals(other.unknownFields);
       return result;
     }
 
@@ -1720,7 +1743,7 @@ public final class Metrics {
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -1733,12 +1756,12 @@ public final class Metrics {
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1752,6 +1775,7 @@ public final class Metrics {
 
       public Builder mergeFrom(io.grpc.testing.integration.Metrics.EmptyMessage other) {
         if (other == io.grpc.testing.integration.Metrics.EmptyMessage.getDefaultInstance()) return this;
+        this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
       }
@@ -1779,12 +1803,12 @@ public final class Metrics {
       }
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.setUnknownFieldsProto3(unknownFields);
       }
 
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
+        return super.mergeUnknownFields(unknownFields);
       }
 
 

repositories.bzl

@@ -128,9 +128,9 @@ def com_google_protobuf():
   # This statement defines the @com_google_protobuf repo.
   native.http_archive(
       name = "com_google_protobuf",
-      sha256 = "df77b0e60afcd3d90b2654cd305e61ae8ae2e2281b4d6540c7093da4c4245d75",
-      strip_prefix = "protobuf-3.3.1",
-      urls = ["https://github.com/google/protobuf/archive/v3.3.1.zip"],
+      sha256 = "542703acadc3f690d998f4641e1b988f15ba57ebca05fdfb1cd9095bec007948",
+      strip_prefix = "protobuf-3.4.0",
+      urls = ["https://github.com/google/protobuf/archive/v3.4.0.zip"],
   )
 
 def com_google_protobuf_java():
@@ -138,9 +138,9 @@ def com_google_protobuf_java():
   # which is the Java proto runtime (base classes and common utilities).
   native.http_archive(
       name = "com_google_protobuf_java",
-      sha256 = "df77b0e60afcd3d90b2654cd305e61ae8ae2e2281b4d6540c7093da4c4245d75",
-      strip_prefix = "protobuf-3.3.1",
-      urls = ["https://github.com/google/protobuf/archive/v3.3.1.zip"],
+      sha256 = "542703acadc3f690d998f4641e1b988f15ba57ebca05fdfb1cd9095bec007948",
+      strip_prefix = "protobuf-3.4.0",
+      urls = ["https://github.com/google/protobuf/archive/v3.4.0.zip"],
   )
 
 def com_google_protobuf_nano_protobuf_javanano():

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

@@ -10,6 +10,7 @@ public  final class HealthCheckRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.health.v1.HealthCheckRequest)
     HealthCheckRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use HealthCheckRequest.newBuilder() to construct.
   private HealthCheckRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class HealthCheckRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private HealthCheckRequest(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class HealthCheckRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class HealthCheckRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -57,6 +61,7 @@ public  final class HealthCheckRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -121,6 +126,7 @@ public  final class HealthCheckRequest extends
     if (!getServiceBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, service_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -131,11 +137,11 @@ public  final class HealthCheckRequest extends
     if (!getServiceBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, service_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -149,6 +155,7 @@ public  final class HealthCheckRequest extends
     boolean result = true;
     result = result && getService()
         .equals(other.getService());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -324,7 +331,7 @@ public  final class HealthCheckRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -337,12 +344,12 @@ public  final class HealthCheckRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -360,6 +367,7 @@ public  final class HealthCheckRequest extends
         service_ = other.service_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -456,12 +464,12 @@ public  final class HealthCheckRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -10,6 +10,7 @@ public  final class HealthCheckResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.health.v1.HealthCheckResponse)
     HealthCheckResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use HealthCheckResponse.newBuilder() to construct.
   private HealthCheckResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class HealthCheckResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private HealthCheckResponse(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class HealthCheckResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class HealthCheckResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -57,6 +61,7 @@ public  final class HealthCheckResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -210,6 +215,7 @@ public  final class HealthCheckResponse extends
     if (status_ != io.grpc.health.v1.HealthCheckResponse.ServingStatus.UNKNOWN.getNumber()) {
       output.writeEnum(1, status_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -221,11 +227,11 @@ public  final class HealthCheckResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeEnumSize(1, status_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -238,6 +244,7 @@ public  final class HealthCheckResponse extends
 
     boolean result = true;
     result = result && status_ == other.status_;
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -413,7 +420,7 @@ public  final class HealthCheckResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -426,12 +433,12 @@ public  final class HealthCheckResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -448,6 +455,7 @@ public  final class HealthCheckResponse extends
       if (other.status_ != 0) {
         setStatusValue(other.getStatusValue());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -519,12 +527,12 @@ public  final class HealthCheckResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class CanonicalRpcStats extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.CanonicalRpcStats)
     CanonicalRpcStatsOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CanonicalRpcStats.newBuilder() to construct.
   private CanonicalRpcStats(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,7 +25,7 @@ public  final class CanonicalRpcStats extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CanonicalRpcStats(
       com.google.protobuf.CodedInputStream input,
@@ -32,6 +33,8 @@ public  final class CanonicalRpcStats extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -41,7 +44,8 @@ public  final class CanonicalRpcStats extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -275,6 +279,7 @@ public  final class CanonicalRpcStats extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -722,6 +727,7 @@ public  final class CanonicalRpcStats extends
     if (rpcServerElapsedTime_ != null) {
       output.writeMessage(17, getRpcServerElapsedTime());
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -797,11 +803,11 @@ public  final class CanonicalRpcStats extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(17, getRpcServerElapsedTime());
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -898,6 +904,7 @@ public  final class CanonicalRpcStats extends
       result = result && getRpcServerElapsedTime()
           .equals(other.getRpcServerElapsedTime());
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -1327,7 +1334,7 @@ public  final class CanonicalRpcStats extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1340,12 +1347,12 @@ public  final class CanonicalRpcStats extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1410,6 +1417,7 @@ public  final class CanonicalRpcStats extends
       if (other.hasRpcServerElapsedTime()) {
         mergeRpcServerElapsedTime(other.getRpcServerElapsedTime());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -3462,12 +3470,12 @@ public  final class CanonicalRpcStats extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class CustomMonitoringData extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.CustomMonitoringData)
     CustomMonitoringDataOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use CustomMonitoringData.newBuilder() to construct.
   private CustomMonitoringData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,7 +25,7 @@ public  final class CustomMonitoringData extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private CustomMonitoringData(
       com.google.protobuf.CodedInputStream input,
@@ -32,6 +33,8 @@ public  final class CustomMonitoringData extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -41,7 +44,8 @@ public  final class CustomMonitoringData extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +71,7 @@ public  final class CustomMonitoringData extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -130,6 +135,7 @@ public  final class CustomMonitoringData extends
     if (contents_ != null) {
       output.writeMessage(1, getContents());
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -141,11 +147,11 @@ public  final class CustomMonitoringData extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, getContents());
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -162,6 +168,7 @@ public  final class CustomMonitoringData extends
       result = result && getContents()
           .equals(other.getContents());
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -351,7 +358,7 @@ public  final class CustomMonitoringData extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +371,12 @@ public  final class CustomMonitoringData extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -386,6 +393,7 @@ public  final class CustomMonitoringData extends
       if (other.hasContents()) {
         mergeContents(other.getContents());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -566,12 +574,12 @@ public  final class CustomMonitoringData extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -10,6 +10,7 @@ public  final class MonitoringDataGroup extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.MonitoringDataGroup)
     MonitoringDataGroupOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use MonitoringDataGroup.newBuilder() to construct.
   private MonitoringDataGroup(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -21,7 +22,7 @@ public  final class MonitoringDataGroup extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private MonitoringDataGroup(
       com.google.protobuf.CodedInputStream input,
@@ -29,6 +30,8 @@ public  final class MonitoringDataGroup extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -38,7 +41,8 @@ public  final class MonitoringDataGroup extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -57,6 +61,7 @@ public  final class MonitoringDataGroup extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -129,6 +134,7 @@ public  final class MonitoringDataGroup extends
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -139,11 +145,11 @@ public  final class MonitoringDataGroup extends
     if (!getNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -157,6 +163,7 @@ public  final class MonitoringDataGroup extends
     boolean result = true;
     result = result && getName()
         .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -332,7 +339,7 @@ public  final class MonitoringDataGroup extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -345,12 +352,12 @@ public  final class MonitoringDataGroup extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -368,6 +375,7 @@ public  final class MonitoringDataGroup extends
         name_ = other.name_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -484,12 +492,12 @@ public  final class MonitoringDataGroup extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -15,6 +15,7 @@ public  final class StatsRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.StatsRequest)
     StatsRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use StatsRequest.newBuilder() to construct.
   private StatsRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -28,7 +29,7 @@ public  final class StatsRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private StatsRequest(
       com.google.protobuf.CodedInputStream input,
@@ -36,6 +37,8 @@ public  final class StatsRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -45,7 +48,8 @@ public  final class StatsRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -87,6 +91,7 @@ public  final class StatsRequest extends
       if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
         measurementNames_ = measurementNames_.getUnmodifiableView();
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -277,6 +282,7 @@ public  final class StatsRequest extends
     if (dontIncludeDescriptorsInFirstResponse_ != false) {
       output.writeBool(3, dontIncludeDescriptorsInFirstResponse_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -304,11 +310,11 @@ public  final class StatsRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(3, dontIncludeDescriptorsInFirstResponse_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -326,6 +332,7 @@ public  final class StatsRequest extends
         .equals(other.getMeasurementNamesList());
     result = result && (getDontIncludeDescriptorsInFirstResponse()
         == other.getDontIncludeDescriptorsInFirstResponse());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -532,7 +539,7 @@ public  final class StatsRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -545,12 +552,12 @@ public  final class StatsRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -587,6 +594,7 @@ public  final class StatsRequest extends
       if (other.getDontIncludeDescriptorsInFirstResponse() != false) {
         setDontIncludeDescriptorsInFirstResponse(other.getDontIncludeDescriptorsInFirstResponse());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1027,12 +1035,12 @@ public  final class StatsRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -15,6 +15,7 @@ public  final class StatsResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.StatsResponse)
     StatsResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use StatsResponse.newBuilder() to construct.
   private StatsResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class StatsResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private StatsResponse(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class StatsResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class StatsResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -94,6 +98,7 @@ public  final class StatsResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -232,6 +237,7 @@ public  final class StatsResponse extends
     if (view_ != null) {
       output.writeMessage(3, getView());
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -251,11 +257,11 @@ public  final class StatsResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(3, getView());
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -282,6 +288,7 @@ public  final class StatsResponse extends
       result = result && getView()
           .equals(other.getView());
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -502,7 +509,7 @@ public  final class StatsResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -515,12 +522,12 @@ public  final class StatsResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -543,6 +550,7 @@ public  final class StatsResponse extends
       if (other.hasView()) {
         mergeView(other.getView());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1038,12 +1046,12 @@ public  final class StatsResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class TraceRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.TraceRequest)
     TraceRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use TraceRequest.newBuilder() to construct.
   private TraceRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,13 +25,15 @@ public  final class TraceRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private TraceRequest(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -40,7 +43,8 @@ public  final class TraceRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -53,6 +57,7 @@ public  final class TraceRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -80,6 +85,7 @@ public  final class TraceRequest extends
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -87,11 +93,11 @@ public  final class TraceRequest extends
     if (size != -1) return size;
 
     size = 0;
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -103,6 +109,7 @@ public  final class TraceRequest extends
     io.grpc.instrumentation.v1alpha.TraceRequest other = (io.grpc.instrumentation.v1alpha.TraceRequest) obj;
 
     boolean result = true;
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -277,7 +284,7 @@ public  final class TraceRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -290,12 +297,12 @@ public  final class TraceRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -309,6 +316,7 @@ public  final class TraceRequest extends
 
     public Builder mergeFrom(io.grpc.instrumentation.v1alpha.TraceRequest other) {
       if (other == io.grpc.instrumentation.v1alpha.TraceRequest.getDefaultInstance()) return this;
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -336,12 +344,12 @@ public  final class TraceRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class TraceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.instrumentation.v1alpha.TraceResponse)
     TraceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use TraceResponse.newBuilder() to construct.
   private TraceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -24,13 +25,15 @@ public  final class TraceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private TraceResponse(
       com.google.protobuf.CodedInputStream input,
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -40,7 +43,8 @@ public  final class TraceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -53,6 +57,7 @@ public  final class TraceResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -80,6 +85,7 @@ public  final class TraceResponse extends
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -87,11 +93,11 @@ public  final class TraceResponse extends
     if (size != -1) return size;
 
     size = 0;
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -103,6 +109,7 @@ public  final class TraceResponse extends
     io.grpc.instrumentation.v1alpha.TraceResponse other = (io.grpc.instrumentation.v1alpha.TraceResponse) obj;
 
     boolean result = true;
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -277,7 +284,7 @@ public  final class TraceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -290,12 +297,12 @@ public  final class TraceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -309,6 +316,7 @@ public  final class TraceResponse extends
 
     public Builder mergeFrom(io.grpc.instrumentation.v1alpha.TraceResponse other) {
       if (other == io.grpc.instrumentation.v1alpha.TraceResponse.getDefaultInstance()) return this;
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -336,12 +344,12 @@ public  final class TraceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class ErrorResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ErrorResponse)
     ErrorResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ErrorResponse.newBuilder() to construct.
   private ErrorResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,7 +27,7 @@ public  final class ErrorResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ErrorResponse(
       com.google.protobuf.CodedInputStream input,
@@ -34,6 +35,8 @@ public  final class ErrorResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -43,7 +46,8 @@ public  final class ErrorResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +71,7 @@ public  final class ErrorResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -147,6 +152,7 @@ public  final class ErrorResponse extends
     if (!getErrorMessageBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, errorMessage_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -161,11 +167,11 @@ public  final class ErrorResponse extends
     if (!getErrorMessageBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, errorMessage_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -181,6 +187,7 @@ public  final class ErrorResponse extends
         == other.getErrorCode());
     result = result && getErrorMessage()
         .equals(other.getErrorMessage());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -365,7 +372,7 @@ public  final class ErrorResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -378,12 +385,12 @@ public  final class ErrorResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -404,6 +411,7 @@ public  final class ErrorResponse extends
         errorMessage_ = other.errorMessage_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -538,12 +546,12 @@ public  final class ErrorResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -15,6 +15,7 @@ public  final class ExtensionNumberResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ExtensionNumberResponse)
     ExtensionNumberResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ExtensionNumberResponse.newBuilder() to construct.
   private ExtensionNumberResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,7 +28,7 @@ public  final class ExtensionNumberResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ExtensionNumberResponse(
       com.google.protobuf.CodedInputStream input,
@@ -35,6 +36,8 @@ public  final class ExtensionNumberResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -44,7 +47,8 @@ public  final class ExtensionNumberResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -87,6 +91,7 @@ public  final class ExtensionNumberResponse extends
       if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
         extensionNumber_ = java.util.Collections.unmodifiableList(extensionNumber_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -193,6 +198,7 @@ public  final class ExtensionNumberResponse extends
     for (int i = 0; i < extensionNumber_.size(); i++) {
       output.writeInt32NoTag(extensionNumber_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -217,11 +223,11 @@ public  final class ExtensionNumberResponse extends
       }
       extensionNumberMemoizedSerializedSize = dataSize;
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -237,6 +243,7 @@ public  final class ExtensionNumberResponse extends
         .equals(other.getBaseTypeName());
     result = result && getExtensionNumberList()
         .equals(other.getExtensionNumberList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -431,7 +438,7 @@ public  final class ExtensionNumberResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -444,12 +451,12 @@ public  final class ExtensionNumberResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -477,6 +484,7 @@ public  final class ExtensionNumberResponse extends
         }
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -665,12 +673,12 @@ public  final class ExtensionNumberResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -15,6 +15,7 @@ public  final class ExtensionRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ExtensionRequest)
     ExtensionRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ExtensionRequest.newBuilder() to construct.
   private ExtensionRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,7 +28,7 @@ public  final class ExtensionRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ExtensionRequest(
       com.google.protobuf.CodedInputStream input,
@@ -35,6 +36,8 @@ public  final class ExtensionRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -44,7 +47,8 @@ public  final class ExtensionRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -68,6 +72,7 @@ public  final class ExtensionRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -152,6 +157,7 @@ public  final class ExtensionRequest extends
     if (extensionNumber_ != 0) {
       output.writeInt32(2, extensionNumber_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -166,11 +172,11 @@ public  final class ExtensionRequest extends
       size += com.google.protobuf.CodedOutputStream
         .computeInt32Size(2, extensionNumber_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,6 +192,7 @@ public  final class ExtensionRequest extends
         .equals(other.getContainingType());
     result = result && (getExtensionNumber()
         == other.getExtensionNumber());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -371,7 +378,7 @@ public  final class ExtensionRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -384,12 +391,12 @@ public  final class ExtensionRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -410,6 +417,7 @@ public  final class ExtensionRequest extends
       if (other.getExtensionNumber() != 0) {
         setExtensionNumber(other.getExtensionNumber());
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -552,12 +560,12 @@ public  final class ExtensionRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -16,6 +16,7 @@ public  final class FileDescriptorResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.FileDescriptorResponse)
     FileDescriptorResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use FileDescriptorResponse.newBuilder() to construct.
   private FileDescriptorResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -27,7 +28,7 @@ public  final class FileDescriptorResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private FileDescriptorResponse(
       com.google.protobuf.CodedInputStream input,
@@ -35,6 +36,8 @@ public  final class FileDescriptorResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -44,7 +47,8 @@ public  final class FileDescriptorResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -68,6 +72,7 @@ public  final class FileDescriptorResponse extends
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         fileDescriptorProto_ = java.util.Collections.unmodifiableList(fileDescriptorProto_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -138,6 +143,7 @@ public  final class FileDescriptorResponse extends
     for (int i = 0; i < fileDescriptorProto_.size(); i++) {
       output.writeBytes(1, fileDescriptorProto_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -154,11 +160,11 @@ public  final class FileDescriptorResponse extends
       size += dataSize;
       size += 1 * getFileDescriptorProtoList().size();
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -172,6 +178,7 @@ public  final class FileDescriptorResponse extends
     boolean result = true;
     result = result && getFileDescriptorProtoList()
         .equals(other.getFileDescriptorProtoList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -360,7 +367,7 @@ public  final class FileDescriptorResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -373,12 +380,12 @@ public  final class FileDescriptorResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -402,6 +409,7 @@ public  final class FileDescriptorResponse extends
         }
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -544,12 +552,12 @@ public  final class FileDescriptorResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class ListServiceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ListServiceResponse)
     ListServiceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ListServiceResponse.newBuilder() to construct.
   private ListServiceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class ListServiceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ListServiceResponse(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class ListServiceResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class ListServiceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -67,6 +71,7 @@ public  final class ListServiceResponse extends
       if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
         service_ = java.util.Collections.unmodifiableList(service_);
       }
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -157,6 +162,7 @@ public  final class ListServiceResponse extends
     for (int i = 0; i < service_.size(); i++) {
       output.writeMessage(1, service_.get(i));
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -168,11 +174,11 @@ public  final class ListServiceResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(1, service_.get(i));
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -186,6 +192,7 @@ public  final class ListServiceResponse extends
     boolean result = true;
     result = result && getServiceList()
         .equals(other.getServiceList());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -381,7 +388,7 @@ public  final class ListServiceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -394,12 +401,12 @@ public  final class ListServiceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -439,6 +446,7 @@ public  final class ListServiceResponse extends
           }
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -797,12 +805,12 @@ public  final class ListServiceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class ServerReflectionRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ServerReflectionRequest)
     ServerReflectionRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ServerReflectionRequest.newBuilder() to construct.
   private ServerReflectionRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class ServerReflectionRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ServerReflectionRequest(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class ServerReflectionRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class ServerReflectionRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -99,6 +103,7 @@ public  final class ServerReflectionRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -299,6 +304,17 @@ public  final class ServerReflectionRequest extends
   }
 
   public static final int FILE_CONTAINING_EXTENSION_FIELD_NUMBER = 5;
+  /**
+   * <pre>
+   * Find the proto file which defines an extension extending the given
+   * message type with the given field number.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+   */
+  public boolean hasFileContainingExtension() {
+    return messageRequestCase_ == 5;
+  }
   /**
    * <pre>
    * Find the proto file which defines an extension extending the given
@@ -476,6 +492,7 @@ public  final class ServerReflectionRequest extends
     if (messageRequestCase_ == 7) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, messageRequest_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -502,11 +519,11 @@ public  final class ServerReflectionRequest extends
     if (messageRequestCase_ == 7) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, messageRequest_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -547,6 +564,7 @@ public  final class ServerReflectionRequest extends
       case 0:
       default:
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -772,7 +790,7 @@ public  final class ServerReflectionRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -785,12 +803,12 @@ public  final class ServerReflectionRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -841,6 +859,7 @@ public  final class ServerReflectionRequest extends
           break;
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1163,6 +1182,17 @@ public  final class ServerReflectionRequest extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ExtensionRequest, io.grpc.reflection.v1alpha.ExtensionRequest.Builder, io.grpc.reflection.v1alpha.ExtensionRequestOrBuilder> fileContainingExtensionBuilder_;
+    /**
+     * <pre>
+     * Find the proto file which defines an extension extending the given
+     * message type with the given field number.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+     */
+    public boolean hasFileContainingExtension() {
+      return messageRequestCase_ == 5;
+    }
     /**
      * <pre>
      * Find the proto file which defines an extension extending the given
@@ -1572,12 +1602,12 @@ public  final class ServerReflectionRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -57,6 +57,15 @@ public interface ServerReflectionRequestOrBuilder extends
   com.google.protobuf.ByteString
       getFileContainingSymbolBytes();
 
+  /**
+   * <pre>
+   * Find the proto file which defines an extension extending the given
+   * message type with the given field number.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ExtensionRequest file_containing_extension = 5;</code>
+   */
+  boolean hasFileContainingExtension();
   /**
    * <pre>
    * Find the proto file which defines an extension extending the given

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

@@ -14,6 +14,7 @@ public  final class ServerReflectionResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ServerReflectionResponse)
     ServerReflectionResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ServerReflectionResponse.newBuilder() to construct.
   private ServerReflectionResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class ServerReflectionResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ServerReflectionResponse(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class ServerReflectionResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class ServerReflectionResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -130,6 +134,7 @@ public  final class ServerReflectionResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -243,6 +248,21 @@ public  final class ServerReflectionResponse extends
   }
 
   public static final int FILE_DESCRIPTOR_RESPONSE_FIELD_NUMBER = 4;
+  /**
+   * <pre>
+   * This message is used to answer file_by_filename, file_containing_symbol,
+   * file_containing_extension requests with transitive dependencies. As
+   * the repeated label is not allowed in oneof fields, we use a
+   * FileDescriptorResponse message to encapsulate the repeated fields.
+   * The reflection service is allowed to avoid sending FileDescriptorProtos
+   * that were previously sent in response to earlier requests in the stream.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+   */
+  public boolean hasFileDescriptorResponse() {
+    return messageResponseCase_ == 4;
+  }
   /**
    * <pre>
    * This message is used to answer file_by_filename, file_containing_symbol,
@@ -281,6 +301,16 @@ public  final class ServerReflectionResponse extends
   }
 
   public static final int ALL_EXTENSION_NUMBERS_RESPONSE_FIELD_NUMBER = 5;
+  /**
+   * <pre>
+   * This message is used to answer all_extension_numbers_of_type requst.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+   */
+  public boolean hasAllExtensionNumbersResponse() {
+    return messageResponseCase_ == 5;
+  }
   /**
    * <pre>
    * This message is used to answer all_extension_numbers_of_type requst.
@@ -309,6 +339,16 @@ public  final class ServerReflectionResponse extends
   }
 
   public static final int LIST_SERVICES_RESPONSE_FIELD_NUMBER = 6;
+  /**
+   * <pre>
+   * This message is used to answer list_services request.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+   */
+  public boolean hasListServicesResponse() {
+    return messageResponseCase_ == 6;
+  }
   /**
    * <pre>
    * This message is used to answer list_services request.
@@ -337,6 +377,16 @@ public  final class ServerReflectionResponse extends
   }
 
   public static final int ERROR_RESPONSE_FIELD_NUMBER = 7;
+  /**
+   * <pre>
+   * This message is used when an error occurs.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+   */
+  public boolean hasErrorResponse() {
+    return messageResponseCase_ == 7;
+  }
   /**
    * <pre>
    * This message is used when an error occurs.
@@ -394,6 +444,7 @@ public  final class ServerReflectionResponse extends
     if (messageResponseCase_ == 7) {
       output.writeMessage(7, (io.grpc.reflection.v1alpha.ErrorResponse) messageResponse_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -424,11 +475,11 @@ public  final class ServerReflectionResponse extends
       size += com.google.protobuf.CodedOutputStream
         .computeMessageSize(7, (io.grpc.reflection.v1alpha.ErrorResponse) messageResponse_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -470,6 +521,7 @@ public  final class ServerReflectionResponse extends
       case 0:
       default:
     }
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -715,7 +767,7 @@ public  final class ServerReflectionResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -728,12 +780,12 @@ public  final class ServerReflectionResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -775,6 +827,7 @@ public  final class ServerReflectionResponse extends
           break;
         }
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -1004,6 +1057,21 @@ public  final class ServerReflectionResponse extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.FileDescriptorResponse, io.grpc.reflection.v1alpha.FileDescriptorResponse.Builder, io.grpc.reflection.v1alpha.FileDescriptorResponseOrBuilder> fileDescriptorResponseBuilder_;
+    /**
+     * <pre>
+     * This message is used to answer file_by_filename, file_containing_symbol,
+     * file_containing_extension requests with transitive dependencies. As
+     * the repeated label is not allowed in oneof fields, we use a
+     * FileDescriptorResponse message to encapsulate the repeated fields.
+     * The reflection service is allowed to avoid sending FileDescriptorProtos
+     * that were previously sent in response to earlier requests in the stream.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+     */
+    public boolean hasFileDescriptorResponse() {
+      return messageResponseCase_ == 4;
+    }
     /**
      * <pre>
      * This message is used to answer file_by_filename, file_containing_symbol,
@@ -1206,6 +1274,16 @@ public  final class ServerReflectionResponse extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ExtensionNumberResponse, io.grpc.reflection.v1alpha.ExtensionNumberResponse.Builder, io.grpc.reflection.v1alpha.ExtensionNumberResponseOrBuilder> allExtensionNumbersResponseBuilder_;
+    /**
+     * <pre>
+     * This message is used to answer all_extension_numbers_of_type requst.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+     */
+    public boolean hasAllExtensionNumbersResponse() {
+      return messageResponseCase_ == 5;
+    }
     /**
      * <pre>
      * This message is used to answer all_extension_numbers_of_type requst.
@@ -1368,6 +1446,16 @@ public  final class ServerReflectionResponse extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ListServiceResponse, io.grpc.reflection.v1alpha.ListServiceResponse.Builder, io.grpc.reflection.v1alpha.ListServiceResponseOrBuilder> listServicesResponseBuilder_;
+    /**
+     * <pre>
+     * This message is used to answer list_services request.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+     */
+    public boolean hasListServicesResponse() {
+      return messageResponseCase_ == 6;
+    }
     /**
      * <pre>
      * This message is used to answer list_services request.
@@ -1530,6 +1618,16 @@ public  final class ServerReflectionResponse extends
 
     private com.google.protobuf.SingleFieldBuilderV3<
         io.grpc.reflection.v1alpha.ErrorResponse, io.grpc.reflection.v1alpha.ErrorResponse.Builder, io.grpc.reflection.v1alpha.ErrorResponseOrBuilder> errorResponseBuilder_;
+    /**
+     * <pre>
+     * This message is used when an error occurs.
+     * </pre>
+     *
+     * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+     */
+    public boolean hasErrorResponse() {
+      return messageResponseCase_ == 7;
+    }
     /**
      * <pre>
      * This message is used when an error occurs.
@@ -1691,12 +1789,12 @@ public  final class ServerReflectionResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -30,6 +30,19 @@ public interface ServerReflectionResponseOrBuilder extends
    */
   io.grpc.reflection.v1alpha.ServerReflectionRequestOrBuilder getOriginalRequestOrBuilder();
 
+  /**
+   * <pre>
+   * This message is used to answer file_by_filename, file_containing_symbol,
+   * file_containing_extension requests with transitive dependencies. As
+   * the repeated label is not allowed in oneof fields, we use a
+   * FileDescriptorResponse message to encapsulate the repeated fields.
+   * The reflection service is allowed to avoid sending FileDescriptorProtos
+   * that were previously sent in response to earlier requests in the stream.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.FileDescriptorResponse file_descriptor_response = 4;</code>
+   */
+  boolean hasFileDescriptorResponse();
   /**
    * <pre>
    * This message is used to answer file_by_filename, file_containing_symbol,
@@ -57,6 +70,14 @@ public interface ServerReflectionResponseOrBuilder extends
    */
   io.grpc.reflection.v1alpha.FileDescriptorResponseOrBuilder getFileDescriptorResponseOrBuilder();
 
+  /**
+   * <pre>
+   * This message is used to answer all_extension_numbers_of_type requst.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ExtensionNumberResponse all_extension_numbers_response = 5;</code>
+   */
+  boolean hasAllExtensionNumbersResponse();
   /**
    * <pre>
    * This message is used to answer all_extension_numbers_of_type requst.
@@ -74,6 +95,14 @@ public interface ServerReflectionResponseOrBuilder extends
    */
   io.grpc.reflection.v1alpha.ExtensionNumberResponseOrBuilder getAllExtensionNumbersResponseOrBuilder();
 
+  /**
+   * <pre>
+   * This message is used to answer list_services request.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ListServiceResponse list_services_response = 6;</code>
+   */
+  boolean hasListServicesResponse();
   /**
    * <pre>
    * This message is used to answer list_services request.
@@ -91,6 +120,14 @@ public interface ServerReflectionResponseOrBuilder extends
    */
   io.grpc.reflection.v1alpha.ListServiceResponseOrBuilder getListServicesResponseOrBuilder();
 
+  /**
+   * <pre>
+   * This message is used when an error occurs.
+   * </pre>
+   *
+   * <code>.grpc.reflection.v1alpha.ErrorResponse error_response = 7;</code>
+   */
+  boolean hasErrorResponse();
   /**
    * <pre>
    * This message is used when an error occurs.

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

@@ -15,6 +15,7 @@ public  final class ServiceResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.v1alpha.ServiceResponse)
     ServiceResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ServiceResponse.newBuilder() to construct.
   private ServiceResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -26,7 +27,7 @@ public  final class ServiceResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private ServiceResponse(
       com.google.protobuf.CodedInputStream input,
@@ -34,6 +35,8 @@ public  final class ServiceResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -43,7 +46,8 @@ public  final class ServiceResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -62,6 +66,7 @@ public  final class ServiceResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -136,6 +141,7 @@ public  final class ServiceResponse extends
     if (!getNameBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -146,11 +152,11 @@ public  final class ServiceResponse extends
     if (!getNameBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -164,6 +170,7 @@ public  final class ServiceResponse extends
     boolean result = true;
     result = result && getName()
         .equals(other.getName());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -344,7 +351,7 @@ public  final class ServiceResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -357,12 +364,12 @@ public  final class ServiceResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -380,6 +387,7 @@ public  final class ServiceResponse extends
         name_ = other.name_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -501,12 +509,12 @@ public  final class ServiceResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -10,6 +10,7 @@ public  final class DynamicReply extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.DynamicReply)
     DynamicReplyOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use DynamicReply.newBuilder() to construct.
   private DynamicReply(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,8 +41,8 @@ public  final class DynamicReply extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -150,7 +151,6 @@ public  final class DynamicReply extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -351,7 +351,7 @@ public  final class DynamicReply extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +364,12 @@ public  final class DynamicReply extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {

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

@@ -10,6 +10,7 @@ public  final class DynamicRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.DynamicRequest)
     DynamicRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use DynamicRequest.newBuilder() to construct.
   private DynamicRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,8 +41,8 @@ public  final class DynamicRequest extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -150,7 +151,6 @@ public  final class DynamicRequest extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -351,7 +351,7 @@ public  final class DynamicRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +364,12 @@ public  final class DynamicRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {

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

@@ -10,6 +10,7 @@ public  final class EmptyMessage extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.EmptyMessage)
     EmptyMessageOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use EmptyMessage.newBuilder() to construct.
   private EmptyMessage(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -38,8 +39,8 @@ public  final class EmptyMessage extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -93,7 +94,6 @@ public  final class EmptyMessage extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -276,7 +276,7 @@ public  final class EmptyMessage extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -289,12 +289,12 @@ public  final class EmptyMessage extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {

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

@@ -10,6 +10,7 @@ public  final class NestedTypeOuter extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.NestedTypeOuter)
     NestedTypeOuterOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use NestedTypeOuter.newBuilder() to construct.
   private NestedTypeOuter(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -38,8 +39,8 @@ public  final class NestedTypeOuter extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -79,6 +80,7 @@ public  final class NestedTypeOuter extends
       com.google.protobuf.GeneratedMessageV3 implements
       // @@protoc_insertion_point(message_implements:grpc.reflection.testing.NestedTypeOuter.Middle)
       MiddleOrBuilder {
+  private static final long serialVersionUID = 0L;
     // Use Middle.newBuilder() to construct.
     private Middle(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
       super(builder);
@@ -107,8 +109,8 @@ public  final class NestedTypeOuter extends
               done = true;
               break;
             default: {
-              if (!parseUnknownField(input, unknownFields,
-                                     extensionRegistry, tag)) {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
                 done = true;
               }
               break;
@@ -157,6 +159,7 @@ public  final class NestedTypeOuter extends
         com.google.protobuf.GeneratedMessageV3 implements
         // @@protoc_insertion_point(message_implements:grpc.reflection.testing.NestedTypeOuter.Middle.Inner)
         InnerOrBuilder {
+    private static final long serialVersionUID = 0L;
       // Use Inner.newBuilder() to construct.
       private Inner(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
         super(builder);
@@ -187,8 +190,8 @@ public  final class NestedTypeOuter extends
                 done = true;
                 break;
               default: {
-                if (!parseUnknownField(input, unknownFields,
-                                       extensionRegistry, tag)) {
+                if (!parseUnknownField(
+                    input, unknownFields, extensionRegistry, tag)) {
                   done = true;
                 }
                 break;
@@ -270,7 +273,6 @@ public  final class NestedTypeOuter extends
         return size;
       }
 
-      private static final long serialVersionUID = 0L;
       @java.lang.Override
       public boolean equals(final java.lang.Object obj) {
         if (obj == this) {
@@ -471,7 +473,7 @@ public  final class NestedTypeOuter extends
         }
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
         public Builder clearField(
@@ -484,12 +486,12 @@ public  final class NestedTypeOuter extends
         }
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, Object value) {
+            int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
-            Object value) {
+            java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
         public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -639,7 +641,6 @@ public  final class NestedTypeOuter extends
       return size;
     }
 
-    private static final long serialVersionUID = 0L;
     @java.lang.Override
     public boolean equals(final java.lang.Object obj) {
       if (obj == this) {
@@ -822,7 +823,7 @@ public  final class NestedTypeOuter extends
       }
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
       public Builder clearField(
@@ -835,12 +836,12 @@ public  final class NestedTypeOuter extends
       }
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          int index, Object value) {
+          int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
-          Object value) {
+          java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
       public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -954,7 +955,6 @@ public  final class NestedTypeOuter extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -1137,7 +1137,7 @@ public  final class NestedTypeOuter extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -1150,12 +1150,12 @@ public  final class NestedTypeOuter extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {

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

@@ -10,6 +10,7 @@ public  final class Reply extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.Reply)
     ReplyOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use Reply.newBuilder() to construct.
   private Reply(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,8 +41,8 @@ public  final class Reply extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -150,7 +151,6 @@ public  final class Reply extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -351,7 +351,7 @@ public  final class Reply extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +364,12 @@ public  final class Reply extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {

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

@@ -10,6 +10,7 @@ public  final class Request extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.Request)
     RequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use Request.newBuilder() to construct.
   private Request(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -40,8 +41,8 @@ public  final class Request extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -150,7 +151,6 @@ public  final class Request extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -351,7 +351,7 @@ public  final class Request extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -364,12 +364,12 @@ public  final class Request extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {

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

@@ -11,6 +11,7 @@ public  final class ThirdLevelType extends
       ThirdLevelType> implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.ThirdLevelType)
     ThirdLevelTypeOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use ThirdLevelType.newBuilder() to construct.
   private ThirdLevelType(com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<io.grpc.reflection.testing.ThirdLevelType, ?> builder) {
     super(builder);
@@ -41,8 +42,8 @@ public  final class ThirdLevelType extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -160,7 +161,6 @@ public  final class ThirdLevelType extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -365,7 +365,7 @@ public  final class ThirdLevelType extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -378,12 +378,12 @@ public  final class ThirdLevelType extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public <Type> Builder setExtension(

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

@@ -11,6 +11,7 @@ public  final class TypeWithExtensions extends
       TypeWithExtensions> implements
     // @@protoc_insertion_point(message_implements:grpc.reflection.testing.TypeWithExtensions)
     TypeWithExtensionsOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use TypeWithExtensions.newBuilder() to construct.
   private TypeWithExtensions(com.google.protobuf.GeneratedMessageV3.ExtendableBuilder<io.grpc.reflection.testing.TypeWithExtensions, ?> builder) {
     super(builder);
@@ -41,8 +42,8 @@ public  final class TypeWithExtensions extends
             done = true;
             break;
           default: {
-            if (!parseUnknownField(input, unknownFields,
-                                   extensionRegistry, tag)) {
+            if (!parseUnknownField(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -160,7 +161,6 @@ public  final class TypeWithExtensions extends
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -365,7 +365,7 @@ public  final class TypeWithExtensions extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -378,12 +378,12 @@ public  final class TypeWithExtensions extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public <Type> Builder setExtension(

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

@@ -14,6 +14,7 @@ public  final class SimpleRequest extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.testing.SimpleRequest)
     SimpleRequestOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use SimpleRequest.newBuilder() to construct.
   private SimpleRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class SimpleRequest extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private SimpleRequest(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class SimpleRequest extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class SimpleRequest extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -61,6 +65,7 @@ public  final class SimpleRequest extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -133,6 +138,7 @@ public  final class SimpleRequest extends
     if (!getRequestMessageBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, requestMessage_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -143,11 +149,11 @@ public  final class SimpleRequest extends
     if (!getRequestMessageBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, requestMessage_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -161,6 +167,7 @@ public  final class SimpleRequest extends
     boolean result = true;
     result = result && getRequestMessage()
         .equals(other.getRequestMessage());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -340,7 +347,7 @@ public  final class SimpleRequest extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -353,12 +360,12 @@ public  final class SimpleRequest extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -376,6 +383,7 @@ public  final class SimpleRequest extends
         requestMessage_ = other.requestMessage_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -492,12 +500,12 @@ public  final class SimpleRequest extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }
 
 

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

@@ -14,6 +14,7 @@ public  final class SimpleResponse extends
     com.google.protobuf.GeneratedMessageV3 implements
     // @@protoc_insertion_point(message_implements:grpc.testing.SimpleResponse)
     SimpleResponseOrBuilder {
+private static final long serialVersionUID = 0L;
   // Use SimpleResponse.newBuilder() to construct.
   private SimpleResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
     super(builder);
@@ -25,7 +26,7 @@ public  final class SimpleResponse extends
   @java.lang.Override
   public final com.google.protobuf.UnknownFieldSet
   getUnknownFields() {
-    return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
+    return this.unknownFields;
   }
   private SimpleResponse(
       com.google.protobuf.CodedInputStream input,
@@ -33,6 +34,8 @@ public  final class SimpleResponse extends
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
     int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
       boolean done = false;
       while (!done) {
@@ -42,7 +45,8 @@ public  final class SimpleResponse extends
             done = true;
             break;
           default: {
-            if (!input.skipField(tag)) {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
               done = true;
             }
             break;
@@ -61,6 +65,7 @@ public  final class SimpleResponse extends
       throw new com.google.protobuf.InvalidProtocolBufferException(
           e).setUnfinishedMessage(this);
     } finally {
+      this.unknownFields = unknownFields.build();
       makeExtensionsImmutable();
     }
   }
@@ -133,6 +138,7 @@ public  final class SimpleResponse extends
     if (!getResponseMessageBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, responseMessage_);
     }
+    unknownFields.writeTo(output);
   }
 
   public int getSerializedSize() {
@@ -143,11 +149,11 @@ public  final class SimpleResponse extends
     if (!getResponseMessageBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, responseMessage_);
     }
+    size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
   }
 
-  private static final long serialVersionUID = 0L;
   @java.lang.Override
   public boolean equals(final java.lang.Object obj) {
     if (obj == this) {
@@ -161,6 +167,7 @@ public  final class SimpleResponse extends
     boolean result = true;
     result = result && getResponseMessage()
         .equals(other.getResponseMessage());
+    result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
 
@@ -340,7 +347,7 @@ public  final class SimpleResponse extends
     }
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
     public Builder clearField(
@@ -353,12 +360,12 @@ public  final class SimpleResponse extends
     }
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, Object value) {
+        int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
-        Object value) {
+        java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
     public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -376,6 +383,7 @@ public  final class SimpleResponse extends
         responseMessage_ = other.responseMessage_;
         onChanged();
       }
+      this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
@@ -492,12 +500,12 @@ public  final class SimpleResponse extends
     }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.setUnknownFieldsProto3(unknownFields);
     }
 
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return this;
+      return super.mergeUnknownFields(unknownFields);
     }