main sync develop

Author: vikramdevtron

chart-sync/vendor/github.com/devtron-labs/common-lib/constants/constants.go

@@ -34,6 +34,7 @@ const (
 	Kubelink     ServiceName = "KUBELINK"
 	GitSensor    ServiceName = "GITSENSOR"
 	Kubewatch    ServiceName = "KUBEWATCH"
+	ImageScanner ServiceName = "IMAGE_SCANNER"
 )
 
 // metrics name constants

chart-sync/vendor/github.com/devtron-labs/common-lib/utils/SqlUtil.go

@@ -85,31 +85,31 @@ func ExecutePGQueryProcessor(cfg bean.PgQueryMonitoringConfig, event bean.PgQuer
 		} else {
 			status = SUCCESS
 		}
-		PgQueryDuration.WithLabelValues(status, cfg.ServiceName, event.FuncName, getErrorType(pgError).String()).Observe(queryDuration.Seconds())
+		PgQueryDuration.WithLabelValues(status, cfg.ServiceName, getErrorType(pgError).String()).Observe(queryDuration.Seconds())
 	}
 
 	// Log pg query if enabled
 	logThresholdQueries := cfg.LogSlowQuery && queryDuration.Milliseconds() > cfg.QueryDurationThreshold
 	logNetworkFailure := queryError && cfg.LogAllFailureQueries && isNetworkError(pgError)
 	if logNetworkFailure {
-		log.Println(fmt.Sprintf("%s - query time", PgNetworkErrorLogPrefix), "duration", queryDuration.Seconds(), "query", event.Query, "pgError", pgError)
+		log.Println(fmt.Sprintf("%s - query time", PgNetworkErrorLogPrefix), "duration", queryDuration.Seconds(), "functionName", event.FuncName, "query", event.Query, "pgError", pgError)
 	}
 	logFailureQuery := queryError && cfg.LogAllFailureQueries && !isNetworkError(pgError)
 	if logFailureQuery {
-		log.Println(fmt.Sprintf("%s - query time", PgQueryFailLogPrefix), "duration", queryDuration.Seconds(), "query", event.Query, "pgError", pgError)
+		log.Println(fmt.Sprintf("%s - query time", PgQueryFailLogPrefix), "duration", queryDuration.Seconds(), "functionName", event.FuncName, "query", event.Query, "pgError", pgError)
 	}
 	if logThresholdQueries {
-		log.Println(fmt.Sprintf("%s - query time", PgQuerySlowLogPrefix), "duration", queryDuration.Seconds(), "query", event.Query)
+		log.Println(fmt.Sprintf("%s - query time", PgQuerySlowLogPrefix), "duration", queryDuration.Seconds(), "functionName", event.FuncName, "query", event.Query)
 	}
 	if cfg.LogAllQuery {
-		log.Println("query time", "duration", queryDuration.Seconds(), "query", event.Query)
+		log.Println("query time", "duration", queryDuration.Seconds(), "functionName", event.FuncName, "query", event.Query)
 	}
 }
 
 var PgQueryDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{
 	Name: "pg_query_duration_seconds",
 	Help: "Duration of PG queries",
-}, []string{"status", "serviceName", "functionName", "errorType"})
+}, []string{"status", "serviceName", "errorType"})
 
 func getErrorType(err error) ErrorType {
 	if err == nil {

ci-runner/vendor/github.com/devtron-labs/common-lib/constants/constants.go

@@ -23,6 +23,7 @@ import (
 	"github.com/devtron-labs/common-lib/monitoring"
 	client "github.com/devtron-labs/common-lib/pubsub-lib"
 	"github.com/devtron-labs/image-scanner/api"
+	"github.com/devtron-labs/image-scanner/pkg/asyncProvider"
 	"github.com/devtron-labs/image-scanner/pkg/clairService"
 	"github.com/devtron-labs/image-scanner/pkg/grafeasService"
 	"github.com/devtron-labs/image-scanner/pkg/klarService"
@@ -38,6 +39,7 @@ import (
 
 func InitializeApp() (*App, error) {
 	wire.Build(
+		asyncProvider.AsyncWireSet,
 		NewApp,
 		api.NewRouter,
 		logger.NewSugardLogger,

ci-runner/vendor/github.com/devtron-labs/common-lib/utils/SqlUtil.go

@@ -1,9 +1,10 @@
-# IMAGESCANER CONFIGMAP 
+# IMAGESCANER CONFIGMAP
 
 
 | Variable Name       | Value                                  | Description                   |
 |---------------------|----------------------------------------|-------------------------------|
 | CLAIR_ADDR          | clair-dcd.devtroncd:6060               | For connecting to Clair if it's enabled |
+| ENABLE_PROGRESSING_SCAN_CHECK | "true"                                | Flag to enable/disable checking for progressing scans at startup (set to "false" to improve startup performance) |
 | CLIENT_ID           | client-2                               | Client ID                        |
 | NATS_SERVER_HOST    | nats://devtron-nats.devtroncd:4222    | For connecting to NATS         |
 | PG_LOG_QUERY        | "false"                                | PostgreSQL Query Logging (false to disable) |