lint fixes

Author: elieserr

operator/metrics/metricscollector.go

@@ -1,9 +1,10 @@
 package metrics
 
 import (
-	"github.com/kedacore/http-add-on/operator/controllers/http/config"
 	"go.opentelemetry.io/otel/exporters/prometheus"
 	ctrlmetrics "sigs.k8s.io/controller-runtime/pkg/metrics"
+
+	"github.com/kedacore/http-add-on/operator/controllers/http/config"
 )
 
 var (

operator/metrics/otelmetrics.go

@@ -5,7 +5,6 @@ import (
 	"log"
 	"os"
 
-	"github.com/kedacore/http-add-on/pkg/build"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
@@ -14,6 +13,8 @@ import (
 	"go.opentelemetry.io/otel/sdk/resource"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
+
+	"github.com/kedacore/http-add-on/pkg/build"
 )
 
 var otLog = logf.Log.WithName("otel_collector")
@@ -24,7 +25,6 @@ type OtelMetrics struct {
 }
 
 func NewOtelMetrics(options ...metric.Option) *OtelMetrics {
-
 	if options == nil {
 		protocol := os.Getenv("OTEL_EXPORTER_OTLP_PROTOCOL")
 

operator/metrics/prommetrics.go

@@ -4,13 +4,14 @@ import (
 	"context"
 	"log"
 
-	"github.com/kedacore/http-add-on/pkg/build"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/prometheus"
 	api "go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/sdk/metric"
 	"go.opentelemetry.io/otel/sdk/resource"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
+
+	"github.com/kedacore/http-add-on/pkg/build"
 )
 
 type PrometheusMetrics struct {

tests/checks/operator_otel_metrics/operator_otel_metrics_test.go

@@ -188,12 +188,14 @@ func TestMetricGeneration(t *testing.T) {
 	httpSacaledObjectCount := getMetricsValue(val)
 	assert.GreaterOrEqual(t, httpSacaledObjectCount, float64(1))
 
-	//Set the operator to comunicate over GRPC and test functionality
+	// Set the operator to comunicate over GRPC and test functionality
 	changeOtlpProtocolInOperator(t, kc, "keda-add-ons-http-operator", "keda")
 	CreateManyHttpScaledObjecs(t, 10)
 	time.Sleep(time.Second * 10)
 	family = fetchAndParsePrometheusMetrics(t, fmt.Sprintf("curl --insecure %s", otelCollectorPromURL))
 	val, ok = family["keda_http_scaled_object_total"]
+	assert.True(t, ok, "keda_http_scaled_object_total is available")
+
 	httpSacaledObjectCountGrpc := getMetricsValue(val)
 	assert.GreaterOrEqual(t, httpSacaledObjectCountGrpc, float64(10))
 
@@ -202,6 +204,8 @@ func TestMetricGeneration(t *testing.T) {
 	// Fetch metrics and validate them after deleting httpscaledobjects
 	family = fetchAndParsePrometheusMetrics(t, fmt.Sprintf("curl --insecure %s", otelCollectorPromURL))
 	val, ok = family["keda_http_scaled_object_total"]
+	assert.True(t, ok, "keda_http_scaled_object_total is available")
+
 	httpSacaledObjectCountAfterCleanUp := getMetricsValue(val)
 	assert.Equal(t, float64(1), httpSacaledObjectCountAfterCleanUp)
 

tests/checks/operator_prometheus_metrics/operator_prometheus_metrics_test.go

@@ -181,6 +181,7 @@ func TestMetricGeneration(t *testing.T) {
 	// Fetch metrics and validate them after deleting httpscaledobjects
 	family = fetchAndParsePrometheusMetrics(t, fmt.Sprintf("curl --insecure %s", kedaOperatorPrometheusURL))
 	val, ok = family["keda_http_scaled_object_total"]
+	assert.True(t, ok, "keda_http_scaled_object_total is available")
 	httpSacaledObjectCountAfterCleanUp := getMetricsValue(val)
 	assert.Equal(t, float64(1), httpSacaledObjectCountAfterCleanUp)
 
@@ -213,7 +214,6 @@ func fetchAndParsePrometheusMetrics(t *testing.T, cmd string) map[string]*prommo
 
 func getMetricsValue(val *prommodel.MetricFamily) float64 {
 	if val.GetName() == "keda_http_scaled_object_total" {
-
 		metrics := val.GetMetric()
 		for _, metric := range metrics {
 			labels := metric.GetLabel()
@@ -270,12 +270,10 @@ func CreateManyHttpScaledObjecs(t *testing.T, objectsCount int) {
 		httpScaledObjecData, httpScaledObjecDataTemplates := getTemplateHTTPScaledObjecData(fmt.Sprintf("%d", i))
 		KubectlApplyMultipleWithTemplate(t, httpScaledObjecData, httpScaledObjecDataTemplates)
 	}
-
 }
 func DeleteManyHttpScaledObjecs(t *testing.T, objectsCount int) {
 	for i := 0; i < objectsCount; i++ {
 		httpScaledObjecData, httpScaledObjecDataTemplates := getTemplateHTTPScaledObjecData(fmt.Sprintf("%d", i))
 		KubectlDeleteMultipleWithTemplate(t, httpScaledObjecData, httpScaledObjecDataTemplates)
 	}
-
 }