Skip to content

Commit ab11c79

Browse files
kannanjgithubkannanjgithub
committed
Rename package io.grpc.internal in xds project to io.grpc.xds.internal to avoid the package leak.
1 parent cd61ddb commit ab11c79

File tree

8 files changed

+48
-48
lines changed

8 files changed

+48
-48
lines changed

‎xds/src/main/java/io/grpc/xds/ClusterImplLoadBalancer.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import io.grpc.internal.ForwardingClientStreamTracer;
3838
import io.grpc.internal.GrpcUtil;
3939
import io.grpc.internal.ObjectPool;
40-
import io.grpc.internal.XdsCommonAttributes;
40+
import io.grpc.xds.internal.XdsInternalAttributes;
4141
import io.grpc.services.MetricReport;
4242
import io.grpc.util.ForwardingLoadBalancerHelper;
4343
import io.grpc.util.ForwardingSubchannel;
@@ -118,12 +118,12 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
118118
logger.log(XdsLogLevel.DEBUG, "Received resolution result: {0}", resolvedAddresses);
119119
Attributes attributes = resolvedAddresses.getAttributes();
120120
if (xdsClientPool == null) {
121-
xdsClientPool = attributes.get(XdsAttributes.XDS_CLIENT_POOL);
121+
xdsClientPool = attributes.get(io.grpc.xds.XdsAttributes.XDS_CLIENT_POOL);
122122
assert xdsClientPool != null;
123123
xdsClient = xdsClientPool.getObject();
124124
}
125125
if (callCounterProvider == null) {
126-
callCounterProvider = attributes.get(XdsAttributes.CALL_COUNTER_PROVIDER);
126+
callCounterProvider = attributes.get(io.grpc.xds.XdsAttributes.CALL_COUNTER_PROVIDER);
127127
}
128128

129129
ClusterImplConfig config =
@@ -242,9 +242,9 @@ public Subchannel createSubchannel(CreateSubchannelArgs args) {
242242
.set(ATTR_CLUSTER_LOCALITY, localityAtomicReference);
243243
if (GrpcUtil.getFlag("GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE", false)) {
244244
String hostname = args.getAddresses().get(0).getAttributes()
245-
.get(XdsCommonAttributes.ATTR_ADDRESS_NAME);
245+
.get(XdsInternalAttributes.ATTR_ADDRESS_NAME);
246246
if (hostname != null) {
247-
attrsBuilder.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, hostname);
247+
attrsBuilder.set(XdsInternalAttributes.ATTR_ADDRESS_NAME, hostname);
248248
}
249249
}
250250
args = args.toBuilder().setAddresses(addresses).setAttributes(attrsBuilder.build()).build();
@@ -293,7 +293,7 @@ private List<EquivalentAddressGroup> withAdditionalAttributes(
293293
List<EquivalentAddressGroup> newAddresses = new ArrayList<>();
294294
for (EquivalentAddressGroup eag : addresses) {
295295
Attributes.Builder attrBuilder = eag.getAttributes().toBuilder().set(
296-
XdsAttributes.ATTR_CLUSTER_NAME, cluster);
296+
io.grpc.xds.XdsAttributes.ATTR_CLUSTER_NAME, cluster);
297297
if (sslContextProviderSupplier != null) {
298298
attrBuilder.set(
299299
SecurityProtocolNegotiators.ATTR_SSL_CONTEXT_PROVIDER_SUPPLIER,
@@ -305,7 +305,7 @@ private List<EquivalentAddressGroup> withAdditionalAttributes(
305305
}
306306

307307
private ClusterLocality createClusterLocalityFromAttributes(Attributes addressAttributes) {
308-
Locality locality = addressAttributes.get(XdsAttributes.ATTR_LOCALITY);
308+
Locality locality = addressAttributes.get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY);
309309
String localityName = addressAttributes.get(EquivalentAddressGroup.ATTR_LOCALITY_NAME);
310310

311311
// Endpoint addresses resolved by ClusterResolverLoadBalancer should always contain
@@ -439,7 +439,7 @@ public PickResult pickSubchannel(PickSubchannelArgs args) {
439439
result = PickResult.withSubchannel(result.getSubchannel(),
440440
result.getStreamTracerFactory(),
441441
result.getSubchannel().getAttributes().get(
442-
XdsCommonAttributes.ATTR_ADDRESS_NAME));
442+
XdsInternalAttributes.ATTR_ADDRESS_NAME));
443443
}
444444
}
445445
return result;

