[usage] Round

Author: easyCZ

components/usage/pkg/controller/reconciler.go

@@ -131,7 +131,7 @@ func (u *UsageReconciler) ReconcileTimeRange(ctx context.Context, from, to time.
 func generateUsageReport(teams []teamWithWorkspaces, maxStopTime time.Time) ([]TeamUsage, error) {
 	var report []TeamUsage
 	for _, team := range teams {
-		var teamTotalRuntime float64
+		var teamTotalRuntime int64
 		for _, workspace := range team.Workspaces {
 			for _, instance := range workspace.Instances {
 				teamTotalRuntime += instance.WorkspaceRuntimeSeconds(maxStopTime)
@@ -312,6 +312,6 @@ func toSet(items []string) []string {
 }
 
 type TeamUsage struct {
-	TeamID           string  `json:"team_id"`
-	WorkspaceSeconds float64 `json:"workspace_seconds"`
+	TeamID           string `json:"team_id"`
+	WorkspaceSeconds int64  `json:"workspace_seconds"`
 }

components/usage/pkg/controller/reconciler_test.go

@@ -138,7 +138,7 @@ func TestUsageReconciler_ReconcileTimeRange(t *testing.T) {
 					Report: []TeamUsage{
 						{
 							TeamID:           teamID.String(),
-							WorkspaceSeconds: 9.223372036854766e+11,
+							WorkspaceSeconds: instances[0].WorkspaceRuntimeSeconds(runTime) * 100,
 						},
 					},
 				},

components/usage/pkg/db/workspace_instance.go

@@ -44,14 +44,14 @@ type WorkspaceInstance struct {
 
 // WorkspaceRuntimeSeconds computes how long this WorkspaceInstance has been running.
 // If the instance is still running (no stop time set), maxStopTime is used to to compute the duration - this is an upper bound on stop
-func (i *WorkspaceInstance) WorkspaceRuntimeSeconds(maxStopTime time.Time) float64 {
+func (i *WorkspaceInstance) WorkspaceRuntimeSeconds(maxStopTime time.Time) int64 {
 	start := i.StartedTime.Time()
 	stop := maxStopTime
 	if i.StoppedTime.IsSet() {
 		stop = i.StoppedTime.Time()
 	}
 
-	return stop.Sub(start).Seconds()
+	return int64(stop.Sub(start).Round(time.Second).Seconds())
 }
 
 // TableName sets the insert table name for this struct type