Eliminate ATTR_LB_ADDRS in GrpcAttributes.

grpc · Feb 19, 2020 · deb0e12 · deb0e12
1 parent b935f46
commit deb0e12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/core/src/main/java/io/grpc/internal/GrpcAttributes.java b/core/src/main/java/io/grpc/internal/GrpcAttributes.java
@@ -38,16 +38,6 @@ public final class GrpcAttributes {
   public static final Attributes.Key<Map<String, ?>> NAME_RESOLVER_SERVICE_CONFIG =
       Attributes.Key.create("service-config");
 
-  /**
-   * Attribute key for gRPC LB server addresses.
-   *
-   * <p>Deprecated: this will be used for grpclb specific logic, which will be moved out of core.
-   */
-  @Deprecated
-  @NameResolver.ResolutionResultAttr
-  public static final Attributes.Key<List<EquivalentAddressGroup>> ATTR_LB_ADDRS =
-      Attributes.Key.create("io.grpc.grpclb.lbAddrs");
-
   /**
    * The naming authority of a gRPC LB server address.  It is an address-group-level attribute,
    * present when the address group is a LoadBalancer.

diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbConstants.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbConstants.java
@@ -42,9 +42,11 @@ public final class GrpclbConstants {
   static final Attributes.Key<String> TOKEN_ATTRIBUTE_KEY =
       Attributes.Key.create("lb-token");
 
-  @SuppressWarnings("deprecation")
+  /**
+   * Attribute key for gRPC LB server addresses.
+   */
   static final Attributes.Key<List<EquivalentAddressGroup>> ATTR_LB_ADDRS =
-      io.grpc.internal.GrpcAttributes.ATTR_LB_ADDRS;
+      Attributes.Key.create("io.grpc.grpclb.lbAddrs");
 
   @SuppressWarnings("deprecation")
   @EquivalentAddressGroup.Attr