‎xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import io.grpc.LoadBalancerRegistry;
3030
import io.grpc.Status;
3131
import io.grpc.StatusOr;
32-
import io.grpc.internal.XdsCommonAttributes;
32+
import io.grpc.xds.internal.XdsInternalAttributes;
3333
import io.grpc.util.GracefulSwitchLoadBalancer;
3434
import io.grpc.util.OutlierDetectionLoadBalancer.OutlierDetectionLoadBalancerConfig;
3535
import io.grpc.xds.ClusterImplLoadBalancerProvider.ClusterImplConfig;
@@ -98,7 +98,7 @@ public Status acceptResolvedAddresses(ResolvedAddresses resolvedAddresses) {
9898
logger.log(XdsLogLevel.DEBUG, "Received resolution result: {0}", resolvedAddresses);
9999
ClusterResolverConfig config =
100100
(ClusterResolverConfig) resolvedAddresses.getLoadBalancingPolicyConfig();
101-
XdsConfig xdsConfig = resolvedAddresses.getAttributes().get(XdsAttributes.XDS_CONFIG);
101+
XdsConfig xdsConfig = resolvedAddresses.getAttributes().get(io.grpc.xds.XdsAttributes.XDS_CONFIG);
102102

103103
DiscoveryMechanism instance = config.discoveryMechanism;
104104
String cluster = instance.cluster;
@@ -190,12 +190,12 @@ StatusOr<ClusterResolutionResult> edsUpdateToResult(
190190
String localityName = localityName(locality);
191191
Attributes attr =
192192
endpoint.eag().getAttributes().toBuilder()
193-
.set(XdsAttributes.ATTR_LOCALITY, locality)
193+
.set(io.grpc.xds.XdsAttributes.ATTR_LOCALITY, locality)
194194
.set(EquivalentAddressGroup.ATTR_LOCALITY_NAME, localityName)
195-
.set(XdsAttributes.ATTR_LOCALITY_WEIGHT,
195+
.set(io.grpc.xds.XdsAttributes.ATTR_LOCALITY_WEIGHT,
196196
localityLbInfo.localityWeight())
197-
.set(XdsAttributes.ATTR_SERVER_WEIGHT, weight)
198-
.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, endpoint.hostname())
197+
.set(io.grpc.xds.XdsAttributes.ATTR_SERVER_WEIGHT, weight)
198+
.set(XdsInternalAttributes.ATTR_ADDRESS_NAME, endpoint.hostname())
199199
.build();
200200
EquivalentAddressGroup eag;
201201
if (config.isHttp11ProxyAvailable()) {

xds/src/main/java/io/grpc/internal/XdsCommonAttributes.java renamed to xds/src/main/java/io/grpc/xds/internal/XdsInternalAttributes.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17-
package io.grpc.internal;
17+
package io.grpc.xds.internal;
1818

1919
import io.grpc.Attributes;
2020
import io.grpc.EquivalentAddressGroup;
2121

22-
public final class XdsCommonAttributes {
22+
public final class XdsInternalAttributes {
2323
/** Name associated with individual address, if available (e.g., DNS name). */
2424
@EquivalentAddressGroup.Attr
2525
public static final Attributes.Key<String> ATTR_ADDRESS_NAME =

‎xds/src/main/java/io/grpc/xds/internal/security/SecurityProtocolNegotiators.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import io.grpc.Grpc;
2525
import io.grpc.internal.GrpcUtil;
2626
import io.grpc.internal.ObjectPool;
27-
import io.grpc.internal.XdsCommonAttributes;
27+
import io.grpc.xds.internal.XdsInternalAttributes;
2828
import io.grpc.netty.GrpcHttp2ConnectionHandler;
2929
import io.grpc.netty.InternalProtocolNegotiationEvent;
3030
import io.grpc.netty.InternalProtocolNegotiator;
@@ -150,7 +150,7 @@ public ChannelHandler newHandler(GrpcHttp2ConnectionHandler grpcHandler) {
150150
return fallbackProtocolNegotiator.newHandler(grpcHandler);
151151
}
152152
return new ClientSecurityHandler(grpcHandler, localSslContextProviderSupplier,
153-
grpcHandler.getEagAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME));
153+
grpcHandler.getEagAttributes().get(XdsInternalAttributes.ATTR_ADDRESS_NAME));
154154
}
155155

156156
@Override

‎xds/src/test/java/io/grpc/xds/ClusterImplLoadBalancerTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
import io.grpc.internal.ObjectPool;
5959
import io.grpc.internal.PickFirstLoadBalancerProvider;
6060
import io.grpc.internal.PickSubchannelArgsImpl;
61-
import io.grpc.internal.XdsCommonAttributes;
61+
import io.grpc.xds.internal.XdsInternalAttributes;
6262
import io.grpc.protobuf.ProtoUtils;
6363
import io.grpc.testing.TestMethodDescriptors;
6464
import io.grpc.util.GracefulSwitchLoadBalancer;
@@ -198,7 +198,7 @@ public void handleResolvedAddresses_propagateToChildPolicy() {
198198
FakeLoadBalancer childBalancer = Iterables.getOnlyElement(downstreamBalancers);
199199
assertThat(Iterables.getOnlyElement(childBalancer.addresses)).isEqualTo(endpoint);
200200
assertThat(childBalancer.config).isSameInstanceAs(weightedTargetConfig);
201-
assertThat(childBalancer.attributes.get(XdsAttributes.XDS_CLIENT_POOL))
201+
assertThat(childBalancer.attributes.get(io.grpc.xds.XdsAttributes.XDS_CLIENT_POOL))
202202
.isSameInstanceAs(xdsClientPool);
203203
assertThat(childBalancer.attributes.get(NameResolver.ATTR_BACKEND_SERVICE)).isEqualTo(CLUSTER);
204204
}
@@ -562,7 +562,7 @@ public void dropRpcsWithRespectToLbConfigDropCategories() {
562562
.setAddresses(Collections.singletonList(endpoint))
563563
.setAttributes(
564564
Attributes.newBuilder()
565-
.set(XdsAttributes.XDS_CLIENT_POOL, xdsClientPool)
565+
.set(io.grpc.xds.XdsAttributes.XDS_CLIENT_POOL, xdsClientPool)
566566
.build())
567567
.setLoadBalancingPolicyConfig(config)
568568
.build());
@@ -767,14 +767,14 @@ public void endpointAddressesAttachedWithClusterName() {
767767
.build();
768768
Subchannel subchannel = leafBalancer.helper.createSubchannel(args);
769769
for (EquivalentAddressGroup eag : subchannel.getAllAddresses()) {
770-
assertThat(eag.getAttributes().get(XdsAttributes.ATTR_CLUSTER_NAME))
770+
assertThat(eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_CLUSTER_NAME))
771771
.isEqualTo(CLUSTER);
772772
}
773773

774774
// An address update should also retain the cluster attribute.
775775
subchannel.updateAddresses(leafBalancer.addresses);
776776
for (EquivalentAddressGroup eag : subchannel.getAllAddresses()) {
777-
assertThat(eag.getAttributes().get(XdsAttributes.ATTR_CLUSTER_NAME))
777+
assertThat(eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_CLUSTER_NAME))
778778
.isEqualTo(CLUSTER);
779779
}
780780
}
@@ -812,10 +812,10 @@ public void endpointAddressesAttachedWithClusterName() {
812812
new FixedResultPicker(PickResult.withSubchannel(subchannel)));
813813
}
814814
});
815-
assertThat(subchannel.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isEqualTo(
815+
assertThat(subchannel.getAttributes().get(XdsInternalAttributes.ATTR_ADDRESS_NAME)).isEqualTo(
816816
"authority-host-name");
817817
for (EquivalentAddressGroup eag : subchannel.getAllAddresses()) {
818-
assertThat(eag.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME))
818+
assertThat(eag.getAttributes().get(XdsInternalAttributes.ATTR_ADDRESS_NAME))
819819
.isEqualTo("authority-host-name");
820820
}
821821

@@ -864,9 +864,9 @@ public void endpointAddressesAttachedWithClusterName() {
864864
}
865865
});
866866
// Sub Channel wrapper args won't have the address name although addresses will.
867-
assertThat(subchannel.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isNull();
867+
assertThat(subchannel.getAttributes().get(XdsInternalAttributes.ATTR_ADDRESS_NAME)).isNull();
868868
for (EquivalentAddressGroup eag : subchannel.getAllAddresses()) {
869-
assertThat(eag.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME))
869+
assertThat(eag.getAttributes().get(XdsInternalAttributes.ATTR_ADDRESS_NAME))
870870
.isEqualTo("authority-host-name");
871871
}
872872

