Automated cherry pick of #34247 (#34257)

Automatic Merge

server/channels/store/retrylayer/retrylayer.go

@@ -14138,11 +14138,11 @@ func (s *RetryLayerTokenStore) Cleanup(expiryTime int64) {
 
 }
 
-func (s *RetryLayerTokenStore) ConsumeOnce(tokenStr string) (*model.Token, error) {
+func (s *RetryLayerTokenStore) ConsumeOnce(tokenType string, tokenStr string) (*model.Token, error) {
 
 	tries := 0
 	for {
-		result, err := s.TokenStore.ConsumeOnce(tokenStr)
+		result, err := s.TokenStore.ConsumeOnce(tokenType, tokenStr)
 		if err == nil {
 			return result, nil
 		}