services: sync binlog proto (#4542)

https://github.com/grpc/grpc-proto/pull/20

5 files changed, 1062 insertions, 63 deletions

diff --git a/services/src/generated/main/java/io/grpc/binarylog/BinaryLogProto.java b/services/src/generated/main/java/io/grpc/binarylog/BinaryLogProto.java
index ae73c944f..633b6234e 100644
--- a/services/src/generated/main/java/io/grpc/binarylog/BinaryLogProto.java
+++ b/services/src/generated/main/java/io/grpc/binarylog/BinaryLogProto.java
@@ -54,33 +54,38 @@ public final class BinaryLogProto {
   static {
     java.lang.String[] descriptorData = {
       "\n\027io/grpc/binarylog.proto\022\026grpc.binarylo" +
-      "g.v1alpha\"\315\004\n\014GrpcLogEntry\0227\n\004type\030\001 \001(\016" +
-      "2).grpc.binarylog.v1alpha.GrpcLogEntry.T" +
-      "ype\022;\n\006logger\030\002 \001(\0162+.grpc.binarylog.v1a" +
-      "lpha.GrpcLogEntry.Logger\0220\n\007call_id\030\003 \001(" +
-      "\0132\037.grpc.binarylog.v1alpha.Uint128\0224\n\010me" +
-      "tadata\030\004 \001(\0132 .grpc.binarylog.v1alpha.Me" +
-      "tadataH\000\0222\n\007message\030\005 \001(\0132\037.grpc.binaryl" +
-      "og.v1alpha.MessageH\000\022*\n\004peer\030\006 \001(\0132\034.grp" +
-      "c.binarylog.v1alpha.Peer\022\021\n\ttruncated\030\007 " +
-      "\001(\010\"\252\001\n\004Type\022\020\n\014UNKNOWN_TYPE\020\000\022\031\n\025SEND_I" +
-      "NITIAL_METADATA\020\001\022\032\n\026SEND_TRAILING_METAD" +
-      "ATA\020\002\022\020\n\014SEND_MESSAGE\020\003\022\031\n\025RECV_INITIAL_" +
-      "METADATA\020\004\022\032\n\026RECV_TRAILING_METADATA\020\005\022\020" +
-      "\n\014RECV_MESSAGE\020\006\"4\n\006Logger\022\022\n\016UNKNOWN_LO" +
-      "GGER\020\000\022\n\n\006CLIENT\020\001\022\n\n\006SERVER\020\002B\t\n\007payloa" +
-      "d\"6\n\007Message\022\r\n\005flags\030\001 \001(\r\022\016\n\006length\030\002 " +
-      "\001(\r\022\014\n\004data\030\003 \001(\014\"@\n\010Metadata\0224\n\005entry\030\001" +
-      " \003(\0132%.grpc.binarylog.v1alpha.MetadataEn" +
-      "try\"+\n\rMetadataEntry\022\013\n\003key\030\001 \001(\014\022\r\n\005val" +
-      "ue\030\002 \001(\014\"\277\001\n\004Peer\0228\n\tpeer_type\030\001 \001(\0162%.g" +
-      "rpc.binarylog.v1alpha.Peer.PeerType\022\014\n\004p" +
-      "eer\030\002 \001(\014\022\017\n\007address\030\003 \001(\t\022\017\n\007ip_port\030\004 " +
-      "\001(\r\"M\n\010PeerType\022\024\n\020UNKNOWN_PEERTYPE\020\000\022\r\n" +
-      "\tPEER_IPV4\020\001\022\r\n\tPEER_IPV6\020\002\022\r\n\tPEER_UNIX" +
-      "\020\003\"$\n\007Uint128\022\014\n\004high\030\001 \001(\006\022\013\n\003low\030\002 \001(\006" +
-      "B%\n\021io.grpc.binarylogB\016BinaryLogProtoP\001b" +
-      "\006proto3"
+      "g.v1alpha\032\036google/protobuf/duration.prot" +
+      "o\"\364\005\n\014GrpcLogEntry\0227\n\004type\030\001 \001(\0162).grpc." +
+      "binarylog.v1alpha.GrpcLogEntry.Type\022;\n\006l" +
+      "ogger\030\002 \001(\0162+.grpc.binarylog.v1alpha.Grp" +
+      "cLogEntry.Logger\0220\n\007call_id\030\003 \001(\0132\037.grpc" +
+      ".binarylog.v1alpha.Uint128\0224\n\010metadata\030\004" +
+      " \001(\0132 .grpc.binarylog.v1alpha.MetadataH\000" +
+      "\0222\n\007message\030\005 \001(\0132\037.grpc.binarylog.v1alp" +
+      "ha.MessageH\000\022*\n\004peer\030\006 \001(\0132\034.grpc.binary" +
+      "log.v1alpha.Peer\022\021\n\ttruncated\030\007 \001(\010\022\023\n\013m" +
+      "ethod_name\030\010 \001(\t\022\023\n\013status_code\030\t \001(\r\022\026\n" +
+      "\016status_message\030\n \001(\t\022\026\n\016status_details\030" +
+      "\013 \001(\014\022*\n\007timeout\030\014 \001(\0132\031.google.protobuf" +
+      ".Duration\022\037\n\027sequence_id_within_call\030\r \001" +
+      "(\r\"\252\001\n\004Type\022\020\n\014UNKNOWN_TYPE\020\000\022\031\n\025SEND_IN" +
+      "ITIAL_METADATA\020\001\022\032\n\026SEND_TRAILING_METADA" +
+      "TA\020\002\022\020\n\014SEND_MESSAGE\020\003\022\031\n\025RECV_INITIAL_M" +
+      "ETADATA\020\004\022\032\n\026RECV_TRAILING_METADATA\020\005\022\020\n" +
+      "\014RECV_MESSAGE\020\006\"4\n\006Logger\022\022\n\016UNKNOWN_LOG" +
+      "GER\020\000\022\n\n\006CLIENT\020\001\022\n\n\006SERVER\020\002B\t\n\007payload" +
+      "\"6\n\007Message\022\r\n\005flags\030\001 \001(\r\022\016\n\006length\030\002 \001" +
+      "(\r\022\014\n\004data\030\003 \001(\014\"@\n\010Metadata\0224\n\005entry\030\001 " +
+      "\003(\0132%.grpc.binarylog.v1alpha.MetadataEnt" +
+      "ry\"+\n\rMetadataEntry\022\013\n\003key\030\001 \001(\014\022\r\n\005valu" +
+      "e\030\002 \001(\014\"\277\001\n\004Peer\0228\n\tpeer_type\030\001 \001(\0162%.gr" +
+      "pc.binarylog.v1alpha.Peer.PeerType\022\014\n\004pe" +
+      "er\030\002 \001(\014\022\017\n\007address\030\003 \001(\t\022\017\n\007ip_port\030\004 \001" +
+      "(\r\"M\n\010PeerType\022\024\n\020UNKNOWN_PEERTYPE\020\000\022\r\n\t" +
+      "PEER_IPV4\020\001\022\r\n\tPEER_IPV6\020\002\022\r\n\tPEER_UNIX\020" +
+      "\003\"$\n\007Uint128\022\014\n\004high\030\001 \001(\006\022\013\n\003low\030\002 \001(\006B" +
+      "%\n\021io.grpc.binarylogB\016BinaryLogProtoP\001b\006" +
+      "proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -93,13 +98,14 @@ public final class BinaryLogProto {
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          com.google.protobuf.DurationProto.getDescriptor(),
         }, assigner);
     internal_static_grpc_binarylog_v1alpha_GrpcLogEntry_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_grpc_binarylog_v1alpha_GrpcLogEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_binarylog_v1alpha_GrpcLogEntry_descriptor,
-        new java.lang.String[] { "Type", "Logger", "CallId", "Metadata", "Message", "Peer", "Truncated", "Payload", });
+        new java.lang.String[] { "Type", "Logger", "CallId", "Metadata", "Message", "Peer", "Truncated", "MethodName", "StatusCode", "StatusMessage", "StatusDetails", "Timeout", "SequenceIdWithinCall", "Payload", });
     internal_static_grpc_binarylog_v1alpha_Message_descriptor =
       getDescriptor().getMessageTypes().get(1);
     internal_static_grpc_binarylog_v1alpha_Message_fieldAccessorTable = new