@@ -959,8 +959,8 @@ private void deliverAddressesAndConfig(List<EquivalentAddressGroup> addresses,
959959
.setAddresses(addresses)
960960
.setAttributes(
961961
Attributes.newBuilder()
962-
.set(XdsAttributes.XDS_CLIENT_POOL, xdsClientPool)
963-
.set(XdsAttributes.CALL_COUNTER_PROVIDER, callCounterProvider)
962+
.set(io.grpc.xds.XdsAttributes.XDS_CLIENT_POOL, xdsClientPool)
963+
.set(io.grpc.xds.XdsAttributes.CALL_COUNTER_PROVIDER, callCounterProvider)
964964
.build())
965965
.setLoadBalancingPolicyConfig(config)
966966
.build());
@@ -1017,11 +1017,11 @@ public String toString() {
10171017
}
10181018

10191019
Attributes.Builder attributes = Attributes.newBuilder()
1020-
.set(XdsAttributes.ATTR_LOCALITY, locality)
1020+
.set(io.grpc.xds.XdsAttributes.ATTR_LOCALITY, locality)
10211021
// Unique but arbitrary string
10221022
.set(EquivalentAddressGroup.ATTR_LOCALITY_NAME, locality.toString());
10231023
if (authorityHostname != null) {
1024-
attributes.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, authorityHostname);
1024+
attributes.set(XdsInternalAttributes.ATTR_ADDRESS_NAME, authorityHostname);
10251025
}
10261026
EquivalentAddressGroup eag = new EquivalentAddressGroup(new FakeSocketAddress(name),
10271027
attributes.build());

