wipwipwipwip

src/autoscaler/api/broker/broker.go

@@ -647,7 +647,7 @@ func (b *Broker) Unbind(ctx context.Context, instanceID string, bindingID string
 	result := domain.UnbindSpec{}
 	err := b.deleteBinding(ctx, bindingID, instanceID)
 	if err != nil {
-		logger.Error("unbind failed:", err)
+		logger.Error("unbind failed", err)
 		if errors.Is(err, ErrBindingDoesNotExist) {
 			return result, apiresponses.ErrBindingDoesNotExist
 		}

src/autoscaler/api/cmd/api/api_test.go

@@ -167,7 +167,7 @@ var _ = Describe("Api", func() {
 
 				bodyBytes, err := io.ReadAll(rsp.Body)
 
-				FailOnError("Read failed:", err)
+				FailOnError("Read failed", err)
 				if len(bodyBytes) == 0 {
 					Fail("body empty")
 				}

src/autoscaler/api/cmd/api/main.go

@@ -119,7 +119,7 @@ func main() {
 	publicApiHttpServer := createApiServer(conf, logger, policyDb, credentialProvider, checkBindingFunc, cfClient, httpStatusCollector, bindingDB)
 	healthServer, err := healthendpoint.NewServerWithBasicAuth(conf.Health, []healthendpoint.Checker{}, logger.Session("health-server"), promRegistry, time.Now)
 	if err != nil {
-		logger.Fatal("Failed to create health server:", err)
+		logger.Fatal("Failed to create health server", err)
 		os.Exit(1)
 	}
 	logger.Debug("Successfully created health server")

src/autoscaler/db/sqldb/policy_sqldb_test.go

@@ -59,7 +59,7 @@ var _ = Describe("PolicySQLDB", func() {
 			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 		pdb, err = NewPolicySQLDB(dbConfig, logger)
-		FailOnError("unable to connect policy-db: ", err)
+		FailOnError("unable to connect policy-db", err)
 		DeferCleanup(func() error {
 			if pdb != nil {
 				return pdb.Close()

src/autoscaler/db/sqldb/scalingengine_sqldb_test.go

@@ -56,7 +56,7 @@ var _ = Describe("ScalingEngineSqldb", func() {
 			ConnectionMaxIdleTime: 10 * time.Second,
 		}
 		sdb, err = NewScalingEngineSQLDB(dbConfig, logger)
-		FailOnError("Could not open db connection: ", err)
+		FailOnError("Could not open db connection", err)
 		DeferCleanup(func() error {
 			if sdb != nil {
 				return sdb.Close()

src/autoscaler/db/sqldb/sqldb_suite_test.go

@@ -39,7 +39,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	FailOnError("failed to parse database connection", err)
 
 	dbHelper, err = sqlx.Open(database.DriverName, database.DSN)
-	FailOnError("can not connect database: ", err)
+	FailOnError("can not connect database", err)
 
 	_, err = dbHelper.Exec("DELETE from binding")
 	FailOnError("can not clean table binding", err)
@@ -61,15 +61,15 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	lockTable = fmt.Sprintf("test_lock_%d", GinkgoParallelProcess())
 	dbUrl := GetDbUrl()
 	database, err := db.GetConnection(dbUrl)
-	FailOnError("failed to parse database connection: ", err)
+	FailOnError("failed to parse database connection", err)
 
 	dbHelper, e = sqlx.Open(database.DriverName, database.DSN)
 	if e != nil {
 		Fail("can not connect database: " + e.Error())
 	}
 
 	err = createLockTable()
-	FailOnError("can not create test lock table: ", err)
+	FailOnError("can not create test lock table", err)
 
 })
 
@@ -89,16 +89,16 @@ var _ = SynchronizedAfterSuite(func() {
 
 func cleanInstanceMetricsTableForApp(appId string) {
 	_, e := dbHelper.Exec(dbHelper.Rebind("DELETE FROM appinstancemetrics where appid=?"), appId)
-	FailOnError("can not clean table appinstancemetrics:", e)
+	FailOnError("can not clean table appinstancemetrics", e)
 }
 
 func hasInstanceMetric(appId string, index int, name string, timestamp int64) bool {
 	query := dbHelper.Rebind("SELECT * FROM appinstancemetrics WHERE appid = ? AND instanceindex = ? AND name = ? AND timestamp = ?")
 	rows, e := dbHelper.Query(query, appId, index, name, timestamp)
-	FailOnError("can not query table appinstancemetrics: ", e)
+	FailOnError("can not query table appinstancemetrics", e)
 	defer func() { _ = rows.Close() }()
 	item := rows.Next()
-	FailOnError("can not query table appinstancemetrics: ", rows.Err())
+	FailOnError("can not query table appinstancemetrics", rows.Err())
 	return item
 }
 
@@ -114,30 +114,30 @@ func getNumberOfInstanceMetricsForApp(appId string) int {
 func hasServiceInstance(serviceInstanceId string) bool {
 	query := dbHelper.Rebind("SELECT * FROM service_instance WHERE service_instance_id = ?")
 	rows, e := dbHelper.Query(query, serviceInstanceId)
-	FailOnError("can not query table service_instance: ", e)
+	FailOnError("can not query table service_instance", e)
 	defer func() { _ = rows.Close() }()
 	item := rows.Next()
-	FailOnError("can not query table appinstancemetrics: ", rows.Err())
+	FailOnError("can not query table appinstancemetrics", rows.Err())
 	return item
 }
 
 func hasServiceInstanceWithNullDefaultPolicy(serviceInstanceId string) bool {
 	query := dbHelper.Rebind("SELECT * FROM service_instance WHERE service_instance_id = ? AND default_policy IS NULL AND default_policy_guid IS NULL")
 	rows, e := dbHelper.Query(query, serviceInstanceId)
-	FailOnError("can not query table service_instance: ", e)
+	FailOnError("can not query table service_instance", e)
 	defer func() { _ = rows.Close() }()
 	item := rows.Next()
-	FailOnError("can not query table appinstancemetrics: ", rows.Err())
+	FailOnError("can not query table appinstancemetrics", rows.Err())
 	return item
 }
 
 func hasServiceBinding(bindingId string, serviceInstanceId string) bool {
 	query := dbHelper.Rebind("SELECT * FROM binding WHERE binding_id = ? AND service_instance_id = ? ")
 	rows, e := dbHelper.Query(query, bindingId, serviceInstanceId)
-	FailOnError("can not query table binding: ", e)
+	FailOnError("can not query table binding", e)
 	defer func() { _ = rows.Close() }()
 	item := rows.Next()
-	FailOnError("can not query table binding: ", rows.Err())
+	FailOnError("can not query table binding", rows.Err())
 	return item
 }
 
@@ -210,34 +210,34 @@ func getNumberOfMetricsForApp(appId string) int {
 	var num int
 	query := dbHelper.Rebind("SELECT COUNT(*) FROM app_metric where app_id = ?")
 	err := dbHelper.QueryRow(query, appId).Scan(&num)
-	FailOnError("can not count the number of records in table app_metric: ", err)
+	FailOnError("can not count the number of records in table app_metric", err)
 	return num
 }
 
 func removeScalingHistoryForApp(appId string) {
 	query := dbHelper.Rebind("DELETE from scalinghistory where appId = ?")
 	_, err := dbHelper.Exec(query, appId)
-	FailOnError("can not clean table scalinghistory: ", err)
+	FailOnError("can not clean table scalinghistory", err)
 }
 
 func removeCooldownForApp(appId string) {
 	query := dbHelper.Rebind("DELETE from scalingcooldown where appId = ?")
 	_, err := dbHelper.Exec(query, appId)
-	FailOnError("can not clean table scalingcooldown: ", err)
+	FailOnError("can not clean table scalingcooldown", err)
 }
 func removeActiveScheduleForApp(appId string) {
 	query := dbHelper.Rebind("DELETE from activeschedule where appId = ?")
 	_, err := dbHelper.Exec(query, appId)
-	FailOnError("can not clean table scalingcooldown: ", err)
+	FailOnError("can not clean table scalingcooldown", err)
 }
 
 func hasScalingHistory(appId string, timestamp int64) bool {
 	query := dbHelper.Rebind("SELECT * FROM scalinghistory WHERE appid = ? AND timestamp = ?")
 	rows, e := dbHelper.Query(query, appId, timestamp)
-	FailOnError("can not query table scalinghistory: ", e)
+	FailOnError("can not query table scalinghistory", e)
 	defer func() { _ = rows.Close() }()
 	next := rows.Next()
-	FailOnError("can not query table scalinghistory: ", rows.Err())
+	FailOnError("can not query table scalinghistory", rows.Err())
 	return next
 }
 
@@ -246,17 +246,17 @@ func getScalingHistoryForApp(appId string) int {
 	query := dbHelper.Rebind("SELECT COUNT(*) FROM scalinghistory WHERE appid = ?")
 	row := dbHelper.QueryRow(query, appId)
 	err := row.Scan(&num)
-	FailOnError("can not count the number of records in table scalinghistory: ", err)
+	FailOnError("can not count the number of records in table scalinghistory", err)
 	return num
 }
 
 func hasScalingCooldownRecord(appId string, expireAt int64) bool {
 	query := dbHelper.Rebind("SELECT * FROM scalingcooldown WHERE appid = ? AND expireat = ?")
 	rows, e := dbHelper.Query(query, appId, expireAt)
-	FailOnError("can not query table scalingcooldown: ", e)
+	FailOnError("can not query table scalingcooldown", e)
 	defer func() { _ = rows.Close() }()
 	item := rows.Next()
-	FailOnError("can not query table scalingcooldown:", rows.Err())
+	FailOnError("can not query table scalingcooldown", rows.Err())
 	return item
 }
 
@@ -309,7 +309,7 @@ func getCredential(appId string) (string, string, error) {
 func hasCredential(appId string) bool {
 	query := dbHelper.Rebind("SELECT * FROM credentials WHERE id=?")
 	rows, e := dbHelper.Query(query, appId)
-	FailOnError("can not query table credentials: ", e)
+	FailOnError("can not query table credentials", e)
 	defer func() { _ = rows.Close() }()
 	item := rows.Next()
 	FailOnError("hasCredential failed", rows.Err())

src/autoscaler/envelopeprocessor/envelope_processor.go

@@ -41,12 +41,12 @@ func NewProcessor(logger lager.Logger, collectionInterval time.Duration) Process
 func (p Processor) GetGaugeMetrics(envelopes []*loggregator_v2.Envelope, currentTimeStamp int64) ([]models.AppInstanceMetric, error) {
 	p.logger.Debug("GetGaugeMetrics")
 	compactedEnvelopes := p.CompactEnvelopes(envelopes)
-	p.logger.Debug("Compacted envelopes:", lager.Data{"compactedEnvelopes": compactedEnvelopes})
+	p.logger.Debug("Compacted envelopes", lager.Data{"compactedEnvelopes": compactedEnvelopes})
 	return GetGaugeInstanceMetrics(compactedEnvelopes, currentTimeStamp)
 }
 func (p Processor) GetTimerMetrics(envelopes []*loggregator_v2.Envelope, appID string, currentTimestamp int64) []models.AppInstanceMetric {
 	p.logger.Debug("GetTimerMetrics")
-	p.logger.Debug("Compacted envelopes:", lager.Data{"Envelopes": envelopes})
+	p.logger.Debug("Compacted envelopes", lager.Data{"Envelopes": envelopes})
 	return GetHttpStartStopInstanceMetrics(envelopes, appID, currentTimestamp, p.collectionInterval)
 }
 
@@ -192,13 +192,12 @@ func calcNumReqs(envelopes []*loggregator_v2.Envelope) (numRequestsPerAppIdx map
 }
 
 func isContainerMetricEnvelope(e *loggregator_v2.Envelope) bool {
-	// TODO: Check for all container metrics not only memory quota
 	keys := maps.Keys(e.GetGauge().GetMetrics())
 
 	var matchingKeys []string
 
 	for i := range keys {
-		if keys[i] == "memory_quota" || keys[i] == "memory" {
+		if keys[i] == "memory_quota" || keys[i] == "memory" || keys[i] == "cpu" || keys[i] == "cpu_entitlement" {
 			matchingKeys = append(matchingKeys, keys[i])
 		}
 	}