mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
refactor(coderd/database): split Time and Now into dbtime package (#9482)
Ref: #9380
This commit is contained in:
@@ -24,6 +24,7 @@ import (
|
||||
"cdr.dev/slog"
|
||||
"github.com/coder/coder/v2/buildinfo"
|
||||
"github.com/coder/coder/v2/coderd/database"
|
||||
"github.com/coder/coder/v2/coderd/database/dbtime"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -77,7 +78,7 @@ func New(options Options) (Reporter, error) {
|
||||
options: options,
|
||||
deploymentURL: deploymentURL,
|
||||
snapshotURL: snapshotURL,
|
||||
startedAt: database.Now(),
|
||||
startedAt: dbtime.Now(),
|
||||
}
|
||||
go reporter.runSnapshotter()
|
||||
return reporter, nil
|
||||
@@ -150,7 +151,7 @@ func (r *remoteReporter) Close() {
|
||||
return
|
||||
}
|
||||
close(r.closed)
|
||||
now := database.Now()
|
||||
now := dbtime.Now()
|
||||
r.shutdownAt = &now
|
||||
// Report a final collection of telemetry prior to close!
|
||||
// This could indicate final actions a user has taken, and
|
||||
@@ -289,7 +290,7 @@ func (r *remoteReporter) createSnapshot() (*Snapshot, error) {
|
||||
ctx = r.ctx
|
||||
// For resources that grow in size very quickly (like workspace builds),
|
||||
// we only report events that occurred within the past hour.
|
||||
createdAfter = database.Now().Add(-1 * time.Hour)
|
||||
createdAfter = dbtime.Now().Add(-1 * time.Hour)
|
||||
eg errgroup.Group
|
||||
snapshot = &Snapshot{
|
||||
DeploymentID: r.options.DeploymentID,
|
||||
|
||||
@@ -20,6 +20,7 @@ import (
|
||||
"github.com/coder/coder/v2/coderd/database"
|
||||
"github.com/coder/coder/v2/coderd/database/dbfake"
|
||||
"github.com/coder/coder/v2/coderd/database/dbgen"
|
||||
"github.com/coder/coder/v2/coderd/database/dbtime"
|
||||
"github.com/coder/coder/v2/coderd/telemetry"
|
||||
"github.com/coder/coder/v2/testutil"
|
||||
)
|
||||
@@ -76,9 +77,9 @@ func TestTelemetry(t *testing.T) {
|
||||
})
|
||||
_ = dbgen.WorkspaceAgentStat(t, db, database.WorkspaceAgentStat{})
|
||||
_, err = db.InsertLicense(ctx, database.InsertLicenseParams{
|
||||
UploadedAt: database.Now(),
|
||||
UploadedAt: dbtime.Now(),
|
||||
JWT: "",
|
||||
Exp: database.Now().Add(time.Hour),
|
||||
Exp: dbtime.Now().Add(time.Hour),
|
||||
UUID: uuid.New(),
|
||||
})
|
||||
assert.NoError(t, err)
|
||||
|
||||
Reference in New Issue
Block a user