‎xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
import io.grpc.inprocess.InProcessServerBuilder;
8383
import io.grpc.internal.FakeClock;
8484
import io.grpc.internal.GrpcUtil;
85-
import io.grpc.internal.XdsCommonAttributes;
85+
import io.grpc.xds.internal.XdsInternalAttributes;
8686
import io.grpc.testing.GrpcCleanupRule;
8787
import io.grpc.util.GracefulSwitchLoadBalancer;
8888
import io.grpc.util.GracefulSwitchLoadBalancerAccessor;
@@ -308,15 +308,15 @@ public void edsClustersWithRingHashEndpointLbPolicy() throws Exception {
308308
// LOCALITY1 are equally weighted.
309309
assertThat(addr1.getAddresses())
310310
.isEqualTo(Arrays.asList(newInetSocketAddress("127.0.0.1", 8080)));
311-
assertThat(addr1.getAttributes().get(XdsAttributes.ATTR_SERVER_WEIGHT))
311+
assertThat(addr1.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_SERVER_WEIGHT))
312312
.isEqualTo(10);
313313
assertThat(addr2.getAddresses())
314314
.isEqualTo(Arrays.asList(newInetSocketAddress("127.0.0.2", 8080)));
315-
assertThat(addr2.getAttributes().get(XdsAttributes.ATTR_SERVER_WEIGHT))
315+
assertThat(addr2.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_SERVER_WEIGHT))
316316
.isEqualTo(10);
317317
assertThat(addr3.getAddresses())
318318
.isEqualTo(Arrays.asList(newInetSocketAddress("127.0.1.1", 8080)));
319-
assertThat(addr3.getAttributes().get(XdsAttributes.ATTR_SERVER_WEIGHT))
319+
assertThat(addr3.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_SERVER_WEIGHT))
320320
.isEqualTo(50 * 60);
321321
assertThat(childBalancer.name).isEqualTo(PRIORITY_POLICY_NAME);
322322
PriorityLbConfig priorityLbConfig = (PriorityLbConfig) childBalancer.config;
@@ -383,7 +383,7 @@ public void edsClustersWithLeastRequestEndpointLbPolicy() {
383383

384384
assertThat(
385385
childBalancer.addresses.get(0).getAttributes()
386-
.get(XdsAttributes.ATTR_LOCALITY_WEIGHT)).isEqualTo(100);
386+
.get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY_WEIGHT)).isEqualTo(100);
387387
}
388388