@@ -130,6 +136,7 @@ public final class BinaryLogProto {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_binarylog_v1alpha_Uint128_descriptor,
         new java.lang.String[] { "High", "Low", });
+    com.google.protobuf.DurationProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/services/src/generated/main/java/io/grpc/binarylog/GrpcLogEntry.java b/services/src/generated/main/java/io/grpc/binarylog/GrpcLogEntry.java
index 88fa9f4c6..4a2cfcc87 100644
--- a/services/src/generated/main/java/io/grpc/binarylog/GrpcLogEntry.java
+++ b/services/src/generated/main/java/io/grpc/binarylog/GrpcLogEntry.java
@@ -23,6 +23,11 @@ private static final long serialVersionUID = 0L;
     type_ = 0;
     logger_ = 0;
     truncated_ = false;
+    methodName_ = "";
+    statusCode_ = 0;
+    statusMessage_ = "";
+    statusDetails_ = com.google.protobuf.ByteString.EMPTY;
+    sequenceIdWithinCall_ = 0;
   }
 
   @java.lang.Override
@@ -127,6 +132,46 @@ private static final long serialVersionUID = 0L;
             truncated_ = input.readBool();
             break;
           }
+          case 66: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            methodName_ = s;
+            break;
+          }
+          case 72: {
+
+            statusCode_ = input.readUInt32();
+            break;
+          }
+          case 82: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            statusMessage_ = s;
+            break;
+          }
+          case 90: {
+
+            statusDetails_ = input.readBytes();
+            break;
+          }
+          case 98: {
+            com.google.protobuf.Duration.Builder subBuilder = null;
+            if (timeout_ != null) {
+              subBuilder = timeout_.toBuilder();
+            }
+            timeout_ = input.readMessage(com.google.protobuf.Duration.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(timeout_);
+              timeout_ = subBuilder.buildPartial();
+            }
+
+            break;
+          }
+          case 104: {
+
+            sequenceIdWithinCall_ = input.readUInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -534,7 +579,9 @@ private static final long serialVersionUID = 0L;
   public static final int METADATA_FIELD_NUMBER = 4;
   /**
    * <pre>
-   * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+   * Used by {SEND,RECV}_INITIAL_METADATA and
+   * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+   * from the application.
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -544,7 +591,9 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+   * Used by {SEND,RECV}_INITIAL_METADATA and
+   * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+   * from the application.
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -557,7 +606,9 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+   * Used by {SEND,RECV}_INITIAL_METADATA and
+   * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+   * from the application.
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -572,7 +623,7 @@ private static final long serialVersionUID = 0L;
   public static final int MESSAGE_FIELD_NUMBER = 5;
   /**
    * <pre>
-   * Used by REQUEST and RESPONSE
+   * Used by {SEND,RECV}_MESSAGE
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -582,7 +633,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Used by REQUEST and RESPONSE
+   * Used by {SEND,RECV}_MESSAGE
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -595,7 +646,7 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * Used by REQUEST and RESPONSE
+   * Used by {SEND,RECV}_MESSAGE
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -656,6 +707,174 @@ private static final long serialVersionUID = 0L;
     return truncated_;
   }
 
+  public static final int METHOD_NAME_FIELD_NUMBER = 8;
+  private volatile java.lang.Object methodName_;
+  /**
+   * <pre>
+   * The method name. Logged for the first entry:
+   * RECV_INITIAL_METADATA for server side or
+   * SEND_INITIAL_METADATA for client side.
+   * </pre>
+   *
+   * <code>string method_name = 8;</code>
+   */
+  public java.lang.String getMethodName() {
+    java.lang.Object ref = methodName_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      methodName_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * The method name. Logged for the first entry:
+   * RECV_INITIAL_METADATA for server side or
+   * SEND_INITIAL_METADATA for client side.
+   * </pre>
+   *
+   * <code>string method_name = 8;</code>
+   */
+  public com.google.protobuf.ByteString
+      getMethodNameBytes() {
+    java.lang.Object ref = methodName_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      methodName_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int STATUS_CODE_FIELD_NUMBER = 9;
+  private int statusCode_;
+  /**
+   * <pre>
+   * status_code and status_message:
+   * Only present for SEND_TRAILING_METADATA on server side or
+   * RECV_TRAILING_METADATA on client side.
+   * </pre>
+   *
+   * <code>uint32 status_code = 9;</code>
+   */
+  public int getStatusCode() {
+    return statusCode_;
+  }
+
+  public static final int STATUS_MESSAGE_FIELD_NUMBER = 10;
+  private volatile java.lang.Object statusMessage_;
+  /**
+   * <pre>
+   * An original status message before any transport specific
+   * encoding.
+   * </pre>
+   *
+   * <code>string status_message = 10;</code>
+   */
+  public java.lang.String getStatusMessage() {
+    java.lang.Object ref = statusMessage_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      statusMessage_ = s;
+      return s;
+    }
+  }
+  /**
+   * <pre>
+   * An original status message before any transport specific
+   * encoding.
+   * </pre>
+   *
+   * <code>string status_message = 10;</code>
+   */
+  public com.google.protobuf.ByteString
+      getStatusMessageBytes() {
+    java.lang.Object ref = statusMessage_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      statusMessage_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int STATUS_DETAILS_FIELD_NUMBER = 11;
+  private com.google.protobuf.ByteString statusDetails_;
+  /**
+   * <pre>
+   * The value of the 'grpc-status-details-bin' metadata key. If
+   * present, this is always an encoded 'google.rpc.Status' message.
+   * </pre>
+   *
+   * <code>bytes status_details = 11;</code>
+   */
+  public com.google.protobuf.ByteString getStatusDetails() {
+    return statusDetails_;
+  }
+
+  public static final int TIMEOUT_FIELD_NUMBER = 12;
+  private com.google.protobuf.Duration timeout_;
+  /**
+   * <pre>
+   * the RPC timeout
+   * </pre>
+   *
+   * <code>.google.protobuf.Duration timeout = 12;</code>
+   */
+  public boolean hasTimeout() {
+    return timeout_ != null;
+  }
+  /**
+   * <pre>
+   * the RPC timeout
+   * </pre>
+   *
+   * <code>.google.protobuf.Duration timeout = 12;</code>
+   */
+  public com.google.protobuf.Duration getTimeout() {
+    return timeout_ == null ? com.google.protobuf.Duration.getDefaultInstance() : timeout_;
+  }
+  /**
+   * <pre>
+   * the RPC timeout
+   * </pre>
+   *
+   * <code>.google.protobuf.Duration timeout = 12;</code>
+   */
+  public com.google.protobuf.DurationOrBuilder getTimeoutOrBuilder() {
+    return getTimeout();
+  }
+
+  public static final int SEQUENCE_ID_WITHIN_CALL_FIELD_NUMBER = 13;
+  private int sequenceIdWithinCall_;
+  /**
+   * <pre>
+   * The entry sequence id for this call. The first GrpcLogEntry has a
+   * value of 1, to disambiguate from an unset value. The purpose of
+   * this field is to detect missing entries in environments where
+   * durability or ordering is not guaranteed.
+   * </pre>
+   *
+   * <code>uint32 sequence_id_within_call = 13;</code>
+   */
+  public int getSequenceIdWithinCall() {
+    return sequenceIdWithinCall_;
+  }
+
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
@@ -689,6 +908,24 @@ private static final long serialVersionUID = 0L;
     if (truncated_ != false) {
       output.writeBool(7, truncated_);
     }
+    if (!getMethodNameBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 8, methodName_);
+    }
+    if (statusCode_ != 0) {
+      output.writeUInt32(9, statusCode_);
+    }
+    if (!getStatusMessageBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 10, statusMessage_);
+    }
+    if (!statusDetails_.isEmpty()) {
+      output.writeBytes(11, statusDetails_);
+    }
+    if (timeout_ != null) {
+      output.writeMessage(12, getTimeout());
+    }
+    if (sequenceIdWithinCall_ != 0) {
+      output.writeUInt32(13, sequenceIdWithinCall_);
+    }
     unknownFields.writeTo(output);
   }
 
