Mar 3, 2025 · Mar 3, 2025
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.FetchMemoryResourceMonitorsByAgentID(ctx, agentID)
 }

 func (q *querier) FetchMemoryResourceMonitorsUpdatedAfter(ctx context.Context, updatedAt time.Time) ([]database.WorkspaceAgentMemoryResourceMonitor, error) {
 // Ideally, we would return a list of monitors that the user has access to. However, that check would need to
 // be implemented similarly to GetWorkspaces, which is more complex than what we're doing here. Since this query
 // was introduced for telemetry, we perform a simpler check.
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
 return nil, err
 }

 return q.db.FetchMemoryResourceMonitorsUpdatedAfter(ctx, updatedAt)
 }

 func (q *querier) FetchNewMessageMetadata(ctx context.Context, arg database.FetchNewMessageMetadataParams) (database.FetchNewMessageMetadataRow, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceNotificationMessage); err != nil {
 return database.FetchNewMessageMetadataRow{}, err
 return q.db.FetchVolumesResourceMonitorsByAgentID(ctx, agentID)
 }

 func (q *querier) FetchVolumesResourceMonitorsUpdatedAfter(ctx context.Context, updatedAt time.Time) ([]database.WorkspaceAgentVolumeResourceMonitor, error) {
 // Ideally, we would return a list of monitors that the user has access to. However, that check would need to
 // be implemented similarly to GetWorkspaces, which is more complex than what we're doing here. Since this query
 // was introduced for telemetry, we perform a simpler check.
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
 return nil, err
 }

 return q.db.FetchVolumesResourceMonitorsUpdatedAfter(ctx, updatedAt)
 }

 func (q *querier) GetAPIKeyByID(ctx context.Context, id string) (database.APIKey, error) {
 return fetch(q.log, q.auth, q.db.GetAPIKeyByID)(ctx, id)
 }
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 }).Asserts(rbac.ResourceWorkspaceAgentResourceMonitor, policy.ActionUpdate)
 }))

 s.Run("FetchMemoryResourceMonitorsUpdatedAfter", s.Subtest(func(db database.Store, check *expects) {
 check.Args(dbtime.Now()).Asserts(rbac.ResourceWorkspaceAgentResourceMonitor, policy.ActionRead)
 }))

 s.Run("FetchVolumesResourceMonitorsUpdatedAfter", s.Subtest(func(db database.Store, check *expects) {
 check.Args(dbtime.Now()).Asserts(rbac.ResourceWorkspaceAgentResourceMonitor, policy.ActionRead)
 }))

 s.Run("FetchMemoryResourceMonitorsByAgentID", s.Subtest(func(db database.Store, check *expects) {
 agt, w := createAgent(s.T(), db)

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 return database.WorkspaceAgentMemoryResourceMonitor{}, sql.ErrNoRows
 }

 func (q *FakeQuerier) FetchMemoryResourceMonitorsUpdatedAfter(_ context.Context, updatedAt time.Time) ([]database.WorkspaceAgentMemoryResourceMonitor, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()

 monitors := []database.WorkspaceAgentMemoryResourceMonitor{}
 for _, monitor := range q.workspaceAgentMemoryResourceMonitors {
 if monitor.UpdatedAt.After(updatedAt) {
 monitors = append(monitors, monitor)
 }
 }
 return monitors, nil
 }

 func (q *FakeQuerier) FetchNewMessageMetadata(_ context.Context, arg database.FetchNewMessageMetadataParams) (database.FetchNewMessageMetadataRow, error) {
 err := validateDatabaseType(arg)
 if err != nil {
 return monitors, nil
 }

 func (q *FakeQuerier) FetchVolumesResourceMonitorsUpdatedAfter(_ context.Context, updatedAt time.Time) ([]database.WorkspaceAgentVolumeResourceMonitor, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()

 monitors := []database.WorkspaceAgentVolumeResourceMonitor{}
 for _, monitor := range q.workspaceAgentVolumeResourceMonitors {
 if monitor.UpdatedAt.After(updatedAt) {
 monitors = append(monitors, monitor)
 }
 }
 return monitors, nil
 }

 func (q *FakeQuerier) GetAPIKeyByID(_ context.Context, id string) (database.APIKey, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()
diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.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/workspaceagentresourcemonitors.sql b/coderd/database/queries/workspaceagentresourcemonitors.sql
 -- name: FetchVolumesResourceMonitorsUpdatedAfter :many
 SELECT
 *
 FROM
 workspace_agent_volume_resource_monitors
 WHERE
 updated_at > $1;

 -- name: FetchMemoryResourceMonitorsUpdatedAfter :many
 SELECT
 *
 FROM
 workspace_agent_memory_resource_monitors
 WHERE
 updated_at > $1;

 -- name: FetchMemoryResourceMonitorsByAgentID :one
 SELECT
 *
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1426,6 +1426,17 @@ func (q *querier) FetchMemoryResourceMonitorsByAgentID(ctx context.Context, agen
		return q.db.FetchMemoryResourceMonitorsByAgentID(ctx, agentID)
		}

		func (q *querier) FetchMemoryResourceMonitorsUpdatedAfter(ctx context.Context, updatedAt time.Time) ([]database.WorkspaceAgentMemoryResourceMonitor, error) {
		// Ideally, we would return a list of monitors that the user has access to. However, that check would need to
		// be implemented similarly to GetWorkspaces, which is more complex than what we're doing here. Since this query
		// was introduced for telemetry, we perform a simpler check.
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
		return nil, err
		}

		return q.db.FetchMemoryResourceMonitorsUpdatedAfter(ctx, updatedAt)
		}

		func (q *querier) FetchNewMessageMetadata(ctx context.Context, arg database.FetchNewMessageMetadataParams) (database.FetchNewMessageMetadataRow, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceNotificationMessage); err != nil {
		return database.FetchNewMessageMetadataRow{}, err
Expand All		@@ -1447,6 +1458,17 @@ func (q *querier) FetchVolumesResourceMonitorsByAgentID(ctx context.Context, age
		return q.db.FetchVolumesResourceMonitorsByAgentID(ctx, agentID)
		}

		func (q *querier) FetchVolumesResourceMonitorsUpdatedAfter(ctx context.Context, updatedAt time.Time) ([]database.WorkspaceAgentVolumeResourceMonitor, error) {
		// Ideally, we would return a list of monitors that the user has access to. However, that check would need to
		// be implemented similarly to GetWorkspaces, which is more complex than what we're doing here. Since this query
		// was introduced for telemetry, we perform a simpler check.
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
		return nil, err
		}

		return q.db.FetchVolumesResourceMonitorsUpdatedAfter(ctx, updatedAt)
		}

		func (q *querier) GetAPIKeyByID(ctx context.Context, id string) (database.APIKey, error) {
		return fetch(q.log, q.auth, q.db.GetAPIKeyByID)(ctx, id)
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4802,6 +4802,14 @@ func (s *MethodTestSuite) TestResourcesMonitor() {
		}).Asserts(rbac.ResourceWorkspaceAgentResourceMonitor, policy.ActionUpdate)
		}))

		s.Run("FetchMemoryResourceMonitorsUpdatedAfter", s.Subtest(func(db database.Store, check *expects) {
		check.Args(dbtime.Now()).Asserts(rbac.ResourceWorkspaceAgentResourceMonitor, policy.ActionRead)
		}))

		s.Run("FetchVolumesResourceMonitorsUpdatedAfter", s.Subtest(func(db database.Store, check *expects) {
		check.Args(dbtime.Now()).Asserts(rbac.ResourceWorkspaceAgentResourceMonitor, policy.ActionRead)
		}))

		s.Run("FetchMemoryResourceMonitorsByAgentID", s.Subtest(func(db database.Store, check *expects) {
		agt, w := createAgent(s.T(), db)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2361,6 +2361,19 @@ func (q *FakeQuerier) FetchMemoryResourceMonitorsByAgentID(_ context.Context, ag
		return database.WorkspaceAgentMemoryResourceMonitor{}, sql.ErrNoRows
		}

		func (q *FakeQuerier) FetchMemoryResourceMonitorsUpdatedAfter(_ context.Context, updatedAt time.Time) ([]database.WorkspaceAgentMemoryResourceMonitor, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()

		monitors := []database.WorkspaceAgentMemoryResourceMonitor{}
		for _, monitor := range q.workspaceAgentMemoryResourceMonitors {
		if monitor.UpdatedAt.After(updatedAt) {
		monitors = append(monitors, monitor)
		}
		}
		return monitors, nil
		}

		func (q *FakeQuerier) FetchNewMessageMetadata(_ context.Context, arg database.FetchNewMessageMetadataParams) (database.FetchNewMessageMetadataRow, error) {
		err := validateDatabaseType(arg)
		if err != nil {
Expand DownExpand Up		@@ -2405,6 +2418,19 @@ func (q *FakeQuerier) FetchVolumesResourceMonitorsByAgentID(_ context.Context, a
		return monitors, nil
		}

		func (q *FakeQuerier) FetchVolumesResourceMonitorsUpdatedAfter(_ context.Context, updatedAt time.Time) ([]database.WorkspaceAgentVolumeResourceMonitor, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()

		monitors := []database.WorkspaceAgentVolumeResourceMonitor{}
		for _, monitor := range q.workspaceAgentVolumeResourceMonitors {
		if monitor.UpdatedAt.After(updatedAt) {
		monitors = append(monitors, monitor)
		}
		}
		return monitors, nil
		}

		func (q *FakeQuerier) GetAPIKeyByID(_ context.Context, id string) (database.APIKey, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,19 @@
		-- name: FetchVolumesResourceMonitorsUpdatedAfter :many
		SELECT
		*
		FROM
		workspace_agent_volume_resource_monitors
		WHERE
		updated_at > $1;

		-- name: FetchMemoryResourceMonitorsUpdatedAfter :many
		SELECT
		*
		FROM
		workspace_agent_memory_resource_monitors
		WHERE
		updated_at > $1;

		-- name: FetchMemoryResourceMonitorsByAgentID :one
		SELECT
		*
Expand Down