May 30, 2023 · May 23, 2023 · May 23, 2023 · May 23, 2023 · May 23, 2023 · May 23, 2023
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/system.go b/coderd/database/dbauthz/system.go
 }

 // Only used by metrics cache.
 func (q *querier) GetTemplateDAUs(ctx context.Context,templateID uuid.UUID) ([]database.GetTemplateDAUsRow, error) {
 func (q *querier) GetTemplateDAUs(ctx context.Context,arg database.GetTemplateDAUsParams) ([]database.GetTemplateDAUsRow, error) {
 if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
 return nil, err
 }
 return q.db.GetTemplateDAUs(ctx,templateID)
 return q.db.GetTemplateDAUs(ctx,arg)
 }

 // Only used by metrics cache.
 func (q *querier) GetDeploymentDAUs(ctx context.Context) ([]database.GetDeploymentDAUsRow, error) {
 func (q *querier) GetDeploymentDAUs(ctx context.Context, tzOffset int32) ([]database.GetDeploymentDAUsRow, error) {
 if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
 return nil, err
 }
 return q.db.GetDeploymentDAUs(ctx)
 return q.db.GetDeploymentDAUs(ctx, tzOffset)
 }

 // UpdateWorkspaceBuildCostByID is used by the provisioning system to update the cost of a workspace build.