389389
@Test
@@ -409,7 +409,7 @@ public void edsClustersEndpointHostname_addedToAddressAttribute() {
409409

410410
assertThat(
411411
childBalancer.addresses.get(0).getAttributes()
412-
.get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isEqualTo("hostname1");
412+
.get(XdsInternalAttributes.ATTR_ADDRESS_NAME)).isEqualTo("hostname1");
413413
}
414414

415415
@Test
@@ -581,12 +581,12 @@ public void onlyEdsClusters_receivedEndpoints() {
581581
io.grpc.xds.client.Locality locality2 = io.grpc.xds.client.Locality.create(
582582
LOCALITY2.getRegion(), LOCALITY2.getZone(), LOCALITY2.getSubZone());
583583
for (EquivalentAddressGroup eag : childBalancer.addresses) {
584-
io.grpc.xds.client.Locality locality = eag.getAttributes().get(XdsAttributes.ATTR_LOCALITY);
584+
io.grpc.xds.client.Locality locality = eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY);
585585
if (locality.equals(locality1)) {
586-
assertThat(eag.getAttributes().get(XdsAttributes.ATTR_LOCALITY_WEIGHT))
586+
assertThat(eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY_WEIGHT))
587587
.isEqualTo(70);
588588
} else if (locality.equals(locality2)) {
589-
assertThat(eag.getAttributes().get(XdsAttributes.ATTR_LOCALITY_WEIGHT))
589+
assertThat(eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY_WEIGHT))
590590
.isEqualTo(30);
591591
} else {
592592
throw new AssertionError("Unexpected locality region: " + locality.region());
@@ -814,7 +814,7 @@ public void handleEdsResource_ignoreLocalitiesWithNoHealthyEndpoints() {
814814
io.grpc.xds.client.Locality locality2 = io.grpc.xds.client.Locality.create(
815815
LOCALITY2.getRegion(), LOCALITY2.getZone(), LOCALITY2.getSubZone());
816816
for (EquivalentAddressGroup eag : childBalancer.addresses) {
817-
assertThat(eag.getAttributes().get(XdsAttributes.ATTR_LOCALITY)).isEqualTo(locality2);
817+
assertThat(eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY)).isEqualTo(locality2);
818818
}
819819
}
820820

