From 8d0366e90a964ed274bb1ec24a4c89f706235140 Mon Sep 17 00:00:00 2001
From: Yue Fei <yufei@microsoft.com>
Date: Mon, 12 Dec 2022 20:48:20 +0800
Subject: [PATCH] use approximate queue length

---
 pkg/scalers/azure/azure_queue.go | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/pkg/scalers/azure/azure_queue.go b/pkg/scalers/azure/azure_queue.go
index e1224e29039..0a4f27a0e09 100644
--- a/pkg/scalers/azure/azure_queue.go
+++ b/pkg/scalers/azure/azure_queue.go
@@ -25,11 +25,7 @@ import (
 	"github.com/kedacore/keda/v2/pkg/util"
 )
 
-const (
-	maxPeekMessages int32 = 32
-)
-
-// GetAzureQueueLength returns the length of a queue in int
+// GetAzureQueueLength returns the length of a queue in int, see https://learn.microsoft.com/en-us/azure/storage/queues/storage-dotnet-how-to-use-queues?tabs=dotnet#get-the-queue-length
 func GetAzureQueueLength(ctx context.Context, httpClient util.HTTPDoer, podIdentity kedav1alpha1.AuthPodIdentity, connectionString, queueName, accountName, endpointSuffix string) (int64, error) {
 	credential, endpoint, err := ParseAzureStorageQueueConnection(ctx, httpClient, podIdentity, connectionString, accountName, endpointSuffix)
 	if err != nil {
@@ -40,16 +36,6 @@ func GetAzureQueueLength(ctx context.Context, httpClient util.HTTPDoer, podIdent
 	serviceURL := azqueue.NewServiceURL(*endpoint, p)
 	queueURL := serviceURL.NewQueueURL(queueName)
 
-	visibleMessageCount, err := getVisibleCount(ctx, &queueURL, maxPeekMessages)
-	if err != nil {
-		return -1, err
-	}
-
-	// Queue has less messages than we allowed to peek for, so no need to get the approximation
-	if visibleMessageCount < int64(maxPeekMessages) {
-		return visibleMessageCount, nil
-	}
-
 	props, err := queueURL.GetProperties(ctx)
 	if err != nil {
 		return -1, err
@@ -57,13 +43,3 @@ func GetAzureQueueLength(ctx context.Context, httpClient util.HTTPDoer, podIdent
 
 	return int64(props.ApproximateMessagesCount()), nil
 }
-
-func getVisibleCount(ctx context.Context, queueURL *azqueue.QueueURL, maxCount int32) (int64, error) {
-	messagesURL := queueURL.NewMessagesURL()
-	queue, err := messagesURL.Peek(ctx, maxCount)
-	if err != nil {
-		return 0, err
-	}
-	num := queue.NumMessages()
-	return int64(num), nil
-}