@@ -725,6 +962,28 @@ private static final long serialVersionUID = 0L;
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(7, truncated_);
     }
+    if (!getMethodNameBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, methodName_);
+    }
+    if (statusCode_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeUInt32Size(9, statusCode_);
+    }
+    if (!getStatusMessageBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, statusMessage_);
+    }
+    if (!statusDetails_.isEmpty()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBytesSize(11, statusDetails_);
+    }
+    if (timeout_ != null) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeMessageSize(12, getTimeout());
+    }
+    if (sequenceIdWithinCall_ != 0) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeUInt32Size(13, sequenceIdWithinCall_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -755,6 +1014,21 @@ private static final long serialVersionUID = 0L;
     }
     result = result && (getTruncated()
         == other.getTruncated());
+    result = result && getMethodName()
+        .equals(other.getMethodName());
+    result = result && (getStatusCode()
+        == other.getStatusCode());
+    result = result && getStatusMessage()
+        .equals(other.getStatusMessage());
+    result = result && getStatusDetails()
+        .equals(other.getStatusDetails());
+    result = result && (hasTimeout() == other.hasTimeout());
+    if (hasTimeout()) {
+      result = result && getTimeout()
+          .equals(other.getTimeout());
+    }
+    result = result && (getSequenceIdWithinCall()
+        == other.getSequenceIdWithinCall());
     result = result && getPayloadCase().equals(
         other.getPayloadCase());
     if (!result) return false;