diff --git a/coderd/database/dbfake/databasefake.go b/coderd/database/dbfake/databasefake.go
 return stat, nil
 }

 func (q *fakeQuerier) GetTemplateDAUs(_ context.Context,templateID uuid.UUID) ([]database.GetTemplateDAUsRow, error) {
 func (q *fakeQuerier) GetTemplateDAUs(_ context.Context,arg database.GetTemplateDAUsParams) ([]database.GetTemplateDAUsRow, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()

 seens := make(map[time.Time]map[uuid.UUID]struct{})

 for _, as := range q.workspaceAgentStats {
 if as.TemplateID !=templateID {
 if as.TemplateID !=arg.TemplateID {
 continue
 }
 if as.ConnectionCount == 0 {
 continue
 }

 date := as.CreatedAt.Truncate(time.Hour * 24)
 date := as.CreatedAt.UTC().Add(time.Duration(arg.TzOffset) * time.Hour).Truncate(time.Hour * 24)

 dateEntry := seens[date]
 if dateEntry == nil {
 return rs, nil
 }

 func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context) ([]database.GetDeploymentDAUsRow, error) {
 func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context, tzOffset int32) ([]database.GetDeploymentDAUsRow, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()

 if as.ConnectionCount == 0 {
 continue
 }
 date := as.CreatedAt.Truncate(time.Hour * 24)
 date := as.CreatedAt.UTC().Add(time.Duration(tzOffset) * time.Hour).Truncate(time.Hour * 24)

 dateEntry := seens[date]
 if dateEntry == nil {
diff --git a/coderd/database/dbmock/store.go b/coderd/database/dbmock/store.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceagentstats.sql b/coderd/database/queries/workspaceagentstats.sql

 -- name: GetTemplateDAUs :many
 SELECT
 (created_at at TIME ZONE'UTC')::date as date,
 (created_at at TIME ZONEcast(@tz_offset::integer as text))::date as date,
 user_id
 FROM
 workspace_agent_stats

 -- name: GetDeploymentDAUs :many
 SELECT
 (created_at at TIME ZONE'UTC')::date as date,
 (created_at at TIME ZONEcast(@tz_offset::integer as text))::date as date,
 user_id
 FROM
 workspace_agent_stats
diff --git a/coderd/insights.go b/coderd/insights.go
 // @Security CoderSessionToken
 // @Produce json
 // @Tags Insights
 // @Success 200 {object} codersdk.DeploymentDAUsResponse
 // @Success 200 {object} codersdk.DAUsResponse
 // @Router /insights/daus [get]
 func (api *API) deploymentDAUs(rw http.ResponseWriter, r *http.Request) {
 ctx := r.Context()
 return
 }

 resp, _ := api.metricsCache.DeploymentDAUs()
 vals := r.URL.Query()
 p := httpapi.NewQueryParamParser()
 tzOffset := p.Int(vals, 0, "tz_offset")
 p.ErrorExcessParams(vals)
 if len(p.Errors) > 0 {
 httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 Message:     "Query parameters have invalid values.",
 Validations: p.Errors,
 })
 return
 }

 _, resp, _ := api.metricsCache.DeploymentDAUs(tzOffset)
 if resp == nil || resp.Entries == nil {
 httpapi.Write(ctx, rw, http.StatusOK, &codersdk.DeploymentDAUsResponse{
 httpapi.Write(ctx, rw, http.StatusOK, &codersdk.DAUsResponse{
 Entries: []codersdk.DAUEntry{},
 })
 return
Original file line number	Diff line number	Diff line change
Expand Up		@@ -205,19 +205,19 @@ func (q *querier) GetTemplateAverageBuildTime(ctx context.Context, arg database.
		}

		// Only used by metrics cache.
		func (q *querier) GetTemplateDAUs(ctx context.Context,templateID uuid.UUID) ([]database.GetTemplateDAUsRow, error) {
		func (q *querier) GetTemplateDAUs(ctx context.Context,arg database.GetTemplateDAUsParams) ([]database.GetTemplateDAUsRow, error) {
		if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
		return nil, err
		}
		return q.db.GetTemplateDAUs(ctx,templateID)
		return q.db.GetTemplateDAUs(ctx,arg)
		}

		// Only used by metrics cache.
		func (q *querier) GetDeploymentDAUs(ctx context.Context) ([]database.GetDeploymentDAUsRow, error) {
		func (q *querier) GetDeploymentDAUs(ctx context.Context, tzOffset int32) ([]database.GetDeploymentDAUsRow, error) {
		if err := q.authorizeContext(ctx, rbac.ActionRead, rbac.ResourceSystem); err != nil {
		return nil, err
		}
		return q.db.GetDeploymentDAUs(ctx)
		return q.db.GetDeploymentDAUs(ctx, tzOffset)
		}

		// UpdateWorkspaceBuildCostByID is used by the provisioning system to update the cost of a workspace build.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -434,21 +434,21 @@ func (q *fakeQuerier) InsertWorkspaceAgentStat(_ context.Context, p database.Ins
		return stat, nil
		}

		func (q *fakeQuerier) GetTemplateDAUs(_ context.Context,templateID uuid.UUID) ([]database.GetTemplateDAUsRow, error) {
		func (q *fakeQuerier) GetTemplateDAUs(_ context.Context,arg database.GetTemplateDAUsParams) ([]database.GetTemplateDAUsRow, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()

		seens := make(map[time.Time]map[uuid.UUID]struct{})

		for _, as := range q.workspaceAgentStats {
		if as.TemplateID !=templateID {
		if as.TemplateID !=arg.TemplateID {
		continue
		}
		if as.ConnectionCount == 0 {
		continue
		}

		date := as.CreatedAt.Truncate(time.Hour * 24)
		date := as.CreatedAt.UTC().Add(time.Duration(arg.TzOffset) * time.Hour).Truncate(time.Hour * 24)

		dateEntry := seens[date]
		if dateEntry == nil {
Expand DownExpand Up		@@ -477,7 +477,7 @@ func (q *fakeQuerier) GetTemplateDAUs(_ context.Context, templateID uuid.UUID) (
		return rs, nil
		}

		func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context) ([]database.GetDeploymentDAUsRow, error) {
		func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context, tzOffset int32) ([]database.GetDeploymentDAUsRow, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()

Expand All		@@ -487,7 +487,7 @@ func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context) ([]database.GetDeploy
		if as.ConnectionCount == 0 {
		continue
		}
		date := as.CreatedAt.Truncate(time.Hour * 24)
		date := as.CreatedAt.UTC().Add(time.Duration(tzOffset) * time.Hour).Truncate(time.Hour * 24)

		dateEntry := seens[date]
		if dateEntry == nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,7 +24,7 @@ VALUES

		-- name: GetTemplateDAUs :many
		SELECT
		(created_at at TIME ZONE'UTC')::date as date,
		(created_at at TIME ZONEcast(@tz_offset::integer as text))::date as date,
		user_id
		FROM
		workspace_agent_stats
Expand All		@@ -38,7 +38,7 @@ ORDER BY

		-- name: GetDeploymentDAUs :many
		SELECT
		(created_at at TIME ZONE'UTC')::date as date,
		(created_at at TIME ZONEcast(@tz_offset::integer as text))::date as date,
		user_id
		FROM
		workspace_agent_stats
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,7 +13,7 @@ import (
		// @Security CoderSessionToken
		// @Produce json
		// @Tags Insights
		// @Success 200 {object} codersdk.DeploymentDAUsResponse
		// @Success 200 {object} codersdk.DAUsResponse
		// @Router /insights/daus [get]
		func (api API) deploymentDAUs(rw http.ResponseWriter, r http.Request) {
		ctx := r.Context()
Expand All		@@ -22,9 +22,21 @@ func (api API) deploymentDAUs(rw http.ResponseWriter, r http.Request) {
		return
		}

		resp, _ := api.metricsCache.DeploymentDAUs()
		vals := r.URL.Query()
		p := httpapi.NewQueryParamParser()
		tzOffset := p.Int(vals, 0, "tz_offset")
		p.ErrorExcessParams(vals)
		if len(p.Errors) > 0 {
		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
		Message: "Query parameters have invalid values.",
		Validations: p.Errors,
		})
		return
		}

		_, resp, _ := api.metricsCache.DeploymentDAUs(tzOffset)
		if resp == nil \|\| resp.Entries == nil {
		httpapi.Write(ctx, rw, http.StatusOK, &codersdk.DeploymentDAUsResponse{
		httpapi.Write(ctx, rw, http.StatusOK, &codersdk.DAUsResponse{
		Entries: []codersdk.DAUEntry{},
		})
		return
Expand Down