@@ -898,7 +898,7 @@ public void onlyLogicalDnsCluster_endpointsResolved() {
898898
newInetSocketAddress("127.0.2.1", 9000), newInetSocketAddress("127.0.2.2", 9000)))),
899899
childBalancer.addresses);
900900
assertThat(childBalancer.addresses.get(0).getAttributes()
901-
.get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isEqualTo(DNS_HOST_NAME + ":9000");
901+
.get(XdsInternalAttributes.ATTR_ADDRESS_NAME)).isEqualTo(DNS_HOST_NAME + ":9000");
902902
}
903903

904904
@Test
@@ -1055,8 +1055,8 @@ private void startXdsDepManager(final CdsConfig cdsConfig, boolean forwardTime)
10551055
loadBalancer.acceptResolvedAddresses(ResolvedAddresses.newBuilder()
10561056
.setAddresses(Collections.emptyList())
10571057
.setAttributes(Attributes.newBuilder()
1058-
.set(XdsAttributes.XDS_CONFIG, xdsConfig.getValue())
1059-
.set(XdsAttributes.XDS_CLUSTER_SUBSCRIPT_REGISTRY, xdsDepManager)
1058+
.set(io.grpc.xds.XdsAttributes.XDS_CONFIG, xdsConfig.getValue())
1059+
.set(io.grpc.xds.XdsAttributes.XDS_CLUSTER_SUBSCRIPT_REGISTRY, xdsDepManager)
10601060
.build())
10611061
.setLoadBalancingPolicyConfig(cdsConfig)
10621062
.build());

‎xds/src/test/java/io/grpc/xds/XdsSecurityClientServerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
import io.grpc.Status;
5353
import io.grpc.StatusOr;
5454
import io.grpc.StatusRuntimeException;
55-
import io.grpc.internal.XdsCommonAttributes;
55+
import io.grpc.xds.internal.XdsInternalAttributes;
5656
import io.grpc.stub.StreamObserver;
5757
import io.grpc.testing.GrpcCleanupRule;
5858
import io.grpc.testing.protobuf.SimpleRequest;
@@ -842,7 +842,7 @@ private SimpleServiceGrpc.SimpleServiceBlockingStub getBlockingStub(
842842
upstreamTlsContext, tlsContextManagerForClient))
843843
: Attributes.newBuilder();
844844
if (addrNameAttribute != null) {
845-
sslContextAttributesBuilder.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, addrNameAttribute);
845+
sslContextAttributesBuilder.set(XdsInternalAttributes.ATTR_ADDRESS_NAME, addrNameAttribute);
846846
}
847847
sslContextAttributes = sslContextAttributesBuilder.build();
848848
fakeNameResolverFactory.setServers(

‎xds/src/test/java/io/grpc/xds/internal/security/SecurityProtocolNegotiatorsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import io.grpc.ChannelLogger.ChannelLogLevel;
4141
import io.grpc.internal.FakeClock;
4242
import io.grpc.internal.TestUtils.NoopChannelLogger;
43-
import io.grpc.internal.XdsCommonAttributes;
43+
import io.grpc.xds.internal.XdsInternalAttributes;
4444
import io.grpc.netty.GrpcHttp2ConnectionHandler;
4545
import io.grpc.netty.InternalProtocolNegotiationEvent;
4646
import io.grpc.netty.InternalProtocolNegotiator.ProtocolNegotiator;
@@ -168,7 +168,7 @@ public void clientSecurityProtocolNegotiator_autoHostSni_hostnamePassedToClientS
168168
Attributes.newBuilder()
169169
.set(SecurityProtocolNegotiators.ATTR_SSL_CONTEXT_PROVIDER_SUPPLIER,
170170
new SslContextProviderSupplier(upstreamTlsContext, mockTlsContextManager))
171-
.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, FAKE_AUTHORITY)
171+
.set(XdsInternalAttributes.ATTR_ADDRESS_NAME, FAKE_AUTHORITY)
172172
.build());
173173
ChannelHandler newHandler = pn.newHandler(mockHandler);
174174
assertThat(newHandler).isNotNull();

0 commit comments

Comments
 (0)