@@ -796,6 +1070,20 @@ private static final long serialVersionUID = 0L;
     hash = (37 * hash) + TRUNCATED_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
         getTruncated());
+    hash = (37 * hash) + METHOD_NAME_FIELD_NUMBER;
+    hash = (53 * hash) + getMethodName().hashCode();
+    hash = (37 * hash) + STATUS_CODE_FIELD_NUMBER;
+    hash = (53 * hash) + getStatusCode();
+    hash = (37 * hash) + STATUS_MESSAGE_FIELD_NUMBER;
+    hash = (53 * hash) + getStatusMessage().hashCode();
+    hash = (37 * hash) + STATUS_DETAILS_FIELD_NUMBER;
+    hash = (53 * hash) + getStatusDetails().hashCode();
+    if (hasTimeout()) {
+      hash = (37 * hash) + TIMEOUT_FIELD_NUMBER;
+      hash = (53 * hash) + getTimeout().hashCode();
+    }
+    hash = (37 * hash) + SEQUENCE_ID_WITHIN_CALL_FIELD_NUMBER;
+    hash = (53 * hash) + getSequenceIdWithinCall();
     switch (payloadCase_) {
       case 4:
         hash = (37 * hash) + METADATA_FIELD_NUMBER;
@@ -959,6 +1247,22 @@ private static final long serialVersionUID = 0L;
       }
       truncated_ = false;
 
+      methodName_ = "";
+
+      statusCode_ = 0;
+
+      statusMessage_ = "";
+
+      statusDetails_ = com.google.protobuf.ByteString.EMPTY;
+
+      if (timeoutBuilder_ == null) {
+        timeout_ = null;
+      } else {
+        timeout_ = null;
+        timeoutBuilder_ = null;
+      }
+      sequenceIdWithinCall_ = 0;
+
       payloadCase_ = 0;
       payload_ = null;
       return this;
@@ -1010,6 +1314,16 @@ private static final long serialVersionUID = 0L;
         result.peer_ = peerBuilder_.build();
       }
       result.truncated_ = truncated_;
+      result.methodName_ = methodName_;
+      result.statusCode_ = statusCode_;
+      result.statusMessage_ = statusMessage_;
+      result.statusDetails_ = statusDetails_;
+      if (timeoutBuilder_ == null) {
+        result.timeout_ = timeout_;
+      } else {
+        result.timeout_ = timeoutBuilder_.build();
+      }
+      result.sequenceIdWithinCall_ = sequenceIdWithinCall_;
       result.payloadCase_ = payloadCase_;
       onBuilt();
       return result;
@@ -1067,6 +1381,26 @@ private static final long serialVersionUID = 0L;
       if (other.getTruncated() != false) {
         setTruncated(other.getTruncated());
       }
