Change metric name when using regex.

Signed-off-by: Vighnesh Shenoy <vshenoy@microsoft.com>
kedacore · Aug 29, 2022 · be62ef9 · be62ef9
1 parent 7c7f3b3
commit be62ef9
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/pkg/scalers/azure_servicebus_scaler.go b/pkg/scalers/azure_servicebus_scaler.go
@@ -69,7 +69,7 @@ type azureServiceBusMetadata struct {
 	namespace              string
 	endpointSuffix         string
 	useRegex               bool
-	regexPattern           *regexp.Regexp
+	entityNameRegex        *regexp.Regexp
 	operation              string
 	scalerIndex            int
 }
@@ -156,13 +156,13 @@ func parseAzureServiceBusMetadata(config *ScalerConfig, logger logr.Logger) (*az
 		}
 
 		if meta.useRegex {
-			regexPattern, err := regexp.Compile(meta.queueName)
+			entityNameRegex, err := regexp.Compile(meta.queueName)
 			if err != nil {
 				return nil, fmt.Errorf("queueName is not a valid regular expression")
 			}
-			regexPattern.Longest()
+			entityNameRegex.Longest()
 
-			meta.regexPattern = regexPattern
+			meta.entityNameRegex = entityNameRegex
 		}
 	}
 
@@ -180,13 +180,13 @@ func parseAzureServiceBusMetadata(config *ScalerConfig, logger logr.Logger) (*az
 		}
 
 		if meta.useRegex {
-			regexPattern, err := regexp.Compile(meta.subscriptionName)
+			entityNameRegex, err := regexp.Compile(meta.subscriptionName)
 			if err != nil {
 				return nil, fmt.Errorf("subscriptionName is not a valid regular expression")
 			}
-			regexPattern.Longest()
+			entityNameRegex.Longest()
 
-			meta.regexPattern = regexPattern
+			meta.entityNameRegex = entityNameRegex
 		}
 	}
 
@@ -249,14 +249,19 @@ func (s *azureServiceBusScaler) Close(context.Context) error {
 // Returns the metric spec to be used by the HPA
 func (s *azureServiceBusScaler) GetMetricSpecForScaling(context.Context) []v2beta2.MetricSpec {
 	metricName := ""
-	if s.metadata.entityType == queue {
-		metricName = s.metadata.queueName
-	} else {
-		metricName = s.metadata.topicName
-	}
 
 	if s.metadata.useRegex {
-		metricName = regexp.QuoteMeta(s.metadata.regexPattern.String())
+		if s.metadata.entityType == queue {
+			metricName = "queueWithRegex"
+		} else {
+			metricName = "subscriptionWithRegex"
+		}
+	} else {
+		if s.metadata.entityType == queue {
+			metricName = s.metadata.queueName
+		} else {
+			metricName = s.metadata.topicName
+		}
 	}
 
 	externalMetric := &v2beta2.ExternalMetricSource{
@@ -369,7 +374,7 @@ func getQueueMessageCount(ctx context.Context, ns *servicebus.Namespace, meta *a
 
 		values := make([]int64, 0)
 		for _, entity := range entities {
-			if meta.regexPattern.FindString(entity.Name) == entity.Name {
+			if meta.entityNameRegex.FindString(entity.Name) == entity.Name {
 				activeMessageCount := int64(*entity.CountDetails.ActiveMessageCount)
 				values = append(values, activeMessageCount)
 			}
@@ -402,7 +407,7 @@ func getSubscriptionMessageCount(ctx context.Context, ns *servicebus.Namespace,
 
 		values := make([]int64, 0)
 		for _, entity := range entities {
-			if meta.regexPattern.FindString(entity.Name) == entity.Name {
+			if meta.entityNameRegex.FindString(entity.Name) == entity.Name {
 				activeMessageCount := int64(*entity.CountDetails.ActiveMessageCount)
 				values = append(values, activeMessageCount)
 			}