@@ -589,8 +589,10 @@ public Attributes filterTransport(Attributes attributes) {
589589 public void transportReady () {
590590 channelLogger .log (ChannelLogLevel .INFO , "READY" );
591591 subchannelMetrics .recordConnectionAttemptSucceeded (buildLabelSet (
592- addressIndex .getCurrentEagAttributes ().get (NameResolver .ATTR_BACKEND_SERVICE ),
593- addressIndex .getCurrentEagAttributes ().get (LoadBalancer .ATTR_LOCALITY_NAME ),
592+ getAttributeOrDefault (
593+ addressIndex .getCurrentEagAttributes (), NameResolver .ATTR_BACKEND_SERVICE ),
594+ getAttributeOrDefault (
595+ addressIndex .getCurrentEagAttributes (), LoadBalancer .ATTR_LOCALITY_NAME ),
594596 null ,
595597 extractSecurityLevel (
596598 addressIndex .getCurrentEagAttributes ().get (GrpcAttributes .ATTR_SECURITY_LEVEL ))
@@ -632,10 +634,10 @@ public void transportShutdown(final Status s) {
632634 ChannelLogLevel .INFO , "{0} SHUTDOWN with {1}" , transport .getLogId (), printShortStatus (s ));
633635 shutdownInitiated = true ;
634636 subchannelMetrics .recordConnectionAttemptFailed (buildLabelSet (
635- addressIndex .getCurrentEagAttributes (). get ( NameResolver .ATTR_BACKEND_SERVICE ),
636- addressIndex .getCurrentEagAttributes (). get ( LoadBalancer .ATTR_LOCALITY_NAME ),
637+ getAttributeOrDefault ( addressIndex .getCurrentEagAttributes (), NameResolver .ATTR_BACKEND_SERVICE ),
638+ getAttributeOrDefault ( addressIndex .getCurrentEagAttributes (), LoadBalancer .ATTR_LOCALITY_NAME ),
637639 null , null
638- ));
640+ ));
639641 syncContext .execute (new Runnable () {
640642 @ Override
641643 public void run () {
@@ -691,8 +693,10 @@ public void transportTerminated() {
691693 filter .transportTerminated (transport .getAttributes ());
692694 }
693695 subchannelMetrics .recordDisconnection (buildLabelSet (
694- addressIndex .getCurrentEagAttributes ().get (NameResolver .ATTR_BACKEND_SERVICE ),
695- addressIndex .getCurrentEagAttributes ().get (LoadBalancer .ATTR_LOCALITY_NAME ),
696+ getAttributeOrDefault (
697+ addressIndex .getCurrentEagAttributes (), NameResolver .ATTR_BACKEND_SERVICE ),
698+ getAttributeOrDefault (
699+ addressIndex .getCurrentEagAttributes (), LoadBalancer .ATTR_LOCALITY_NAME ),
696700 "Peer Pressure" ,
697701 extractSecurityLevel (
698702 addressIndex .getCurrentEagAttributes ().get (GrpcAttributes .ATTR_SECURITY_LEVEL ))
0 commit comments