+      if (!other.getMethodName().isEmpty()) {
+        methodName_ = other.methodName_;
+        onChanged();
+      }
+      if (other.getStatusCode() != 0) {
+        setStatusCode(other.getStatusCode());
+      }
+      if (!other.getStatusMessage().isEmpty()) {
+        statusMessage_ = other.statusMessage_;
+        onChanged();
+      }
+      if (other.getStatusDetails() != com.google.protobuf.ByteString.EMPTY) {
+        setStatusDetails(other.getStatusDetails());
+      }
+      if (other.hasTimeout()) {
+        mergeTimeout(other.getTimeout());
+      }
+      if (other.getSequenceIdWithinCall() != 0) {
+        setSequenceIdWithinCall(other.getSequenceIdWithinCall());
+      }
       switch (other.getPayloadCase()) {
         case METADATA: {
           mergeMetadata(other.getMetadata());
@@ -1416,7 +1750,9 @@ private static final long serialVersionUID = 0L;
         io.grpc.binarylog.Metadata, io.grpc.binarylog.Metadata.Builder, io.grpc.binarylog.MetadataOrBuilder> metadataBuilder_;
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1426,7 +1762,9 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1446,7 +1784,9 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1466,7 +1806,9 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1484,7 +1826,9 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1510,7 +1854,9 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1533,7 +1879,9 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1543,7 +1891,9 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1560,7 +1910,9 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+     * Used by {SEND,RECV}_INITIAL_METADATA and
+     * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+     * from the application.
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -1588,7 +1940,7 @@ private static final long serialVersionUID = 0L;
         io.grpc.binarylog.Message, io.grpc.binarylog.Message.Builder, io.grpc.binarylog.MessageOrBuilder> messageBuilder_;
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1598,7 +1950,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1618,7 +1970,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1638,7 +1990,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1656,7 +2008,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1682,7 +2034,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1705,7 +2057,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1715,7 +2067,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1732,7 +2084,7 @@ private static final long serialVersionUID = 0L;
     }
     /**
      * <pre>
-     * Used by REQUEST and RESPONSE
+     * Used by {SEND,RECV}_MESSAGE
      * </pre>
      *
      * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -1955,6 +2307,487 @@ private static final long serialVersionUID = 0L;
       onChanged();
       return this;
     }
+
+    private java.lang.Object methodName_ = "";
+    /**
+     * <pre>
+     * The method name. Logged for the first entry:
+     * RECV_INITIAL_METADATA for server side or
+     * SEND_INITIAL_METADATA for client side.
+     * </pre>
+     *
+     * <code>string method_name = 8;</code>
+     */
+    public java.lang.String getMethodName() {
+      java.lang.Object ref = methodName_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        methodName_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The method name. Logged for the first entry:
+     * RECV_INITIAL_METADATA for server side or
+     * SEND_INITIAL_METADATA for client side.
+     * </pre>
+     *
+     * <code>string method_name = 8;</code>
+     */
+    public com.google.protobuf.ByteString
+        getMethodNameBytes() {
+      java.lang.Object ref = methodName_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        methodName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * The method name. Logged for the first entry:
+     * RECV_INITIAL_METADATA for server side or
+     * SEND_INITIAL_METADATA for client side.
+     * </pre>
+     *
+     * <code>string method_name = 8;</code>
+     */
+    public Builder setMethodName(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      methodName_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The method name. Logged for the first entry:
+     * RECV_INITIAL_METADATA for server side or
+     * SEND_INITIAL_METADATA for client side.
+     * </pre>
+     *
+     * <code>string method_name = 8;</code>
+     */
+    public Builder clearMethodName() {
+      
+      methodName_ = getDefaultInstance().getMethodName();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The method name. Logged for the first entry:
+     * RECV_INITIAL_METADATA for server side or
+     * SEND_INITIAL_METADATA for client side.
+     * </pre>
+     *
+     * <code>string method_name = 8;</code>
+     */
+    public Builder setMethodNameBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      methodName_ = value;
+      onChanged();
+      return this;
+    }
+
+    private int statusCode_ ;
+    /**
+     * <pre>
+     * status_code and status_message:
+     * Only present for SEND_TRAILING_METADATA on server side or
+     * RECV_TRAILING_METADATA on client side.
+     * </pre>
+     *
+     * <code>uint32 status_code = 9;</code>
+     */
+    public int getStatusCode() {
+      return statusCode_;
+    }
+    /**
+     * <pre>
+     * status_code and status_message:
+     * Only present for SEND_TRAILING_METADATA on server side or
+     * RECV_TRAILING_METADATA on client side.
+     * </pre>
+     *
+     * <code>uint32 status_code = 9;</code>
+     */
+    public Builder setStatusCode(int value) {
+      
+      statusCode_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * status_code and status_message:
+     * Only present for SEND_TRAILING_METADATA on server side or
+     * RECV_TRAILING_METADATA on client side.
+     * </pre>
+     *
+     * <code>uint32 status_code = 9;</code>
+     */
+    public Builder clearStatusCode() {
+      
+      statusCode_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object statusMessage_ = "";
+    /**
+     * <pre>
+     * An original status message before any transport specific
+     * encoding.
+     * </pre>
+     *
+     * <code>string status_message = 10;</code>
+     */
+    public java.lang.String getStatusMessage() {
+      java.lang.Object ref = statusMessage_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        statusMessage_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * <pre>
+     * An original status message before any transport specific
+     * encoding.
+     * </pre>
+     *
+     * <code>string status_message = 10;</code>
+     */
+    public com.google.protobuf.ByteString
+        getStatusMessageBytes() {
+      java.lang.Object ref = statusMessage_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        statusMessage_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * <pre>
+     * An original status message before any transport specific
+     * encoding.
+     * </pre>
+     *
+     * <code>string status_message = 10;</code>
+     */
+    public Builder setStatusMessage(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      statusMessage_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * An original status message before any transport specific
+     * encoding.
+     * </pre>
+     *
+     * <code>string status_message = 10;</code>
+     */
+    public Builder clearStatusMessage() {
+      
+      statusMessage_ = getDefaultInstance().getStatusMessage();
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * An original status message before any transport specific
+     * encoding.
+     * </pre>
+     *
+     * <code>string status_message = 10;</code>
+     */
+    public Builder setStatusMessageBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      statusMessage_ = value;
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.ByteString statusDetails_ = com.google.protobuf.ByteString.EMPTY;
+    /**
+     * <pre>
+     * The value of the 'grpc-status-details-bin' metadata key. If
+     * present, this is always an encoded 'google.rpc.Status' message.
+     * </pre>
+     *
+     * <code>bytes status_details = 11;</code>
+     */
+    public com.google.protobuf.ByteString getStatusDetails() {
+      return statusDetails_;
+    }
+    /**
+     * <pre>
+     * The value of the 'grpc-status-details-bin' metadata key. If
+     * present, this is always an encoded 'google.rpc.Status' message.
+     * </pre>
+     *
+     * <code>bytes status_details = 11;</code>
+     */
+    public Builder setStatusDetails(com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      statusDetails_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The value of the 'grpc-status-details-bin' metadata key. If
+     * present, this is always an encoded 'google.rpc.Status' message.
+     * </pre>
+     *
+     * <code>bytes status_details = 11;</code>
+     */
+    public Builder clearStatusDetails() {
+      
+      statusDetails_ = getDefaultInstance().getStatusDetails();
+      onChanged();
+      return this;
+    }
+
+    private com.google.protobuf.Duration timeout_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> timeoutBuilder_;
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    public boolean hasTimeout() {
+      return timeoutBuilder_ != null || timeout_ != null;
+    }
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    public com.google.protobuf.Duration getTimeout() {
+      if (timeoutBuilder_ == null) {
+        return timeout_ == null ? com.google.protobuf.Duration.getDefaultInstance() : timeout_;
+      } else {
+        return timeoutBuilder_.getMessage();
+      }
+    }
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    public Builder setTimeout(com.google.protobuf.Duration value) {
+      if (timeoutBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        timeout_ = value;
+        onChanged();
+      } else {
+        timeoutBuilder_.setMessage(value);
+      }
+
+      return this;
+    }
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    public Builder setTimeout(
+        com.google.protobuf.Duration.Builder builderForValue) {
+      if (timeoutBuilder_ == null) {
+        timeout_ = builderForValue.build();
+        onChanged();
+      } else {
+        timeoutBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
+    }
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    public Builder mergeTimeout(com.google.protobuf.Duration value) {
+      if (timeoutBuilder_ == null) {
+        if (timeout_ != null) {
+          timeout_ =
+            com.google.protobuf.Duration.newBuilder(timeout_).mergeFrom(value).buildPartial();
+        } else {
+          timeout_ = value;
+        }
+        onChanged();
+      } else {
+        timeoutBuilder_.mergeFrom(value);
+      }
+
+      return this;
+    }
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    public Builder clearTimeout() {
+      if (timeoutBuilder_ == null) {
+        timeout_ = null;
+        onChanged();
+      } else {
+        timeout_ = null;
+        timeoutBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    public com.google.protobuf.Duration.Builder getTimeoutBuilder() {
+      
+      onChanged();
+      return getTimeoutFieldBuilder().getBuilder();
+    }
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    public com.google.protobuf.DurationOrBuilder getTimeoutOrBuilder() {
+      if (timeoutBuilder_ != null) {
+        return timeoutBuilder_.getMessageOrBuilder();
+      } else {
+        return timeout_ == null ?
+            com.google.protobuf.Duration.getDefaultInstance() : timeout_;
+      }
+    }
+    /**
+     * <pre>
+     * the RPC timeout
+     * </pre>
+     *
+     * <code>.google.protobuf.Duration timeout = 12;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> 
+        getTimeoutFieldBuilder() {
+      if (timeoutBuilder_ == null) {
+        timeoutBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder>(
+                getTimeout(),
+                getParentForChildren(),
+                isClean());
+        timeout_ = null;
+      }
+      return timeoutBuilder_;
+    }
+
+    private int sequenceIdWithinCall_ ;
+    /**
+     * <pre>
+     * The entry sequence id for this call. The first GrpcLogEntry has a
+     * value of 1, to disambiguate from an unset value. The purpose of
+     * this field is to detect missing entries in environments where
+     * durability or ordering is not guaranteed.
+     * </pre>
+     *
+     * <code>uint32 sequence_id_within_call = 13;</code>
+     */
+    public int getSequenceIdWithinCall() {
+      return sequenceIdWithinCall_;
+    }
+    /**
+     * <pre>
+     * The entry sequence id for this call. The first GrpcLogEntry has a
+     * value of 1, to disambiguate from an unset value. The purpose of
+     * this field is to detect missing entries in environments where
+     * durability or ordering is not guaranteed.
+     * </pre>
+     *
+     * <code>uint32 sequence_id_within_call = 13;</code>
+     */
+    public Builder setSequenceIdWithinCall(int value) {
+      
+      sequenceIdWithinCall_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <pre>
+     * The entry sequence id for this call. The first GrpcLogEntry has a
+     * value of 1, to disambiguate from an unset value. The purpose of
+     * this field is to detect missing entries in environments where
+     * durability or ordering is not guaranteed.
+     * </pre>
+     *
+     * <code>uint32 sequence_id_within_call = 13;</code>
+     */
+    public Builder clearSequenceIdWithinCall() {
+      
+      sequenceIdWithinCall_ = 0;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
diff --git a/services/src/generated/main/java/io/grpc/binarylog/GrpcLogEntryOrBuilder.java b/services/src/generated/main/java/io/grpc/binarylog/GrpcLogEntryOrBuilder.java
index abe1f54fd..7e5f9e57d 100644
--- a/services/src/generated/main/java/io/grpc/binarylog/GrpcLogEntryOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/binarylog/GrpcLogEntryOrBuilder.java
@@ -71,7 +71,9 @@ public interface GrpcLogEntryOrBuilder extends
 
   /**
    * <pre>
-   * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+   * Used by {SEND,RECV}_INITIAL_METADATA and
+   * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+   * from the application.
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -79,7 +81,9 @@ public interface GrpcLogEntryOrBuilder extends
   boolean hasMetadata();
   /**
    * <pre>
-   * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+   * Used by {SEND,RECV}_INITIAL_METADATA and
+   * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+   * from the application.
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -87,7 +91,9 @@ public interface GrpcLogEntryOrBuilder extends
   io.grpc.binarylog.Metadata getMetadata();
   /**
    * <pre>
-   * Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+   * Used by {SEND,RECV}_INITIAL_METADATA and
+   * {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+   * from the application.
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Metadata metadata = 4;</code>
@@ -96,7 +102,7 @@ public interface GrpcLogEntryOrBuilder extends
 
   /**
    * <pre>
-   * Used by REQUEST and RESPONSE
+   * Used by {SEND,RECV}_MESSAGE
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -104,7 +110,7 @@ public interface GrpcLogEntryOrBuilder extends
   boolean hasMessage();
   /**
    * <pre>
-   * Used by REQUEST and RESPONSE
+   * Used by {SEND,RECV}_MESSAGE
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -112,7 +118,7 @@ public interface GrpcLogEntryOrBuilder extends
   io.grpc.binarylog.Message getMessage();
   /**
    * <pre>
-   * Used by REQUEST and RESPONSE
+   * Used by {SEND,RECV}_MESSAGE
    * </pre>
    *
    * <code>.grpc.binarylog.v1alpha.Message message = 5;</code>
@@ -156,5 +162,105 @@ public interface GrpcLogEntryOrBuilder extends
    */
   boolean getTruncated();
 
+  /**
+   * <pre>
+   * The method name. Logged for the first entry:
+   * RECV_INITIAL_METADATA for server side or
+   * SEND_INITIAL_METADATA for client side.
+   * </pre>
+   *
+   * <code>string method_name = 8;</code>
+   */
+  java.lang.String getMethodName();
+  /**
+   * <pre>
+   * The method name. Logged for the first entry:
+   * RECV_INITIAL_METADATA for server side or
+   * SEND_INITIAL_METADATA for client side.
+   * </pre>
+   *
+   * <code>string method_name = 8;</code>
+   */
+  com.google.protobuf.ByteString
+      getMethodNameBytes();
+
+  /**
+   * <pre>
+   * status_code and status_message:
+   * Only present for SEND_TRAILING_METADATA on server side or
+   * RECV_TRAILING_METADATA on client side.
+   * </pre>
+   *
+   * <code>uint32 status_code = 9;</code>
+   */
+  int getStatusCode();
+
+  /**
+   * <pre>
+   * An original status message before any transport specific
+   * encoding.
+   * </pre>
+   *
+   * <code>string status_message = 10;</code>
+   */
+  java.lang.String getStatusMessage();
+  /**
+   * <pre>
+   * An original status message before any transport specific
+   * encoding.
+   * </pre>
+   *
+   * <code>string status_message = 10;</code>
+   */
+  com.google.protobuf.ByteString
+      getStatusMessageBytes();
+
+  /**
+   * <pre>
+   * The value of the 'grpc-status-details-bin' metadata key. If
+   * present, this is always an encoded 'google.rpc.Status' message.
+   * </pre>
+   *
+   * <code>bytes status_details = 11;</code>
+   */
+  com.google.protobuf.ByteString getStatusDetails();
+
+  /**
+   * <pre>
+   * the RPC timeout
+   * </pre>
+   *
+   * <code>.google.protobuf.Duration timeout = 12;</code>
+   */
+  boolean hasTimeout();
+  /**
+   * <pre>
+   * the RPC timeout
+   * </pre>
+   *
+   * <code>.google.protobuf.Duration timeout = 12;</code>
+   */
+  com.google.protobuf.Duration getTimeout();
+  /**
+   * <pre>
+   * the RPC timeout
+   * </pre>
+   *
+   * <code>.google.protobuf.Duration timeout = 12;</code>
+   */
+  com.google.protobuf.DurationOrBuilder getTimeoutOrBuilder();
+
+  /**
+   * <pre>
+   * The entry sequence id for this call. The first GrpcLogEntry has a
+   * value of 1, to disambiguate from an unset value. The purpose of
+   * this field is to detect missing entries in environments where
+   * durability or ordering is not guaranteed.
+   * </pre>
+   *
+   * <code>uint32 sequence_id_within_call = 13;</code>
+   */
+  int getSequenceIdWithinCall();
+
   public io.grpc.binarylog.GrpcLogEntry.PayloadCase getPayloadCase();
 }
diff --git a/services/src/generated/main/java/io/grpc/binarylog/Metadata.java b/services/src/generated/main/java/io/grpc/binarylog/Metadata.java
index c1875a71d..c5d6a476b 100644
--- a/services/src/generated/main/java/io/grpc/binarylog/Metadata.java
+++ b/services/src/generated/main/java/io/grpc/binarylog/Metadata.java
@@ -8,7 +8,14 @@ package io.grpc.binarylog;
  * A list of metadata pairs, used in the payload of CLIENT_INIT_METADATA,
  * SERVER_INIT_METADATA and TRAILING_METADATA
  * Implementations may omit some entries to honor the header limits
- * of GRPC_BINARY_LOG_CONFIG. Implementations can choose which entries are logged.
+ * of GRPC_BINARY_LOG_CONFIG.
+ * Implementations will not log the following entries, and this is
+ * not to be treated as a truncation:
+ * - entries handled by grpc that are not user visible, such as those
+ *   that begin with 'grpc-' or keys like 'lb-token'
+ * - transport specific entries, including but not limited to:
+ *   ':path', ':authority', 'content-encoding', 'user-agent', 'te', etc
+ * - entries added for call credentials
  * </pre>
  *
  * Protobuf type {@code grpc.binarylog.v1alpha.Metadata}
@@ -286,7 +293,14 @@ private static final long serialVersionUID = 0L;
    * A list of metadata pairs, used in the payload of CLIENT_INIT_METADATA,
    * SERVER_INIT_METADATA and TRAILING_METADATA
    * Implementations may omit some entries to honor the header limits
-   * of GRPC_BINARY_LOG_CONFIG. Implementations can choose which entries are logged.
+   * of GRPC_BINARY_LOG_CONFIG.
+   * Implementations will not log the following entries, and this is
+   * not to be treated as a truncation:
+   * - entries handled by grpc that are not user visible, such as those
+   *   that begin with 'grpc-' or keys like 'lb-token'
+   * - transport specific entries, including but not limited to:
+   *   ':path', ':authority', 'content-encoding', 'user-agent', 'te', etc
+   * - entries added for call credentials
    * </pre>
    *
    * Protobuf type {@code grpc.binarylog.v1alpha.Metadata}
diff --git a/services/src/main/proto/io/grpc/binarylog.proto b/services/src/main/proto/io/grpc/binarylog.proto
index 5c5e1bbf1..b5ea37ddc 100644
--- a/services/src/main/proto/io/grpc/binarylog.proto
+++ b/services/src/main/proto/io/grpc/binarylog.proto
@@ -18,6 +18,8 @@ syntax = "proto3";
 
 package grpc.binarylog.v1alpha;
 
+import "google/protobuf/duration.proto";
+
 option java_multiple_files = true;
 option java_package = "io.grpc.binarylog";
 option java_outer_classname = "BinaryLogProto";
@@ -52,9 +54,11 @@ message GrpcLogEntry {
   // The logger uses one of the following fields to record the payload,
   // according to the type of the log entry.
   oneof payload {
-    // Used by CLIENT_INIT_METADATA, SERVER_INIT_METADATA and TRAILING_METADATA
+    // Used by {SEND,RECV}_INITIAL_METADATA and
+    // {SEND,RECV}_TRAILING_METADATA. This contains only the metadata
+    // from the application.
     Metadata metadata = 4;
-    // Used by REQUEST and RESPONSE
+    // Used by {SEND,RECV}_MESSAGE
     Message message = 5;
   }
 
@@ -64,6 +68,33 @@ message GrpcLogEntry {
 
   // true if payload does not represent the full message or metadata.
   bool truncated = 7;
+
+  // The method name. Logged for the first entry:
+  // RECV_INITIAL_METADATA for server side or
+  // SEND_INITIAL_METADATA for client side.
+  string method_name = 8;
+
+  // status_code and status_message:
+  // Only present for SEND_TRAILING_METADATA on server side or
+  // RECV_TRAILING_METADATA on client side.
+  uint32 status_code = 9;
+
+  // An original status message before any transport specific
+  // encoding.
+  string status_message = 10;
+
+  // The value of the 'grpc-status-details-bin' metadata key. If
+  // present, this is always an encoded 'google.rpc.Status' message.
+  bytes status_details = 11;
+
+  // the RPC timeout
+  google.protobuf.Duration timeout = 12;
+
+  // The entry sequence id for this call. The first GrpcLogEntry has a
+  // value of 1, to disambiguate from an unset value. The purpose of
+  // this field is to detect missing entries in environments where
+  // durability or ordering is not guaranteed.
+  uint32 sequence_id_within_call = 13;
 };
 
 // Message payload, used by REQUEST and RESPONSE
@@ -84,7 +115,15 @@ message Message {
 // A list of metadata pairs, used in the payload of CLIENT_INIT_METADATA,
 // SERVER_INIT_METADATA and TRAILING_METADATA
 // Implementations may omit some entries to honor the header limits
-// of GRPC_BINARY_LOG_CONFIG. Implementations can choose which entries are logged.
+// of GRPC_BINARY_LOG_CONFIG.
+//
+// Implementations will not log the following entries, and this is
+// not to be treated as a truncation:
+// - entries handled by grpc that are not user visible, such as those
+//   that begin with 'grpc-' or keys like 'lb-token'
+// - transport specific entries, including but not limited to:
+//   ':path', ':authority', 'content-encoding', 'user-agent', 'te', etc
+// - entries added for call credentials
 message Metadata {
   repeated MetadataEntry entry = 1;
 }