add collectedAt

defelmnq · defelmnq · commit 3bec3247b516 · 2025-02-14T08:49:57.000Z
diff --git a/agent/proto/resourcesmonitor/queue.go b/agent/proto/resourcesmonitor/queue.go
@@ -1,12 +1,17 @@
 package resourcesmonitor
 
 import (
+	"time"
+
+	"google.golang.org/protobuf/types/known/timestamppb"
+
 	"github.com/coder/coder/v2/agent/proto"
 )
 
 type Datapoint struct {
-	Memory  *MemoryDatapoint
-	Volumes []*VolumeDatapoint
+	CollectedAt time.Time
+	Memory      *MemoryDatapoint
+	Volumes     []*VolumeDatapoint
 }
 
 type MemoryDatapoint struct {
@@ -55,7 +60,9 @@ func (q *Queue) ItemsAsProto() []*proto.PushResourcesMonitoringUsageRequest_Data
 	items := make([]*proto.PushResourcesMonitoringUsageRequest_Datapoint, 0, len(q.items))
 
 	for _, item := range q.items {
-		protoItem := &proto.PushResourcesMonitoringUsageRequest_Datapoint{}
+		protoItem := &proto.PushResourcesMonitoringUsageRequest_Datapoint{
+			CollectedAt: timestamppb.New(item.CollectedAt),
+		}
 		if item.Memory != nil {
 			protoItem.Memory = &proto.PushResourcesMonitoringUsageRequest_Datapoint_MemoryUsage{
 				Total: item.Memory.Total,
diff --git a/agent/proto/resourcesmonitor/resources_monitor.go b/agent/proto/resourcesmonitor/resources_monitor.go
@@ -37,7 +37,8 @@ type datapointsPusher interface {
 func (m *monitor) Start(ctx context.Context) error {
 	m.clock.TickerFunc(ctx, time.Duration(m.config.Config.CollectionIntervalSeconds)*time.Second, func() error {
 		datapoint := Datapoint{
-			Volumes: make([]*VolumeDatapoint, 0, len(m.config.Volumes)),
+			CollectedAt: m.clock.Now(),
+			Volumes:     make([]*VolumeDatapoint, 0, len(m.config.Volumes)),
 		}
 
 		if m.config.Memory != nil && m.config.Memory.Enabled {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ type datapointsPusher interface {`
`37`	`37`	`func (m *monitor) Start(ctx context.Context) error {`
`38`	`38`	`m.clock.TickerFunc(ctx, time.Duration(m.config.Config.CollectionIntervalSeconds)*time.Second, func() error {`
`39`	`39`	`datapoint := Datapoint{`
`40`		`- Volumes: make([]*VolumeDatapoint, 0, len(m.config.Volumes)),`
	`40`	`+ CollectedAt: m.clock.Now(),`
	`41`	`+ Volumes: make([]*VolumeDatapoint, 0, len(m.config.Volumes)),`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`if m.config.Memory != nil && m.config.Memory.Enabled {`