services: update to remote channelz.proto def

13 files changed, 1007 insertions, 778 deletions

diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelConnectivityState.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelConnectivityState.java
new file mode 100644
index 000000000..7a995862e
--- /dev/null
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelConnectivityState.java
@@ -0,0 +1,616 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: grpc/channelz/channelz.proto
+
+package io.grpc.channelz.v1;
+
+/**
+ * <pre>
+ * These come from the specified states in this document:
+ * https://github.com/grpc/grpc/blob/master/doc/connectivity-semantics-and-api.md
+ * </pre>
+ *
+ * Protobuf type {@code grpc.channelz.ChannelConnectivityState}
+ */
+public  final class ChannelConnectivityState extends
+    com.google.protobuf.GeneratedMessageV3 implements
+    // @@protoc_insertion_point(message_implements:grpc.channelz.ChannelConnectivityState)
+    ChannelConnectivityStateOrBuilder {
+private static final long serialVersionUID = 0L;
+  // Use ChannelConnectivityState.newBuilder() to construct.
+  private ChannelConnectivityState(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+  private ChannelConnectivityState() {
+    state_ = 0;
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet
+  getUnknownFields() {
+    return this.unknownFields;
+  }
+  private ChannelConnectivityState(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    int mutable_bitField0_ = 0;
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            state_ = rawValue;
+            break;
+          }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(
+          e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+  public static final com.google.protobuf.Descriptors.Descriptor
+      getDescriptor() {
+    return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ChannelConnectivityState_descriptor;
+  }
+
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ChannelConnectivityState_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            io.grpc.channelz.v1.ChannelConnectivityState.class, io.grpc.channelz.v1.ChannelConnectivityState.Builder.class);
+  }
+
+  /**
+   * Protobuf enum {@code grpc.channelz.ChannelConnectivityState.State}
+   */
+  public enum State
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>UNKNOWN = 0;</code>
+     */
+    UNKNOWN(0),
+    /**
+     * <code>IDLE = 1;</code>
+     */
+    IDLE(1),
+    /**
+     * <code>CONNECTING = 2;</code>
+     */
+    CONNECTING(2),
+    /**
+     * <code>READY = 3;</code>
+     */
+    READY(3),
+    /**
+     * <code>TRANSIENT_FAILURE = 4;</code>
+     */
+    TRANSIENT_FAILURE(4),
+    /**
+     * <code>SHUTDOWN = 5;</code>
+     */
+    SHUTDOWN(5),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>UNKNOWN = 0;</code>
+     */
+    public static final int UNKNOWN_VALUE = 0;
+    /**
+     * <code>IDLE = 1;</code>
+     */
+    public static final int IDLE_VALUE = 1;
+    /**
+     * <code>CONNECTING = 2;</code>
+     */
+    public static final int CONNECTING_VALUE = 2;
+    /**
+     * <code>READY = 3;</code>
+     */
+    public static final int READY_VALUE = 3;
+    /**
+     * <code>TRANSIENT_FAILURE = 4;</code>
+     */
+    public static final int TRANSIENT_FAILURE_VALUE = 4;
+    /**
+     * <code>SHUTDOWN = 5;</code>
+     */
+    public static final int SHUTDOWN_VALUE = 5;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static State valueOf(int value) {
+      return forNumber(value);
+    }
+
+    public static State forNumber(int value) {
+      switch (value) {
+        case 0: return UNKNOWN;
+        case 1: return IDLE;
+        case 2: return CONNECTING;
+        case 3: return READY;
+        case 4: return TRANSIENT_FAILURE;
+        case 5: return SHUTDOWN;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<State>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        State> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<State>() {
+            public State findValueByNumber(int number) {
+              return State.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return io.grpc.channelz.v1.ChannelConnectivityState.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final State[] VALUES = values();
+
+    public static State valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private State(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:grpc.channelz.ChannelConnectivityState.State)
+  }
+
+  public static final int STATE_FIELD_NUMBER = 1;
+  private int state_;
+  /**
+   * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+   */
+  public int getStateValue() {
+    return state_;
+  }
+  /**
+   * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+   */
+  public io.grpc.channelz.v1.ChannelConnectivityState.State getState() {
+    io.grpc.channelz.v1.ChannelConnectivityState.State result = io.grpc.channelz.v1.ChannelConnectivityState.State.valueOf(state_);
+    return result == null ? io.grpc.channelz.v1.ChannelConnectivityState.State.UNRECOGNIZED : result;
+  }
+
+  private byte memoizedIsInitialized = -1;
+  public final boolean isInitialized() {
+    byte isInitialized = memoizedIsInitialized;
+    if (isInitialized == 1) return true;
+    if (isInitialized == 0) return false;
+
+    memoizedIsInitialized = 1;
+    return true;
+  }
+
+  public void writeTo(com.google.protobuf.CodedOutputStream output)
+                      throws java.io.IOException {
+    if (state_ != io.grpc.channelz.v1.ChannelConnectivityState.State.UNKNOWN.getNumber()) {
+      output.writeEnum(1, state_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (state_ != io.grpc.channelz.v1.ChannelConnectivityState.State.UNKNOWN.getNumber()) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeEnumSize(1, state_);
+    }
+    size += unknownFields.getSerializedSize();
+    memoizedSize = size;
+    return size;
+  }
+
+  @java.lang.Override
+  public boolean equals(final java.lang.Object obj) {
+    if (obj == this) {
+     return true;
+    }
+    if (!(obj instanceof io.grpc.channelz.v1.ChannelConnectivityState)) {
+      return super.equals(obj);
+    }
+    io.grpc.channelz.v1.ChannelConnectivityState other = (io.grpc.channelz.v1.ChannelConnectivityState) obj;
+
+    boolean result = true;
+    result = result && state_ == other.state_;
+    result = result && unknownFields.equals(other.unknownFields);
+    return result;
+  }
+
+  @java.lang.Override
+  public int hashCode() {
+    if (memoizedHashCode != 0) {
+      return memoizedHashCode;
+    }
+    int hash = 41;
+    hash = (19 * hash) + getDescriptor().hashCode();
+    hash = (37 * hash) + STATE_FIELD_NUMBER;
+    hash = (53 * hash) + state_;
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(
+      java.nio.ByteBuffer data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(
+      java.nio.ByteBuffer data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(
+      com.google.protobuf.ByteString data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(
+      com.google.protobuf.ByteString data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(byte[] data)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(
+      byte[] data,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseDelimitedFrom(java.io.InputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseDelimitedFrom(
+      java.io.InputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(
+      com.google.protobuf.CodedInputStream input)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input);
+  }
+  public static io.grpc.channelz.v1.ChannelConnectivityState parseFrom(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3
+        .parseWithIOException(PARSER, input, extensionRegistry);
+  }
+
+  public Builder newBuilderForType() { return newBuilder(); }
+  public static Builder newBuilder() {
+    return DEFAULT_INSTANCE.toBuilder();
+  }
+  public static Builder newBuilder(io.grpc.channelz.v1.ChannelConnectivityState prototype) {
+    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+  }
+  public Builder toBuilder() {
+    return this == DEFAULT_INSTANCE
+        ? new Builder() : new Builder().mergeFrom(this);
+  }
+
+  @java.lang.Override
+  protected Builder newBuilderForType(
+      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+    Builder builder = new Builder(parent);
+    return builder;
+  }
+  /**
+   * <pre>
+   * These come from the specified states in this document:
+   * https://github.com/grpc/grpc/blob/master/doc/connectivity-semantics-and-api.md
+   * </pre>
+   *
+   * Protobuf type {@code grpc.channelz.ChannelConnectivityState}
+   */
+  public static final class Builder extends
+      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+      // @@protoc_insertion_point(builder_implements:grpc.channelz.ChannelConnectivityState)
+      io.grpc.channelz.v1.ChannelConnectivityStateOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ChannelConnectivityState_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ChannelConnectivityState_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              io.grpc.channelz.v1.ChannelConnectivityState.class, io.grpc.channelz.v1.ChannelConnectivityState.Builder.class);
+    }
+
+    // Construct using io.grpc.channelz.v1.ChannelConnectivityState.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3
+              .alwaysUseFieldBuilders) {
+      }
+    }
+    public Builder clear() {
+      super.clear();
+      state_ = 0;
+
+      return this;
+    }
+
+    public com.google.protobuf.Descriptors.Descriptor
+        getDescriptorForType() {
+      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ChannelConnectivityState_descriptor;
+    }
+
+    public io.grpc.channelz.v1.ChannelConnectivityState getDefaultInstanceForType() {
+      return io.grpc.channelz.v1.ChannelConnectivityState.getDefaultInstance();
+    }
+
+    public io.grpc.channelz.v1.ChannelConnectivityState build() {
+      io.grpc.channelz.v1.ChannelConnectivityState result = buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    public io.grpc.channelz.v1.ChannelConnectivityState buildPartial() {
+      io.grpc.channelz.v1.ChannelConnectivityState result = new io.grpc.channelz.v1.ChannelConnectivityState(this);
+      result.state_ = state_;
+      onBuilt();
+      return result;
+    }
+
+    public Builder clone() {
+      return (Builder) super.clone();
+    }
+    public Builder setField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.setField(field, value);
+    }
+    public Builder clearField(
+        com.google.protobuf.Descriptors.FieldDescriptor field) {
+      return (Builder) super.clearField(field);
+    }
+    public Builder clearOneof(
+        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+      return (Builder) super.clearOneof(oneof);
+    }
+    public Builder setRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        int index, java.lang.Object value) {
+      return (Builder) super.setRepeatedField(field, index, value);
+    }
+    public Builder addRepeatedField(
+        com.google.protobuf.Descriptors.FieldDescriptor field,
+        java.lang.Object value) {
+      return (Builder) super.addRepeatedField(field, value);
+    }
+    public Builder mergeFrom(com.google.protobuf.Message other) {
+      if (other instanceof io.grpc.channelz.v1.ChannelConnectivityState) {
+        return mergeFrom((io.grpc.channelz.v1.ChannelConnectivityState)other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(io.grpc.channelz.v1.ChannelConnectivityState other) {
+      if (other == io.grpc.channelz.v1.ChannelConnectivityState.getDefaultInstance()) return this;
+      if (other.state_ != 0) {
+        setStateValue(other.getStateValue());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      onChanged();
+      return this;
+    }
+
+    public final boolean isInitialized() {
+      return true;
+    }
+
+    public Builder mergeFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      io.grpc.channelz.v1.ChannelConnectivityState parsedMessage = null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage = (io.grpc.channelz.v1.ChannelConnectivityState) e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int state_ = 0;
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+     */
+    public int getStateValue() {
+      return state_;
+    }
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+     */
+    public Builder setStateValue(int value) {
+      state_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+     */
+    public io.grpc.channelz.v1.ChannelConnectivityState.State getState() {
+      io.grpc.channelz.v1.ChannelConnectivityState.State result = io.grpc.channelz.v1.ChannelConnectivityState.State.valueOf(state_);
+      return result == null ? io.grpc.channelz.v1.ChannelConnectivityState.State.UNRECOGNIZED : result;
+    }
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+     */
+    public Builder setState(io.grpc.channelz.v1.ChannelConnectivityState.State value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      
+      state_ = value.getNumber();
+      onChanged();
+      return this;
+    }
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+     */
+    public Builder clearState() {
+      
+      state_ = 0;
+      onChanged();
+      return this;
+    }
+    public final Builder setUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.setUnknownFieldsProto3(unknownFields);
+    }
+
+    public final Builder mergeUnknownFields(
+        final com.google.protobuf.UnknownFieldSet unknownFields) {
+      return super.mergeUnknownFields(unknownFields);
+    }
+
+
+    // @@protoc_insertion_point(builder_scope:grpc.channelz.ChannelConnectivityState)
+  }
+
+  // @@protoc_insertion_point(class_scope:grpc.channelz.ChannelConnectivityState)
+  private static final io.grpc.channelz.v1.ChannelConnectivityState DEFAULT_INSTANCE;
+  static {
+    DEFAULT_INSTANCE = new io.grpc.channelz.v1.ChannelConnectivityState();
+  }
+
+  public static io.grpc.channelz.v1.ChannelConnectivityState getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<ChannelConnectivityState>
+      PARSER = new com.google.protobuf.AbstractParser<ChannelConnectivityState>() {
+    public ChannelConnectivityState parsePartialFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return new ChannelConnectivityState(input, extensionRegistry);
+    }
+  };
+
+  public static com.google.protobuf.Parser<ChannelConnectivityState> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<ChannelConnectivityState> getParserForType() {
+    return PARSER;
+  }
+
+  public io.grpc.channelz.v1.ChannelConnectivityState getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+
+}
+
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelConnectivityStateOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelConnectivityStateOrBuilder.java
new file mode 100644
index 000000000..e6169eb11
--- /dev/null
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelConnectivityStateOrBuilder.java
@@ -0,0 +1,18 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: grpc/channelz/channelz.proto
+
+package io.grpc.channelz.v1;
+
+public interface ChannelConnectivityStateOrBuilder extends
+    // @@protoc_insertion_point(interface_extends:grpc.channelz.ChannelConnectivityState)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+   */
+  int getStateValue();
+  /**
+   * <code>.grpc.channelz.ChannelConnectivityState.State state = 1;</code>
+   */
+  io.grpc.channelz.v1.ChannelConnectivityState.State getState();
+}
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelData.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelData.java
index 7afda6be7..6a37d62cf 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelData.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelData.java
@@ -16,7 +16,6 @@ private static final long serialVersionUID = 0L;
     super(builder);
   }
   private ChannelData() {
-    state_ = 0;
     target_ = "";
     callsStarted_ = 0L;
     callsSucceeded_ = 0L;
@@ -54,10 +53,17 @@ private static final long serialVersionUID = 0L;
             }
             break;
           }
-          case 8: {
-            int rawValue = input.readEnum();
+          case 10: {
+            io.grpc.channelz.v1.ChannelConnectivityState.Builder subBuilder = null;
+            if (state_ != null) {
+              subBuilder = state_.toBuilder();
+            }
+            state_ = input.readMessage(io.grpc.channelz.v1.ChannelConnectivityState.parser(), extensionRegistry);
+            if (subBuilder != null) {
+              subBuilder.mergeFrom(state_);
+              state_ = subBuilder.buildPartial();
+            }
 
-            state_ = rawValue;
             break;
           }
           case 18: {
@@ -131,154 +137,25 @@ private static final long serialVersionUID = 0L;
             io.grpc.channelz.v1.ChannelData.class, io.grpc.channelz.v1.ChannelData.Builder.class);
   }
 
+  public static final int STATE_FIELD_NUMBER = 1;
+  private io.grpc.channelz.v1.ChannelConnectivityState state_;
   /**
-   * Protobuf enum {@code grpc.channelz.ChannelData.State}
+   * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
    */
-  public enum State
-      implements com.google.protobuf.ProtocolMessageEnum {
-    /**
-     * <code>UNKNOWN = 0;</code>
-     */
-    UNKNOWN(0),
-    /**
-     * <code>IDLE = 1;</code>
-     */
-    IDLE(1),
-    /**
-     * <code>CONNECTING = 2;</code>
-     */
-    CONNECTING(2),
-    /**
-     * <code>READY = 3;</code>
-     */
-    READY(3),
-    /**
-     * <code>TRANSIENT_FAILURE = 4;</code>
-     */
-    TRANSIENT_FAILURE(4),
-    /**
-     * <code>SHUTDOWN = 5;</code>
-     */
-    SHUTDOWN(5),
-    UNRECOGNIZED(-1),
-    ;
-
-    /**
-     * <code>UNKNOWN = 0;</code>
-     */
-    public static final int UNKNOWN_VALUE = 0;
-    /**
-     * <code>IDLE = 1;</code>
-     */
-    public static final int IDLE_VALUE = 1;
-    /**
-     * <code>CONNECTING = 2;</code>
-     */
-    public static final int CONNECTING_VALUE = 2;
-    /**
-     * <code>READY = 3;</code>
-     */
-    public static final int READY_VALUE = 3;
-    /**
-     * <code>TRANSIENT_FAILURE = 4;</code>
-     */
-    public static final int TRANSIENT_FAILURE_VALUE = 4;
-    /**
-     * <code>SHUTDOWN = 5;</code>
-     */
-    public static final int SHUTDOWN_VALUE = 5;
-
-
-    public final int getNumber() {
-      if (this == UNRECOGNIZED) {
-        throw new java.lang.IllegalArgumentException(
-            "Can't get the number of an unknown enum value.");
-      }
-      return value;
-    }
-
-    /**
-     * @deprecated Use {@link #forNumber(int)} instead.
-     */
-    @java.lang.Deprecated
-    public static State valueOf(int value) {
-      return forNumber(value);
-    }
-
-    public static State forNumber(int value) {
-      switch (value) {
-        case 0: return UNKNOWN;
-        case 1: return IDLE;
-        case 2: return CONNECTING;
-        case 3: return READY;
-        case 4: return TRANSIENT_FAILURE;
-        case 5: return SHUTDOWN;
-        default: return null;
-      }
-    }
-
-    public static com.google.protobuf.Internal.EnumLiteMap<State>
-        internalGetValueMap() {
-      return internalValueMap;
-    }
-    private static final com.google.protobuf.Internal.EnumLiteMap<
-        State> internalValueMap =
-          new com.google.protobuf.Internal.EnumLiteMap<State>() {
-            public State findValueByNumber(int number) {
-              return State.forNumber(number);
-            }
-          };
-
-    public final com.google.protobuf.Descriptors.EnumValueDescriptor
-        getValueDescriptor() {
-      return getDescriptor().getValues().get(ordinal());
-    }
-    public final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptorForType() {
-      return getDescriptor();
-    }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
-        getDescriptor() {
-      return io.grpc.channelz.v1.ChannelData.getDescriptor().getEnumTypes().get(0);
-    }
-
-    private static final State[] VALUES = values();
-
-    public static State valueOf(
-        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-      if (desc.getType() != getDescriptor()) {
-        throw new java.lang.IllegalArgumentException(
-          "EnumValueDescriptor is not for this type.");
-      }
-      if (desc.getIndex() == -1) {
-        return UNRECOGNIZED;
-      }
-      return VALUES[desc.getIndex()];
-    }
-
-    private final int value;
-
-    private State(int value) {
-      this.value = value;
-    }
-
-    // @@protoc_insertion_point(enum_scope:grpc.channelz.ChannelData.State)
+  public boolean hasState() {
+    return state_ != null;
   }
-
-  public static final int STATE_FIELD_NUMBER = 1;
-  private int state_;
   /**
-   * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+   * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
    */
-  public int getStateValue() {
-    return state_;
+  public io.grpc.channelz.v1.ChannelConnectivityState getState() {
+    return state_ == null ? io.grpc.channelz.v1.ChannelConnectivityState.getDefaultInstance() : state_;
   }
   /**
-   * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+   * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
    */
-  public io.grpc.channelz.v1.ChannelData.State getState() {
-    io.grpc.channelz.v1.ChannelData.State result = io.grpc.channelz.v1.ChannelData.State.valueOf(state_);
-    return result == null ? io.grpc.channelz.v1.ChannelData.State.UNRECOGNIZED : result;
+  public io.grpc.channelz.v1.ChannelConnectivityStateOrBuilder getStateOrBuilder() {
+    return getState();
   }
 
   public static final int TARGET_FIELD_NUMBER = 2;
@@ -428,8 +305,8 @@ private static final long serialVersionUID = 0L;
 
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
-    if (state_ != io.grpc.channelz.v1.ChannelData.State.UNKNOWN.getNumber()) {
-      output.writeEnum(1, state_);
+    if (state_ != null) {
+      output.writeMessage(1, getState());
     }
     if (!getTargetBytes().isEmpty()) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, target_);
@@ -457,9 +334,9 @@ private static final long serialVersionUID = 0L;
     if (size != -1) return size;
 
     size = 0;
-    if (state_ != io.grpc.channelz.v1.ChannelData.State.UNKNOWN.getNumber()) {
+    if (state_ != null) {
       size += com.google.protobuf.CodedOutputStream
-        .computeEnumSize(1, state_);
+        .computeMessageSize(1, getState());
     }
     if (!getTargetBytes().isEmpty()) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, target_);
@@ -500,7 +377,11 @@ private static final long serialVersionUID = 0L;
     io.grpc.channelz.v1.ChannelData other = (io.grpc.channelz.v1.ChannelData) obj;
 
     boolean result = true;
-    result = result && state_ == other.state_;
+    result = result && (hasState() == other.hasState());
+    if (hasState()) {
+      result = result && getState()
+          .equals(other.getState());
+    }
     result = result && getTarget()
         .equals(other.getTarget());
     result = result && (hasTrace() == other.hasTrace());
@@ -530,8 +411,10 @@ private static final long serialVersionUID = 0L;
     }
     int hash = 41;
     hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (37 * hash) + STATE_FIELD_NUMBER;
-    hash = (53 * hash) + state_;
+    if (hasState()) {
+      hash = (37 * hash) + STATE_FIELD_NUMBER;
+      hash = (53 * hash) + getState().hashCode();
+    }
     hash = (37 * hash) + TARGET_FIELD_NUMBER;
     hash = (53 * hash) + getTarget().hashCode();
     if (hasTrace()) {
@@ -680,8 +563,12 @@ private static final long serialVersionUID = 0L;
     }
     public Builder clear() {
       super.clear();
-      state_ = 0;
-
+      if (stateBuilder_ == null) {
+        state_ = null;
+      } else {
+        state_ = null;
+        stateBuilder_ = null;
+      }
       target_ = "";
 
       if (traceBuilder_ == null) {
@@ -724,7 +611,11 @@ private static final long serialVersionUID = 0L;
 
     public io.grpc.channelz.v1.ChannelData buildPartial() {
       io.grpc.channelz.v1.ChannelData result = new io.grpc.channelz.v1.ChannelData(this);
-      result.state_ = state_;
+      if (stateBuilder_ == null) {
+        result.state_ = state_;
+      } else {
+        result.state_ = stateBuilder_.build();
+      }
       result.target_ = target_;
       if (traceBuilder_ == null) {
         result.trace_ = trace_;
@@ -780,8 +671,8 @@ private static final long serialVersionUID = 0L;
 
     public Builder mergeFrom(io.grpc.channelz.v1.ChannelData other) {
       if (other == io.grpc.channelz.v1.ChannelData.getDefaultInstance()) return this;
-      if (other.state_ != 0) {
-        setStateValue(other.getStateValue());
+      if (other.hasState()) {
+        mergeState(other.getState());
       }
       if (!other.getTarget().isEmpty()) {
         target_ = other.target_;
@@ -829,48 +720,121 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    private int state_ = 0;
+    private io.grpc.channelz.v1.ChannelConnectivityState state_ = null;
+    private com.google.protobuf.SingleFieldBuilderV3<
+        io.grpc.channelz.v1.ChannelConnectivityState, io.grpc.channelz.v1.ChannelConnectivityState.Builder, io.grpc.channelz.v1.ChannelConnectivityStateOrBuilder> stateBuilder_;
     /**
-     * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
      */
-    public int getStateValue() {
-      return state_;
+    public boolean hasState() {
+      return stateBuilder_ != null || state_ != null;
     }
     /**
-     * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
      */
-    public Builder setStateValue(int value) {
-      state_ = value;
-      onChanged();
+    public io.grpc.channelz.v1.ChannelConnectivityState getState() {
+      if (stateBuilder_ == null) {
+        return state_ == null ? io.grpc.channelz.v1.ChannelConnectivityState.getDefaultInstance() : state_;
+      } else {
+        return stateBuilder_.getMessage();
+      }
+    }
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
+     */
+    public Builder setState(io.grpc.channelz.v1.ChannelConnectivityState value) {
+      if (stateBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        state_ = value;
+        onChanged();
+      } else {
+        stateBuilder_.setMessage(value);
+      }
+
       return this;
     }
     /**
-     * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
      */
-    public io.grpc.channelz.v1.ChannelData.State getState() {
-      io.grpc.channelz.v1.ChannelData.State result = io.grpc.channelz.v1.ChannelData.State.valueOf(state_);
-      return result == null ? io.grpc.channelz.v1.ChannelData.State.UNRECOGNIZED : result;
+    public Builder setState(
+        io.grpc.channelz.v1.ChannelConnectivityState.Builder builderForValue) {
+      if (stateBuilder_ == null) {
+        state_ = builderForValue.build();
+        onChanged();
+      } else {
+        stateBuilder_.setMessage(builderForValue.build());
+      }
+
+      return this;
     }
     /**
-     * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
      */
-    public Builder setState(io.grpc.channelz.v1.ChannelData.State value) {
-      if (value == null) {
-        throw new NullPointerException();
+    public Builder mergeState(io.grpc.channelz.v1.ChannelConnectivityState value) {
+      if (stateBuilder_ == null) {
+        if (state_ != null) {
+          state_ =
+            io.grpc.channelz.v1.ChannelConnectivityState.newBuilder(state_).mergeFrom(value).buildPartial();
+        } else {
+          state_ = value;
+        }
+        onChanged();
+      } else {
+        stateBuilder_.mergeFrom(value);
       }
-      
-      state_ = value.getNumber();
-      onChanged();
+
       return this;
     }
     /**
-     * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
      */
     public Builder clearState() {
+      if (stateBuilder_ == null) {
+        state_ = null;
+        onChanged();
+      } else {
+        state_ = null;
+        stateBuilder_ = null;
+      }
+
+      return this;
+    }
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
+     */
+    public io.grpc.channelz.v1.ChannelConnectivityState.Builder getStateBuilder() {
       
-      state_ = 0;
       onChanged();
-      return this;
+      return getStateFieldBuilder().getBuilder();
+    }
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
+     */
+    public io.grpc.channelz.v1.ChannelConnectivityStateOrBuilder getStateOrBuilder() {
+      if (stateBuilder_ != null) {
+        return stateBuilder_.getMessageOrBuilder();
+      } else {
+        return state_ == null ?
+            io.grpc.channelz.v1.ChannelConnectivityState.getDefaultInstance() : state_;
+      }
+    }
+    /**
+     * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+        io.grpc.channelz.v1.ChannelConnectivityState, io.grpc.channelz.v1.ChannelConnectivityState.Builder, io.grpc.channelz.v1.ChannelConnectivityStateOrBuilder> 
+        getStateFieldBuilder() {
+      if (stateBuilder_ == null) {
+        stateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+            io.grpc.channelz.v1.ChannelConnectivityState, io.grpc.channelz.v1.ChannelConnectivityState.Builder, io.grpc.channelz.v1.ChannelConnectivityStateOrBuilder>(
+                getState(),
+                getParentForChildren(),
+                isClean());
+        state_ = null;
+      }
+      return stateBuilder_;
     }
 
     private java.lang.Object target_ = "";
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelDataOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelDataOrBuilder.java
index dcf11081d..27c660a82 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelDataOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelDataOrBuilder.java
@@ -8,13 +8,17 @@ public interface ChannelDataOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+   * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
    */
-  int getStateValue();
+  boolean hasState();
   /**
-   * <code>.grpc.channelz.ChannelData.State state = 1;</code>
+   * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
    */
-  io.grpc.channelz.v1.ChannelData.State getState();
+  io.grpc.channelz.v1.ChannelConnectivityState getState();
+  /**
+   * <code>.grpc.channelz.ChannelConnectivityState state = 1;</code>
+   */
+  io.grpc.channelz.v1.ChannelConnectivityStateOrBuilder getStateOrBuilder();
 
   /**
    * <pre>
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTrace.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTrace.java
index a0810d4b7..e60ccd247 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTrace.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelTrace.java
@@ -5,7 +5,8 @@ package io.grpc.channelz.v1;
 
 /**
  * <pre>
- * TODO: fill this in.
+ * see the proto in the gRFC for channel tracing:
+ * A3-channel-tracing.md
  * </pre>
  *
  * Protobuf type {@code grpc.channelz.ChannelTrace}
@@ -218,7 +219,8 @@ private static final long serialVersionUID = 0L;
   }
   /**
    * <pre>
-   * TODO: fill this in.
+   * see the proto in the gRFC for channel tracing:
+   * A3-channel-tracing.md
    * </pre>
    *
    * Protobuf type {@code grpc.channelz.ChannelTrace}
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
index f1b8c8abe..f482271d9 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ChannelzProto.java
@@ -25,6 +25,11 @@ public final class ChannelzProto {
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_grpc_channelz_Subchannel_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_grpc_channelz_ChannelConnectivityState_descriptor;
+  static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_grpc_channelz_ChannelConnectivityState_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
     internal_static_grpc_channelz_ChannelData_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -65,11 +70,6 @@ public final class ChannelzProto {
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_grpc_channelz_ServerData_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_grpc_channelz_ServerChannelTrace_descriptor;
-  static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_grpc_channelz_ServerChannelTrace_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
     internal_static_grpc_channelz_Socket_descriptor;
   static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -219,128 +219,130 @@ public final class ChannelzProto {
       "el_ref\030\003 \003(\0132\031.grpc.channelz.ChannelRef\022" +
       "4\n\016subchannel_ref\030\004 \003(\0132\034.grpc.channelz." +
       "SubchannelRef\022,\n\nsocket_ref\030\005 \003(\0132\030.grpc" +
-      ".channelz.SocketRef\"\341\002\n\013ChannelData\022/\n\005s" +
-      "tate\030\001 \001(\0162 .grpc.channelz.ChannelData.S" +
-      "tate\022\016\n\006target\030\002 \001(\t\022*\n\005trace\030\003 \001(\0132\033.gr" +
-      "pc.channelz.ChannelTrace\022\025\n\rcalls_starte" +
-      "d\030\004 \001(\003\022\027\n\017calls_succeeded\030\005 \001(\003\022\024\n\014call" +
-      "s_failed\030\006 \001(\003\022?\n\033last_call_started_time" +
-      "stamp\030\007 \001(\0132\032.google.protobuf.Timestamp\"" +
-      "^\n\005State\022\013\n\007UNKNOWN\020\000\022\010\n\004IDLE\020\001\022\016\n\nCONNE" +
-      "CTING\020\002\022\t\n\005READY\020\003\022\025\n\021TRANSIENT_FAILURE\020" +
-      "\004\022\014\n\010SHUTDOWN\020\005\"\016\n\014ChannelTrace\"F\n\nChann" +
-      "elRef\022\022\n\nchannel_id\030\001 \001(\003\022\014\n\004name\030\002 \001(\tJ" +
-      "\004\010\003\020\004J\004\010\004\020\005J\004\010\005\020\006J\004\010\006\020\007\"X\n\rSubchannelRef" +
-      "\022\025\n\rsubchannel_id\030\007 \001(\003\022\014\n\004name\030\010 \001(\tJ\004\010" +
-      "\001\020\002J\004\010\002\020\003J\004\010\003\020\004J\004\010\004\020\005J\004\010\005\020\006J\004\010\006\020\007\"P\n\tSoc" +
-      "ketRef\022\021\n\tsocket_id\030\003 \001(\003\022\014\n\004name\030\004 \001(\tJ" +
-      "\004\010\001\020\002J\004\010\002\020\003J\004\010\005\020\006J\004\010\006\020\007J\004\010\007\020\010J\004\010\010\020\t\"P\n\tS" +
-      "erverRef\022\021\n\tserver_id\030\005 \001(\003\022\014\n\004name\030\006 \001(" +
-      "\tJ\004\010\001\020\002J\004\010\002\020\003J\004\010\003\020\004J\004\010\004\020\005J\004\010\007\020\010J\004\010\010\020\t\"\211\001" +
-      "\n\006Server\022%\n\003ref\030\001 \001(\0132\030.grpc.channelz.Se" +
-      "rverRef\022\'\n\004data\030\002 \001(\0132\031.grpc.channelz.Se" +
-      "rverData\022/\n\rlisten_socket\030\003 \003(\0132\030.grpc.c" +
-      "hannelz.SocketRef\"\305\001\n\nServerData\0220\n\005trac" +
-      "e\030\001 \001(\0132!.grpc.channelz.ServerChannelTra" +
-      "ce\022\025\n\rcalls_started\030\002 \001(\003\022\027\n\017calls_succe" +
-      "eded\030\003 \001(\003\022\024\n\014calls_failed\030\004 \001(\003\022?\n\033last" +
-      "_call_started_timestamp\030\005 \001(\0132\032.google.p" +
-      "rotobuf.Timestamp\"\024\n\022ServerChannelTrace\"" +
-      "\347\001\n\006Socket\022%\n\003ref\030\001 \001(\0132\030.grpc.channelz." +
-      "SocketRef\022\'\n\004data\030\002 \001(\0132\031.grpc.channelz." +
-      "SocketData\022%\n\005local\030\003 \001(\0132\026.grpc.channel" +
-      "z.Address\022&\n\006remote\030\004 \001(\0132\026.grpc.channel" +
-      "z.Address\022)\n\010security\030\005 \001(\0132\027.grpc.chann" +
-      "elz.Security\022\023\n\013remote_name\030\006 \001(\t\"\353\004\n\nSo" +
-      "cketData\022\027\n\017streams_started\030\001 \001(\003\022\031\n\021str" +
-      "eams_succeeded\030\002 \001(\003\022\026\n\016streams_failed\030\003" +
-      " \001(\003\022\025\n\rmessages_sent\030\004 \001(\003\022\031\n\021messages_" +
-      "received\030\005 \001(\003\022\030\n\020keep_alives_sent\030\006 \001(\003" +
-      "\022G\n#last_local_stream_created_timestamp\030" +
-      "\007 \001(\0132\032.google.protobuf.Timestamp\022H\n$las" +
-      "t_remote_stream_created_timestamp\030\010 \001(\0132" +
-      "\032.google.protobuf.Timestamp\022?\n\033last_mess" +
-      "age_sent_timestamp\030\t \001(\0132\032.google.protob" +
-      "uf.Timestamp\022C\n\037last_message_received_ti" +
-      "mestamp\030\n \001(\0132\032.google.protobuf.Timestam" +
-      "p\022>\n\031local_flow_control_window\030\013 \001(\0132\033.g" +
-      "oogle.protobuf.Int64Value\022?\n\032remote_flow" +
-      "_control_window\030\014 \001(\0132\033.google.protobuf." +
-      "Int64Value\022+\n\006option\030\r \003(\0132\033.grpc.channe" +
-      "lz.SocketOption\"\337\002\n\007Address\022<\n\rtcpip_add" +
-      "ress\030\001 \001(\0132#.grpc.channelz.Address.TcpIp" +
-      "AddressH\000\0228\n\013uds_address\030\002 \001(\0132!.grpc.ch" +
-      "annelz.Address.UdsAddressH\000\022<\n\rother_add" +
-      "ress\030\003 \001(\0132#.grpc.channelz.Address.Other" +
-      "AddressH\000\0320\n\014TcpIpAddress\022\022\n\nip_address\030" +
-      "\001 \001(\014\022\014\n\004port\030\002 \001(\005\032\036\n\nUdsAddress\022\020\n\010fil" +
-      "ename\030\001 \001(\t\032A\n\014OtherAddress\022\014\n\004name\030\001 \001(" +
-      "\t\022#\n\005value\030\002 \001(\0132\024.google.protobuf.AnyB\t" +
-      "\n\007address\"\270\002\n\010Security\022*\n\003tls\030\001 \001(\0132\033.gr" +
-      "pc.channelz.Security.TlsH\000\0226\n\005other\030\002 \001(" +
-      "\0132%.grpc.channelz.Security.OtherSecurity" +
-      "H\000\032{\n\003Tls\022\027\n\rstandard_name\030\001 \001(\tH\000\022\024\n\not" +
-      "her_name\030\002 \001(\tH\000\022\031\n\021local_certificate\030\003 " +
-      "\001(\014\022\032\n\022remote_certificate\030\004 \001(\014B\016\n\014ciphe" +
-      "r_suite\032B\n\rOtherSecurity\022\014\n\004name\030\001 \001(\t\022#" +
-      "\n\005value\030\002 \001(\0132\024.google.protobuf.AnyB\007\n\005m" +
-      "odel\"U\n\014SocketOption\022\014\n\004name\030\001 \001(\t\022\r\n\005va" +
-      "lue\030\002 \001(\t\022(\n\nadditional\030\003 \001(\0132\024.google.p" +
-      "rotobuf.Any\"B\n\023SocketOptionTimeout\022+\n\010du" +
-      "ration\030\001 \001(\0132\031.google.protobuf.Duration\"" +
-      "Q\n\022SocketOptionLinger\022\016\n\006active\030\001 \001(\010\022+\n" +
-      "\010duration\030\002 \001(\0132\031.google.protobuf.Durati" +
-      "on\"\256\005\n\023SocketOptionTcpInfo\022\022\n\ntcpi_state" +
-      "\030\001 \001(\r\022\025\n\rtcpi_ca_state\030\002 \001(\r\022\030\n\020tcpi_re" +
-      "transmits\030\003 \001(\r\022\023\n\013tcpi_probes\030\004 \001(\r\022\024\n\014" +
-      "tcpi_backoff\030\005 \001(\r\022\024\n\014tcpi_options\030\006 \001(\r" +
-      "\022\027\n\017tcpi_snd_wscale\030\007 \001(\r\022\027\n\017tcpi_rcv_ws" +
-      "cale\030\010 \001(\r\022\020\n\010tcpi_rto\030\t \001(\r\022\020\n\010tcpi_ato" +
-      "\030\n \001(\r\022\024\n\014tcpi_snd_mss\030\013 \001(\r\022\024\n\014tcpi_rcv" +
-      "_mss\030\014 \001(\r\022\024\n\014tcpi_unacked\030\r \001(\r\022\023\n\013tcpi" +
-      "_sacked\030\016 \001(\r\022\021\n\ttcpi_lost\030\017 \001(\r\022\024\n\014tcpi" +
-      "_retrans\030\020 \001(\r\022\024\n\014tcpi_fackets\030\021 \001(\r\022\033\n\023" +
-      "tcpi_last_data_sent\030\022 \001(\r\022\032\n\022tcpi_last_a" +
-      "ck_sent\030\023 \001(\r\022\033\n\023tcpi_last_data_recv\030\024 \001" +
-      "(\r\022\032\n\022tcpi_last_ack_recv\030\025 \001(\r\022\021\n\ttcpi_p" +
-      "mtu\030\026 \001(\r\022\031\n\021tcpi_rcv_ssthresh\030\027 \001(\r\022\020\n\010" +
-      "tcpi_rtt\030\030 \001(\r\022\023\n\013tcpi_rttvar\030\031 \001(\r\022\031\n\021t" +
-      "cpi_snd_ssthresh\030\032 \001(\r\022\025\n\rtcpi_snd_cwnd\030" +
-      "\033 \001(\r\022\023\n\013tcpi_advmss\030\034 \001(\r\022\027\n\017tcpi_reord" +
-      "ering\030\035 \001(\r\",\n\021GetServersRequest\022\027\n\017star" +
-      "t_server_id\030\001 \001(\003\"H\n\022GetServersResponse\022" +
-      "%\n\006server\030\001 \003(\0132\025.grpc.channelz.Server\022\013" +
-      "\n\003end\030\002 \001(\010\"E\n\027GetServerSocketsRequest\022\021" +
-      "\n\tserver_id\030\001 \001(\003\022\027\n\017start_socket_id\030\002 \001" +
-      "(\003\"U\n\030GetServerSocketsResponse\022,\n\nsocket" +
-      "_ref\030\001 \003(\0132\030.grpc.channelz.SocketRef\022\013\n\003" +
-      "end\030\002 \001(\010\"1\n\025GetTopChannelsRequest\022\030\n\020st" +
-      "art_channel_id\030\001 \001(\003\"N\n\026GetTopChannelsRe" +
-      "sponse\022\'\n\007channel\030\001 \003(\0132\026.grpc.channelz." +
-      "Channel\022\013\n\003end\030\002 \001(\010\"\'\n\021GetChannelReques" +
-      "t\022\022\n\nchannel_id\030\001 \001(\003\"=\n\022GetChannelRespo" +
-      "nse\022\'\n\007channel\030\001 \001(\0132\026.grpc.channelz.Cha" +
-      "nnel\"-\n\024GetSubchannelRequest\022\025\n\rsubchann" +
-      "el_id\030\001 \001(\003\"F\n\025GetSubchannelResponse\022-\n\n" +
-      "subchannel\030\001 \001(\0132\031.grpc.channelz.Subchan" +
-      "nel\"%\n\020GetSocketRequest\022\021\n\tsocket_id\030\001 \001" +
-      "(\003\":\n\021GetSocketResponse\022%\n\006socket\030\001 \001(\0132" +
-      "\025.grpc.channelz.Socket2\240\004\n\010Channelz\022]\n\016G" +
-      "etTopChannels\022$.grpc.channelz.GetTopChan" +
-      "nelsRequest\032%.grpc.channelz.GetTopChanne" +
-      "lsResponse\022Q\n\nGetServers\022 .grpc.channelz" +
-      ".GetServersRequest\032!.grpc.channelz.GetSe" +
-      "rversResponse\022c\n\020GetServerSockets\022&.grpc" +
-      ".channelz.GetServerSocketsRequest\032\'.grpc" +
-      ".channelz.GetServerSocketsResponse\022Q\n\nGe" +
-      "tChannel\022 .grpc.channelz.GetChannelReque" +
-      "st\032!.grpc.channelz.GetChannelResponse\022Z\n" +
-      "\rGetSubchannel\022#.grpc.channelz.GetSubcha" +
-      "nnelRequest\032$.grpc.channelz.GetSubchanne" +
-      "lResponse\022N\n\tGetSocket\022\037.grpc.channelz.G" +
-      "etSocketRequest\032 .grpc.channelz.GetSocke" +
-      "tResponseB&\n\023io.grpc.channelz.v1B\rChanne" +
-      "lzProtoP\001b\006proto3"
+      ".channelz.SocketRef\"\270\001\n\030ChannelConnectiv" +
+      "ityState\022<\n\005state\030\001 \001(\0162-.grpc.channelz." +
+      "ChannelConnectivityState.State\"^\n\005State\022" +
+      "\013\n\007UNKNOWN\020\000\022\010\n\004IDLE\020\001\022\016\n\nCONNECTING\020\002\022\t" +
+      "\n\005READY\020\003\022\025\n\021TRANSIENT_FAILURE\020\004\022\014\n\010SHUT" +
+      "DOWN\020\005\"\210\002\n\013ChannelData\0226\n\005state\030\001 \001(\0132\'." +
+      "grpc.channelz.ChannelConnectivityState\022\016" +
+      "\n\006target\030\002 \001(\t\022*\n\005trace\030\003 \001(\0132\033.grpc.cha" +
+      "nnelz.ChannelTrace\022\025\n\rcalls_started\030\004 \001(" +
+      "\003\022\027\n\017calls_succeeded\030\005 \001(\003\022\024\n\014calls_fail" +
+      "ed\030\006 \001(\003\022?\n\033last_call_started_timestamp\030" +
+      "\007 \001(\0132\032.google.protobuf.Timestamp\"\016\n\014Cha" +
+      "nnelTrace\"F\n\nChannelRef\022\022\n\nchannel_id\030\001 " +
+      "\001(\003\022\014\n\004name\030\002 \001(\tJ\004\010\003\020\004J\004\010\004\020\005J\004\010\005\020\006J\004\010\006\020" +
+      "\007\"X\n\rSubchannelRef\022\025\n\rsubchannel_id\030\007 \001(" +
+      "\003\022\014\n\004name\030\010 \001(\tJ\004\010\001\020\002J\004\010\002\020\003J\004\010\003\020\004J\004\010\004\020\005J" +
+      "\004\010\005\020\006J\004\010\006\020\007\"P\n\tSocketRef\022\021\n\tsocket_id\030\003 " +
+      "\001(\003\022\014\n\004name\030\004 \001(\tJ\004\010\001\020\002J\004\010\002\020\003J\004\010\005\020\006J\004\010\006\020" +
+      "\007J\004\010\007\020\010J\004\010\010\020\t\"P\n\tServerRef\022\021\n\tserver_id\030" +
+      "\005 \001(\003\022\014\n\004name\030\006 \001(\tJ\004\010\001\020\002J\004\010\002\020\003J\004\010\003\020\004J\004\010" +
+      "\004\020\005J\004\010\007\020\010J\004\010\010\020\t\"\211\001\n\006Server\022%\n\003ref\030\001 \001(\0132" +
+      "\030.grpc.channelz.ServerRef\022\'\n\004data\030\002 \001(\0132" +
+      "\031.grpc.channelz.ServerData\022/\n\rlisten_soc" +
+      "ket\030\003 \003(\0132\030.grpc.channelz.SocketRef\"\277\001\n\n" +
+      "ServerData\022*\n\005trace\030\001 \001(\0132\033.grpc.channel" +
+      "z.ChannelTrace\022\025\n\rcalls_started\030\002 \001(\003\022\027\n" +
+      "\017calls_succeeded\030\003 \001(\003\022\024\n\014calls_failed\030\004" +
+      " \001(\003\022?\n\033last_call_started_timestamp\030\005 \001(" +
+      "\0132\032.google.protobuf.Timestamp\"\347\001\n\006Socket" +
+      "\022%\n\003ref\030\001 \001(\0132\030.grpc.channelz.SocketRef\022" +
+      "\'\n\004data\030\002 \001(\0132\031.grpc.channelz.SocketData" +
+      "\022%\n\005local\030\003 \001(\0132\026.grpc.channelz.Address\022" +
+      "&\n\006remote\030\004 \001(\0132\026.grpc.channelz.Address\022" +
+      ")\n\010security\030\005 \001(\0132\027.grpc.channelz.Securi" +
+      "ty\022\023\n\013remote_name\030\006 \001(\t\"\353\004\n\nSocketData\022\027" +
+      "\n\017streams_started\030\001 \001(\003\022\031\n\021streams_succe" +
+      "eded\030\002 \001(\003\022\026\n\016streams_failed\030\003 \001(\003\022\025\n\rme" +
+      "ssages_sent\030\004 \001(\003\022\031\n\021messages_received\030\005" +
+      " \001(\003\022\030\n\020keep_alives_sent\030\006 \001(\003\022G\n#last_l" +
+      "ocal_stream_created_timestamp\030\007 \001(\0132\032.go" +
+      "ogle.protobuf.Timestamp\022H\n$last_remote_s" +
+      "tream_created_timestamp\030\010 \001(\0132\032.google.p" +
+      "rotobuf.Timestamp\022?\n\033last_message_sent_t" +
+      "imestamp\030\t \001(\0132\032.google.protobuf.Timesta" +
+      "mp\022C\n\037last_message_received_timestamp\030\n " +
+      "\001(\0132\032.google.protobuf.Timestamp\022>\n\031local" +
+      "_flow_control_window\030\013 \001(\0132\033.google.prot" +
+      "obuf.Int64Value\022?\n\032remote_flow_control_w" +
+      "indow\030\014 \001(\0132\033.google.protobuf.Int64Value" +
+      "\022+\n\006option\030\r \003(\0132\033.grpc.channelz.SocketO" +
+      "ption\"\337\002\n\007Address\022<\n\rtcpip_address\030\001 \001(\013" +
+      "2#.grpc.channelz.Address.TcpIpAddressH\000\022" +
+      "8\n\013uds_address\030\002 \001(\0132!.grpc.channelz.Add" +
+      "ress.UdsAddressH\000\022<\n\rother_address\030\003 \001(\013" +
+      "2#.grpc.channelz.Address.OtherAddressH\000\032" +
+      "0\n\014TcpIpAddress\022\022\n\nip_address\030\001 \001(\014\022\014\n\004p" +
+      "ort\030\002 \001(\005\032\036\n\nUdsAddress\022\020\n\010filename\030\001 \001(" +
+      "\t\032A\n\014OtherAddress\022\014\n\004name\030\001 \001(\t\022#\n\005value" +
+      "\030\002 \001(\0132\024.google.protobuf.AnyB\t\n\007address\"" +
+      "\270\002\n\010Security\022*\n\003tls\030\001 \001(\0132\033.grpc.channel" +
+      "z.Security.TlsH\000\0226\n\005other\030\002 \001(\0132%.grpc.c" +
+      "hannelz.Security.OtherSecurityH\000\032{\n\003Tls\022" +
+      "\027\n\rstandard_name\030\001 \001(\tH\000\022\024\n\nother_name\030\002" +
+      " \001(\tH\000\022\031\n\021local_certificate\030\003 \001(\014\022\032\n\022rem" +
+      "ote_certificate\030\004 \001(\014B\016\n\014cipher_suite\032B\n" +
+      "\rOtherSecurity\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 " +
+      "\001(\0132\024.google.protobuf.AnyB\007\n\005model\"U\n\014So" +
+      "cketOption\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022" +
+      "(\n\nadditional\030\003 \001(\0132\024.google.protobuf.An" +
+      "y\"B\n\023SocketOptionTimeout\022+\n\010duration\030\001 \001" +
+      "(\0132\031.google.protobuf.Duration\"Q\n\022SocketO" +
+      "ptionLinger\022\016\n\006active\030\001 \001(\010\022+\n\010duration\030" +
+      "\002 \001(\0132\031.google.protobuf.Duration\"\256\005\n\023Soc" +
+      "ketOptionTcpInfo\022\022\n\ntcpi_state\030\001 \001(\r\022\025\n\r" +
+      "tcpi_ca_state\030\002 \001(\r\022\030\n\020tcpi_retransmits\030" +
+      "\003 \001(\r\022\023\n\013tcpi_probes\030\004 \001(\r\022\024\n\014tcpi_backo" +
+      "ff\030\005 \001(\r\022\024\n\014tcpi_options\030\006 \001(\r\022\027\n\017tcpi_s" +
+      "nd_wscale\030\007 \001(\r\022\027\n\017tcpi_rcv_wscale\030\010 \001(\r" +
+      "\022\020\n\010tcpi_rto\030\t \001(\r\022\020\n\010tcpi_ato\030\n \001(\r\022\024\n\014" +
+      "tcpi_snd_mss\030\013 \001(\r\022\024\n\014tcpi_rcv_mss\030\014 \001(\r" +
+      "\022\024\n\014tcpi_unacked\030\r \001(\r\022\023\n\013tcpi_sacked\030\016 " +
+      "\001(\r\022\021\n\ttcpi_lost\030\017 \001(\r\022\024\n\014tcpi_retrans\030\020" +
+      " \001(\r\022\024\n\014tcpi_fackets\030\021 \001(\r\022\033\n\023tcpi_last_" +
+      "data_sent\030\022 \001(\r\022\032\n\022tcpi_last_ack_sent\030\023 " +
+      "\001(\r\022\033\n\023tcpi_last_data_recv\030\024 \001(\r\022\032\n\022tcpi" +
+      "_last_ack_recv\030\025 \001(\r\022\021\n\ttcpi_pmtu\030\026 \001(\r\022" +
+      "\031\n\021tcpi_rcv_ssthresh\030\027 \001(\r\022\020\n\010tcpi_rtt\030\030" +
+      " \001(\r\022\023\n\013tcpi_rttvar\030\031 \001(\r\022\031\n\021tcpi_snd_ss" +
+      "thresh\030\032 \001(\r\022\025\n\rtcpi_snd_cwnd\030\033 \001(\r\022\023\n\013t" +
+      "cpi_advmss\030\034 \001(\r\022\027\n\017tcpi_reordering\030\035 \001(" +
+      "\r\",\n\021GetServersRequest\022\027\n\017start_server_i" +
+      "d\030\001 \001(\003\"H\n\022GetServersResponse\022%\n\006server\030" +
+      "\001 \003(\0132\025.grpc.channelz.Server\022\013\n\003end\030\002 \001(" +
+      "\010\"E\n\027GetServerSocketsRequest\022\021\n\tserver_i" +
+      "d\030\001 \001(\003\022\027\n\017start_socket_id\030\002 \001(\003\"U\n\030GetS" +
+      "erverSocketsResponse\022,\n\nsocket_ref\030\001 \003(\013" +
+      "2\030.grpc.channelz.SocketRef\022\013\n\003end\030\002 \001(\010\"" +
+      "1\n\025GetTopChannelsRequest\022\030\n\020start_channe" +
+      "l_id\030\001 \001(\003\"N\n\026GetTopChannelsResponse\022\'\n\007" +
+      "channel\030\001 \003(\0132\026.grpc.channelz.Channel\022\013\n" +
+      "\003end\030\002 \001(\010\"\'\n\021GetChannelRequest\022\022\n\nchann" +
+      "el_id\030\001 \001(\003\"=\n\022GetChannelResponse\022\'\n\007cha" +
+      "nnel\030\001 \001(\0132\026.grpc.channelz.Channel\"-\n\024Ge" +
+      "tSubchannelRequest\022\025\n\rsubchannel_id\030\001 \001(" +
+      "\003\"F\n\025GetSubchannelResponse\022-\n\nsubchannel" +
+      "\030\001 \001(\0132\031.grpc.channelz.Subchannel\"%\n\020Get" +
+      "SocketRequest\022\021\n\tsocket_id\030\001 \001(\003\":\n\021GetS" +
+      "ocketResponse\022%\n\006socket\030\001 \001(\0132\025.grpc.cha" +
+      "nnelz.Socket2\240\004\n\010Channelz\022]\n\016GetTopChann" +
+      "els\022$.grpc.channelz.GetTopChannelsReques" +
+      "t\032%.grpc.channelz.GetTopChannelsResponse" +
+      "\022Q\n\nGetServers\022 .grpc.channelz.GetServer" +
+      "sRequest\032!.grpc.channelz.GetServersRespo" +
+      "nse\022c\n\020GetServerSockets\022&.grpc.channelz." +
+      "GetServerSocketsRequest\032\'.grpc.channelz." +
+      "GetServerSocketsResponse\022Q\n\nGetChannel\022 " +
+      ".grpc.channelz.GetChannelRequest\032!.grpc." +
+      "channelz.GetChannelResponse\022Z\n\rGetSubcha" +
+      "nnel\022#.grpc.channelz.GetSubchannelReques" +
+      "t\032$.grpc.channelz.GetSubchannelResponse\022" +
+      "N\n\tGetSocket\022\037.grpc.channelz.GetSocketRe" +
+      "quest\032 .grpc.channelz.GetSocketResponseB" +
+      "&\n\023io.grpc.channelz.v1B\rChannelzProtoP\001b" +
+      "\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
         new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
@@ -370,60 +372,60 @@ public final class ChannelzProto {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_Subchannel_descriptor,
         new java.lang.String[] { "Ref", "Data", "ChannelRef", "SubchannelRef", "SocketRef", });
-    internal_static_grpc_channelz_ChannelData_descriptor =
+    internal_static_grpc_channelz_ChannelConnectivityState_descriptor =
       getDescriptor().getMessageTypes().get(2);
+    internal_static_grpc_channelz_ChannelConnectivityState_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_grpc_channelz_ChannelConnectivityState_descriptor,
+        new java.lang.String[] { "State", });
+    internal_static_grpc_channelz_ChannelData_descriptor =
+      getDescriptor().getMessageTypes().get(3);
     internal_static_grpc_channelz_ChannelData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_ChannelData_descriptor,
         new java.lang.String[] { "State", "Target", "Trace", "CallsStarted", "CallsSucceeded", "CallsFailed", "LastCallStartedTimestamp", });
     internal_static_grpc_channelz_ChannelTrace_descriptor =
-      getDescriptor().getMessageTypes().get(3);
+      getDescriptor().getMessageTypes().get(4);
     internal_static_grpc_channelz_ChannelTrace_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_ChannelTrace_descriptor,
         new java.lang.String[] { });
     internal_static_grpc_channelz_ChannelRef_descriptor =
-      getDescriptor().getMessageTypes().get(4);
+      getDescriptor().getMessageTypes().get(5);
     internal_static_grpc_channelz_ChannelRef_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_ChannelRef_descriptor,
         new java.lang.String[] { "ChannelId", "Name", });
     internal_static_grpc_channelz_SubchannelRef_descriptor =
-      getDescriptor().getMessageTypes().get(5);
+      getDescriptor().getMessageTypes().get(6);
     internal_static_grpc_channelz_SubchannelRef_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_SubchannelRef_descriptor,
         new java.lang.String[] { "SubchannelId", "Name", });
     internal_static_grpc_channelz_SocketRef_descriptor =
-      getDescriptor().getMessageTypes().get(6);
+      getDescriptor().getMessageTypes().get(7);
     internal_static_grpc_channelz_SocketRef_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_SocketRef_descriptor,
         new java.lang.String[] { "SocketId", "Name", });
     internal_static_grpc_channelz_ServerRef_descriptor =
-      getDescriptor().getMessageTypes().get(7);
+      getDescriptor().getMessageTypes().get(8);
     internal_static_grpc_channelz_ServerRef_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_ServerRef_descriptor,
         new java.lang.String[] { "ServerId", "Name", });
     internal_static_grpc_channelz_Server_descriptor =
-      getDescriptor().getMessageTypes().get(8);
+      getDescriptor().getMessageTypes().get(9);
     internal_static_grpc_channelz_Server_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_Server_descriptor,
         new java.lang.String[] { "Ref", "Data", "ListenSocket", });
     internal_static_grpc_channelz_ServerData_descriptor =
-      getDescriptor().getMessageTypes().get(9);
+      getDescriptor().getMessageTypes().get(10);
     internal_static_grpc_channelz_ServerData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_grpc_channelz_ServerData_descriptor,
         new java.lang.String[] { "Trace", "CallsStarted", "CallsSucceeded", "CallsFailed", "LastCallStartedTimestamp", });
-    internal_static_grpc_channelz_ServerChannelTrace_descriptor =
-      getDescriptor().getMessageTypes().get(10);
-    internal_static_grpc_channelz_ServerChannelTrace_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_grpc_channelz_ServerChannelTrace_descriptor,
-        new java.lang.String[] { });
     internal_static_grpc_channelz_Socket_descriptor =
       getDescriptor().getMessageTypes().get(11);
     internal_static_grpc_channelz_Socket_fieldAccessorTable = new
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTrace.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTrace.java
deleted file mode 100644
index a6674169b..000000000
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTrace.java
+++ /dev/null
@@ -1,396 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: grpc/channelz/channelz.proto
-
-package io.grpc.channelz.v1;
-
-/**
- * <pre>
- * TODO: fill this in.
- * </pre>
- *
- * Protobuf type {@code grpc.channelz.ServerChannelTrace}
- */
-public  final class ServerChannelTrace extends
-    com.google.protobuf.GeneratedMessageV3 implements
-    // @@protoc_insertion_point(message_implements:grpc.channelz.ServerChannelTrace)
-    ServerChannelTraceOrBuilder {
-private static final long serialVersionUID = 0L;
-  // Use ServerChannelTrace.newBuilder() to construct.
-  private ServerChannelTrace(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-    super(builder);
-  }
-  private ServerChannelTrace() {
-  }
-
-  @java.lang.Override
-  public final com.google.protobuf.UnknownFieldSet
-  getUnknownFields() {
-    return this.unknownFields;
-  }
-  private ServerChannelTrace(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
-    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-        com.google.protobuf.UnknownFieldSet.newBuilder();
-    try {
-      boolean done = false;
-      while (!done) {
-        int tag = input.readTag();
-        switch (tag) {
-          case 0:
-            done = true;
-            break;
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
-        }
-      }
-    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (java.io.IOException e) {
-      throw new com.google.protobuf.InvalidProtocolBufferException(
-          e).setUnfinishedMessage(this);
-    } finally {
-      this.unknownFields = unknownFields.build();
-      makeExtensionsImmutable();
-    }
-  }
-  public static final com.google.protobuf.Descriptors.Descriptor
-      getDescriptor() {
-    return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ServerChannelTrace_descriptor;
-  }
-
-  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internalGetFieldAccessorTable() {
-    return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ServerChannelTrace_fieldAccessorTable
-        .ensureFieldAccessorsInitialized(
-            io.grpc.channelz.v1.ServerChannelTrace.class, io.grpc.channelz.v1.ServerChannelTrace.Builder.class);
-  }
-
-  private byte memoizedIsInitialized = -1;
-  public final boolean isInitialized() {
-    byte isInitialized = memoizedIsInitialized;
-    if (isInitialized == 1) return true;
-    if (isInitialized == 0) return false;
-
-    memoizedIsInitialized = 1;
-    return true;
-  }
-
-  public void writeTo(com.google.protobuf.CodedOutputStream output)
-                      throws java.io.IOException {
-    unknownFields.writeTo(output);
-  }
-
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    size = 0;
-    size += unknownFields.getSerializedSize();
-    memoizedSize = size;
-    return size;
-  }
-
-  @java.lang.Override
-  public boolean equals(final java.lang.Object obj) {
-    if (obj == this) {
-     return true;
-    }
-    if (!(obj instanceof io.grpc.channelz.v1.ServerChannelTrace)) {
-      return super.equals(obj);
-    }
-    io.grpc.channelz.v1.ServerChannelTrace other = (io.grpc.channelz.v1.ServerChannelTrace) obj;
-
-    boolean result = true;
-    result = result && unknownFields.equals(other.unknownFields);
-    return result;
-  }
-
-  @java.lang.Override
-  public int hashCode() {
-    if (memoizedHashCode != 0) {
-      return memoizedHashCode;
-    }
-    int hash = 41;
-    hash = (19 * hash) + getDescriptor().hashCode();
-    hash = (29 * hash) + unknownFields.hashCode();
-    memoizedHashCode = hash;
-    return hash;
-  }
-
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(
-      java.nio.ByteBuffer data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(
-      java.nio.ByteBuffer data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(
-      com.google.protobuf.ByteString data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(
-      com.google.protobuf.ByteString data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(byte[] data)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(
-      byte[] data,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws com.google.protobuf.InvalidProtocolBufferException {
-    return PARSER.parseFrom(data, extensionRegistry);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseDelimitedFrom(java.io.InputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseDelimitedFrom(
-      java.io.InputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(
-      com.google.protobuf.CodedInputStream input)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input);
-  }
-  public static io.grpc.channelz.v1.ServerChannelTrace parseFrom(
-      com.google.protobuf.CodedInputStream input,
-      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-      throws java.io.IOException {
-    return com.google.protobuf.GeneratedMessageV3
-        .parseWithIOException(PARSER, input, extensionRegistry);
-  }
-
-  public Builder newBuilderForType() { return newBuilder(); }
-  public static Builder newBuilder() {
-    return DEFAULT_INSTANCE.toBuilder();
-  }
-  public static Builder newBuilder(io.grpc.channelz.v1.ServerChannelTrace prototype) {
-    return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-  }
-  public Builder toBuilder() {
-    return this == DEFAULT_INSTANCE
-        ? new Builder() : new Builder().mergeFrom(this);
-  }
-
-  @java.lang.Override
-  protected Builder newBuilderForType(
-      com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-    Builder builder = new Builder(parent);
-    return builder;
-  }
-  /**
-   * <pre>
-   * TODO: fill this in.
-   * </pre>
-   *
-   * Protobuf type {@code grpc.channelz.ServerChannelTrace}
-   */
-  public static final class Builder extends
-      com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-      // @@protoc_insertion_point(builder_implements:grpc.channelz.ServerChannelTrace)
-      io.grpc.channelz.v1.ServerChannelTraceOrBuilder {
-    public static final com.google.protobuf.Descriptors.Descriptor
-        getDescriptor() {
-      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ServerChannelTrace_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ServerChannelTrace_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              io.grpc.channelz.v1.ServerChannelTrace.class, io.grpc.channelz.v1.ServerChannelTrace.Builder.class);
-    }
-
-    // Construct using io.grpc.channelz.v1.ServerChannelTrace.newBuilder()
-    private Builder() {
-      maybeForceBuilderInitialization();
-    }
-
-    private Builder(
-        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-      super(parent);
-      maybeForceBuilderInitialization();
-    }
-    private void maybeForceBuilderInitialization() {
-      if (com.google.protobuf.GeneratedMessageV3
-              .alwaysUseFieldBuilders) {
-      }
-    }
-    public Builder clear() {
-      super.clear();
-      return this;
-    }
-
-    public com.google.protobuf.Descriptors.Descriptor
-        getDescriptorForType() {
-      return io.grpc.channelz.v1.ChannelzProto.internal_static_grpc_channelz_ServerChannelTrace_descriptor;
-    }
-
-    public io.grpc.channelz.v1.ServerChannelTrace getDefaultInstanceForType() {
-      return io.grpc.channelz.v1.ServerChannelTrace.getDefaultInstance();
-    }
-
-    public io.grpc.channelz.v1.ServerChannelTrace build() {
-      io.grpc.channelz.v1.ServerChannelTrace result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    public io.grpc.channelz.v1.ServerChannelTrace buildPartial() {
-      io.grpc.channelz.v1.ServerChannelTrace result = new io.grpc.channelz.v1.ServerChannelTrace(this);
-      onBuilt();
-      return result;
-    }
-
-    public Builder clone() {
-      return (Builder) super.clone();
-    }
-    public Builder setField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.setField(field, value);
-    }
-    public Builder clearField(
-        com.google.protobuf.Descriptors.FieldDescriptor field) {
-      return (Builder) super.clearField(field);
-    }
-    public Builder clearOneof(
-        com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-      return (Builder) super.clearOneof(oneof);
-    }
-    public Builder setRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        int index, java.lang.Object value) {
-      return (Builder) super.setRepeatedField(field, index, value);
-    }
-    public Builder addRepeatedField(
-        com.google.protobuf.Descriptors.FieldDescriptor field,
-        java.lang.Object value) {
-      return (Builder) super.addRepeatedField(field, value);
-    }
-    public Builder mergeFrom(com.google.protobuf.Message other) {
-      if (other instanceof io.grpc.channelz.v1.ServerChannelTrace) {
-        return mergeFrom((io.grpc.channelz.v1.ServerChannelTrace)other);
-      } else {
-        super.mergeFrom(other);
-        return this;
-      }
-    }
-
-    public Builder mergeFrom(io.grpc.channelz.v1.ServerChannelTrace other) {
-      if (other == io.grpc.channelz.v1.ServerChannelTrace.getDefaultInstance()) return this;
-      this.mergeUnknownFields(other.unknownFields);
-      onChanged();
-      return this;
-    }
-
-    public final boolean isInitialized() {
-      return true;
-    }
-
-    public Builder mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      io.grpc.channelz.v1.ServerChannelTrace parsedMessage = null;
-      try {
-        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-        parsedMessage = (io.grpc.channelz.v1.ServerChannelTrace) e.getUnfinishedMessage();
-        throw e.unwrapIOException();
-      } finally {
-        if (parsedMessage != null) {
-          mergeFrom(parsedMessage);
-        }
-      }
-      return this;
-    }
-    public final Builder setUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.setUnknownFieldsProto3(unknownFields);
-    }
-
-    public final Builder mergeUnknownFields(
-        final com.google.protobuf.UnknownFieldSet unknownFields) {
-      return super.mergeUnknownFields(unknownFields);
-    }
-
-
-    // @@protoc_insertion_point(builder_scope:grpc.channelz.ServerChannelTrace)
-  }
-
-  // @@protoc_insertion_point(class_scope:grpc.channelz.ServerChannelTrace)
-  private static final io.grpc.channelz.v1.ServerChannelTrace DEFAULT_INSTANCE;
-  static {
-    DEFAULT_INSTANCE = new io.grpc.channelz.v1.ServerChannelTrace();
-  }
-
-  public static io.grpc.channelz.v1.ServerChannelTrace getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  private static final com.google.protobuf.Parser<ServerChannelTrace>
-      PARSER = new com.google.protobuf.AbstractParser<ServerChannelTrace>() {
-    public ServerChannelTrace parsePartialFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ServerChannelTrace(input, extensionRegistry);
-    }
-  };
-
-  public static com.google.protobuf.Parser<ServerChannelTrace> parser() {
-    return PARSER;
-  }
-
-  @java.lang.Override
-  public com.google.protobuf.Parser<ServerChannelTrace> getParserForType() {
-    return PARSER;
-  }
-
-  public io.grpc.channelz.v1.ServerChannelTrace getDefaultInstanceForType() {
-    return DEFAULT_INSTANCE;
-  }
-
-}
-
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTraceOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTraceOrBuilder.java
deleted file mode 100644
index b1cf281c4..000000000
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerChannelTraceOrBuilder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: grpc/channelz/channelz.proto
-
-package io.grpc.channelz.v1;
-
-public interface ServerChannelTraceOrBuilder extends
-    // @@protoc_insertion_point(interface_extends:grpc.channelz.ServerChannelTrace)
-    com.google.protobuf.MessageOrBuilder {
-}
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerData.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerData.java
index a87213022..c0de6729f 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerData.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerData.java
@@ -53,11 +53,11 @@ private static final long serialVersionUID = 0L;
             break;
           }
           case 10: {
-            io.grpc.channelz.v1.ServerChannelTrace.Builder subBuilder = null;
+            io.grpc.channelz.v1.ChannelTrace.Builder subBuilder = null;
             if (trace_ != null) {
               subBuilder = trace_.toBuilder();
             }
-            trace_ = input.readMessage(io.grpc.channelz.v1.ServerChannelTrace.parser(), extensionRegistry);
+            trace_ = input.readMessage(io.grpc.channelz.v1.ChannelTrace.parser(), extensionRegistry);
             if (subBuilder != null) {
               subBuilder.mergeFrom(trace_);
               trace_ = subBuilder.buildPartial();
@@ -118,23 +118,23 @@ private static final long serialVersionUID = 0L;
   }
 
   public static final int TRACE_FIELD_NUMBER = 1;
-  private io.grpc.channelz.v1.ServerChannelTrace trace_;
+  private io.grpc.channelz.v1.ChannelTrace trace_;
   /**
-   * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+   * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
    */
   public boolean hasTrace() {
     return trace_ != null;
   }
   /**
-   * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+   * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
    */
-  public io.grpc.channelz.v1.ServerChannelTrace getTrace() {
-    return trace_ == null ? io.grpc.channelz.v1.ServerChannelTrace.getDefaultInstance() : trace_;
+  public io.grpc.channelz.v1.ChannelTrace getTrace() {
+    return trace_ == null ? io.grpc.channelz.v1.ChannelTrace.getDefaultInstance() : trace_;
   }
   /**
-   * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+   * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
    */
-  public io.grpc.channelz.v1.ServerChannelTraceOrBuilder getTraceOrBuilder() {
+  public io.grpc.channelz.v1.ChannelTraceOrBuilder getTraceOrBuilder() {
     return getTrace();
   }
 
@@ -590,29 +590,29 @@ private static final long serialVersionUID = 0L;
       return this;
     }
 
-    private io.grpc.channelz.v1.ServerChannelTrace trace_ = null;
+    private io.grpc.channelz.v1.ChannelTrace trace_ = null;
     private com.google.protobuf.SingleFieldBuilderV3<
-        io.grpc.channelz.v1.ServerChannelTrace, io.grpc.channelz.v1.ServerChannelTrace.Builder, io.grpc.channelz.v1.ServerChannelTraceOrBuilder> traceBuilder_;
+        io.grpc.channelz.v1.ChannelTrace, io.grpc.channelz.v1.ChannelTrace.Builder, io.grpc.channelz.v1.ChannelTraceOrBuilder> traceBuilder_;
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
     public boolean hasTrace() {
       return traceBuilder_ != null || trace_ != null;
     }
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
-    public io.grpc.channelz.v1.ServerChannelTrace getTrace() {
+    public io.grpc.channelz.v1.ChannelTrace getTrace() {
       if (traceBuilder_ == null) {
-        return trace_ == null ? io.grpc.channelz.v1.ServerChannelTrace.getDefaultInstance() : trace_;
+        return trace_ == null ? io.grpc.channelz.v1.ChannelTrace.getDefaultInstance() : trace_;
       } else {
         return traceBuilder_.getMessage();
       }
     }
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
-    public Builder setTrace(io.grpc.channelz.v1.ServerChannelTrace value) {
+    public Builder setTrace(io.grpc.channelz.v1.ChannelTrace value) {
       if (traceBuilder_ == null) {
         if (value == null) {
           throw new NullPointerException();
@@ -626,10 +626,10 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
     public Builder setTrace(
-        io.grpc.channelz.v1.ServerChannelTrace.Builder builderForValue) {
+        io.grpc.channelz.v1.ChannelTrace.Builder builderForValue) {
       if (traceBuilder_ == null) {
         trace_ = builderForValue.build();
         onChanged();
@@ -640,13 +640,13 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
-    public Builder mergeTrace(io.grpc.channelz.v1.ServerChannelTrace value) {
+    public Builder mergeTrace(io.grpc.channelz.v1.ChannelTrace value) {
       if (traceBuilder_ == null) {
         if (trace_ != null) {
           trace_ =
-            io.grpc.channelz.v1.ServerChannelTrace.newBuilder(trace_).mergeFrom(value).buildPartial();
+            io.grpc.channelz.v1.ChannelTrace.newBuilder(trace_).mergeFrom(value).buildPartial();
         } else {
           trace_ = value;
         }
@@ -658,7 +658,7 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
     public Builder clearTrace() {
       if (traceBuilder_ == null) {
@@ -672,33 +672,33 @@ private static final long serialVersionUID = 0L;
       return this;
     }
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
-    public io.grpc.channelz.v1.ServerChannelTrace.Builder getTraceBuilder() {
+    public io.grpc.channelz.v1.ChannelTrace.Builder getTraceBuilder() {
       
       onChanged();
       return getTraceFieldBuilder().getBuilder();
     }
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
-    public io.grpc.channelz.v1.ServerChannelTraceOrBuilder getTraceOrBuilder() {
+    public io.grpc.channelz.v1.ChannelTraceOrBuilder getTraceOrBuilder() {
       if (traceBuilder_ != null) {
         return traceBuilder_.getMessageOrBuilder();
       } else {
         return trace_ == null ?
-            io.grpc.channelz.v1.ServerChannelTrace.getDefaultInstance() : trace_;
+            io.grpc.channelz.v1.ChannelTrace.getDefaultInstance() : trace_;
       }
     }
     /**
-     * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+     * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
-        io.grpc.channelz.v1.ServerChannelTrace, io.grpc.channelz.v1.ServerChannelTrace.Builder, io.grpc.channelz.v1.ServerChannelTraceOrBuilder> 
+        io.grpc.channelz.v1.ChannelTrace, io.grpc.channelz.v1.ChannelTrace.Builder, io.grpc.channelz.v1.ChannelTraceOrBuilder> 
         getTraceFieldBuilder() {
       if (traceBuilder_ == null) {
         traceBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-            io.grpc.channelz.v1.ServerChannelTrace, io.grpc.channelz.v1.ServerChannelTrace.Builder, io.grpc.channelz.v1.ServerChannelTraceOrBuilder>(
+            io.grpc.channelz.v1.ChannelTrace, io.grpc.channelz.v1.ChannelTrace.Builder, io.grpc.channelz.v1.ChannelTraceOrBuilder>(
                 getTrace(),
                 getParentForChildren(),
                 isClean());
diff --git a/services/src/generated/main/java/io/grpc/channelz/v1/ServerDataOrBuilder.java b/services/src/generated/main/java/io/grpc/channelz/v1/ServerDataOrBuilder.java
index db80ef9a6..5045eb24b 100644
--- a/services/src/generated/main/java/io/grpc/channelz/v1/ServerDataOrBuilder.java
+++ b/services/src/generated/main/java/io/grpc/channelz/v1/ServerDataOrBuilder.java
@@ -8,17 +8,17 @@ public interface ServerDataOrBuilder extends
     com.google.protobuf.MessageOrBuilder {
 
   /**
-   * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+   * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
    */
   boolean hasTrace();
   /**
-   * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+   * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
    */
-  io.grpc.channelz.v1.ServerChannelTrace getTrace();
+  io.grpc.channelz.v1.ChannelTrace getTrace();
   /**
-   * <code>.grpc.channelz.ServerChannelTrace trace = 1;</code>
+   * <code>.grpc.channelz.ChannelTrace trace = 1;</code>
    */
-  io.grpc.channelz.v1.ServerChannelTraceOrBuilder getTraceOrBuilder();
+  io.grpc.channelz.v1.ChannelTraceOrBuilder getTraceOrBuilder();
 
   /**
    * <pre>
diff --git a/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java b/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java
index 3ad4f70f4..21460dba4 100644
--- a/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java
+++ b/services/src/main/java/io/grpc/services/ChannelzProtoUtil.java
@@ -30,8 +30,9 @@ import io.grpc.channelz.v1.Address.OtherAddress;
 import io.grpc.channelz.v1.Address.TcpIpAddress;
 import io.grpc.channelz.v1.Address.UdsAddress;
 import io.grpc.channelz.v1.Channel;
+import io.grpc.channelz.v1.ChannelConnectivityState;
+import io.grpc.channelz.v1.ChannelConnectivityState.State;
 import io.grpc.channelz.v1.ChannelData;
-import io.grpc.channelz.v1.ChannelData.State;
 import io.grpc.channelz.v1.ChannelRef;
 import io.grpc.channelz.v1.GetServerSocketsResponse;
 import io.grpc.channelz.v1.GetServersResponse;
@@ -350,7 +351,7 @@ final class ChannelzProtoUtil {
     return ChannelData
         .newBuilder()
         .setTarget(stats.target)
-        .setState(toState(stats.state))
+        .setState(toChannelConnectivityState(stats.state))
         .setCallsStarted(stats.callsStarted)
         .setCallsSucceeded(stats.callsSucceeded)
         .setCallsFailed(stats.callsFailed)
@@ -358,6 +359,10 @@ final class ChannelzProtoUtil {
         .build();
   }
 
+  static ChannelConnectivityState toChannelConnectivityState(ConnectivityState s) {
+    return ChannelConnectivityState.newBuilder().setState(toState(s)).build();
+  }
+
   static State toState(ConnectivityState state) {
     if (state == null) {
       return State.UNKNOWN;
diff --git a/services/src/main/proto/grpc/channelz/channelz.proto b/services/src/main/proto/grpc/channelz/channelz.proto
index c107cb4ab..9b21e17eb 100644
--- a/services/src/main/proto/grpc/channelz/channelz.proto
+++ b/services/src/main/proto/grpc/channelz/channelz.proto
@@ -1,3 +1,21 @@
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file defines an interface for exporting monitoring information
+// out of gRPC servers.  See the full design at
+// https://github.com/grpc/proposal/blob/master/A14-channelz.md
+
 syntax = "proto3";
 
 package grpc.channelz;
@@ -58,7 +76,9 @@ message Subchannel {
   repeated SocketRef socket_ref = 5;
 }
 
-message ChannelData {
+// These come from the specified states in this document:
+// https://github.com/grpc/grpc/blob/master/doc/connectivity-semantics-and-api.md
+message ChannelConnectivityState {
   enum State {
     UNKNOWN = 0;
     IDLE = 1;
@@ -68,6 +88,11 @@ message ChannelData {
     SHUTDOWN = 5;
   }
   State state = 1;
+}
+
+message ChannelData {
+
+  ChannelConnectivityState state = 1;
 
   // The target this channel originally tried to connect to.  May be absent
   string target = 2;
@@ -86,7 +111,8 @@ message ChannelData {
 }
 
 message ChannelTrace {
-  // TODO: fill this in.
+  // see the proto in the gRFC for channel tracing:
+  // A3-channel-tracing.md
 }
 
 message ChannelRef {
@@ -134,7 +160,7 @@ message Server {
 }
 
 message ServerData {
-  ServerChannelTrace trace = 1;
+  ChannelTrace trace = 1;
 
   // The number of incoming calls started on the server
   int64 calls_started = 2;
@@ -147,10 +173,6 @@ message ServerData {
   google.protobuf.Timestamp last_call_started_timestamp = 5;
 }
 
-message ServerChannelTrace {
-  // TODO: fill this in.
-}
-
 // Information about an actual connection.  Pronounced "sock-ay".
 message Socket {
   SocketRef ref = 1;
diff --git a/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java b/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java
index 861b9f05e..a32b8a050 100644
--- a/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java
+++ b/services/src/test/java/io/grpc/services/ChannelzProtoUtilTest.java
@@ -37,8 +37,9 @@ import io.grpc.channelz.v1.Address.OtherAddress;
 import io.grpc.channelz.v1.Address.TcpIpAddress;
 import io.grpc.channelz.v1.Address.UdsAddress;
 import io.grpc.channelz.v1.Channel;
+import io.grpc.channelz.v1.ChannelConnectivityState;
+import io.grpc.channelz.v1.ChannelConnectivityState.State;
 import io.grpc.channelz.v1.ChannelData;
-import io.grpc.channelz.v1.ChannelData.State;
 import io.grpc.channelz.v1.ChannelRef;
 import io.grpc.channelz.v1.GetChannelRequest;
 import io.grpc.channelz.v1.GetServerSocketsResponse;
@@ -96,7 +97,7 @@ public final class ChannelzProtoUtilTest {
   private final ChannelData channelData = ChannelData
       .newBuilder()
       .setTarget("sometarget")
-      .setState(State.READY)
+      .setState(ChannelConnectivityState.newBuilder().setState(State.READY))
       .setCallsStarted(1)
       .setCallsSucceeded(2)
       .setCallsFailed(3)
@@ -117,7 +118,7 @@ public final class ChannelzProtoUtilTest {
   private final ChannelData subchannelData = ChannelData
       .newBuilder()
       .setTarget("sometarget")
-      .setState(State.READY)
+      .setState(ChannelConnectivityState.newBuilder().setState(State.READY))
       .setCallsStarted(1)
       .setCallsSucceeded(2)
       .setCallsFailed(3)