Jan 31, 2025 · Jan 29, 2025 · Jan 30, 2025 · Jan 30, 2025 · Jan 30, 2025 · Jan 30, 2025
diff --git a/cli/server_test.go b/cli/server_test.go
 server := httptest.NewServer(r)
 defer server.Close()

 inv,_ := clitest.New(t,
 inv,cfg := clitest.New(t,
 "server",
 "--in-memory",
 "--http-address", ":0",

 <-deployment
 <-snapshot

 accessURL := waitAccessURL(t, cfg)

 ctx := testutil.Context(t, testutil.WaitMedium)
 client := codersdk.New(accessURL)
 body, err := client.Request(ctx, http.MethodGet, "/", nil)
 require.NoError(t, err)
 require.NoError(t, body.Body.Close())

 require.Eventually(t, func() bool {
 snap := <-snapshot
 htmlFirstServedFound := false
 for _, item := range snap.TelemetryItems {
 if item.Key == string(telemetry.TelemetryItemKeyHTMLFirstServedAt) {
 htmlFirstServedFound = true
 }
 }
 return htmlFirstServedFound
 }, testutil.WaitMedium, testutil.IntervalFast, "no html_first_served telemetry item")
 })
 t.Run("Prometheus", func(t *testing.T) {
 t.Parallel()
diff --git a/coderd/coderd.go b/coderd/coderd.go
 AppearanceFetcher: &api.AppearanceFetcher,
 BuildInfo:         buildInfo,
 Entitlements:      options.Entitlements,
 Telemetry:         options.Telemetry,
 Logger:            options.Logger.Named("site"),
 })
 api.SiteHandler.Experiments.Store(&experiments)

diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.GetTailnetTunnelPeerIDs(ctx, srcID)
 }

 func (q *querier) GetTelemetryItem(ctx context.Context, key string) (database.TelemetryItem, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
 return database.TelemetryItem{}, err
 }
 return q.db.GetTelemetryItem(ctx, key)
 }

 func (q *querier) GetTelemetryItems(ctx context.Context) ([]database.TelemetryItem, error) {
 if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
 return nil, err
 }
 return q.db.GetTelemetryItems(ctx)
 }

 func (q *querier) GetTemplateAppInsights(ctx context.Context, arg database.GetTemplateAppInsightsParams) ([]database.GetTemplateAppInsightsRow, error) {
 if err := q.authorizeTemplateInsights(ctx, arg.TemplateIDs); err != nil {
 return nil, err
 return q.db.InsertReplica(ctx, arg)
 }

 func (q *querier) InsertTelemetryItemIfNotExists(ctx context.Context, arg database.InsertTelemetryItemIfNotExistsParams) error {
 if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
 return err
 }
 return q.db.InsertTelemetryItemIfNotExists(ctx, arg)
 }

 func (q *querier) InsertTemplate(ctx context.Context, arg database.InsertTemplateParams) error {
 obj := rbac.ResourceTemplate.InOrg(arg.OrganizationID)
 if err := q.authorizeContext(ctx, policy.ActionCreate, obj); err != nil {
 return q.db.UpsertTailnetTunnel(ctx, arg)
 }

 func (q *querier) UpsertTelemetryItem(ctx context.Context, arg database.UpsertTelemetryItemParams) error {
 if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
 return err
 }
 return q.db.UpsertTelemetryItem(ctx, arg)
 }

 func (q *querier) UpsertTemplateUsageStats(ctx context.Context) error {
 if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
 return err
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 s.Run("GetWorkspaceModulesCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
 check.Args(dbtime.Now()).Asserts(rbac.ResourceSystem, policy.ActionRead)
 }))
 s.Run("GetTelemetryItem", s.Subtest(func(db database.Store, check *expects) {
 check.Args("test").Asserts(rbac.ResourceSystem, policy.ActionRead).Errors(sql.ErrNoRows)
 }))
 s.Run("GetTelemetryItems", s.Subtest(func(db database.Store, check *expects) {
 check.Args().Asserts(rbac.ResourceSystem, policy.ActionRead)
 }))
 s.Run("InsertTelemetryItemIfNotExists", s.Subtest(func(db database.Store, check *expects) {
 check.Args(database.InsertTelemetryItemIfNotExistsParams{
 Key:   "test",
 Value: "value",
 }).Asserts(rbac.ResourceSystem, policy.ActionCreate)
 }))
 s.Run("UpsertTelemetryItem", s.Subtest(func(db database.Store, check *expects) {
 check.Args(database.UpsertTelemetryItemParams{
 Key:   "test",
 Value: "value",
 }).Asserts(rbac.ResourceSystem, policy.ActionUpdate)
 }))
 }

 func (s *MethodTestSuite) TestNotifications() {
diff --git a/coderd/database/dbgen/dbgen.go b/coderd/database/dbgen/dbgen.go
 return timings
 }

 func TelemetryItem(t testing.TB, db database.Store, seed database.TelemetryItem) database.TelemetryItem {
 if seed.Key == "" {
 seed.Key = testutil.GetRandomName(t)
 }
 if seed.Value == "" {
 seed.Value = time.Now().Format(time.RFC3339)
 }
 err := db.UpsertTelemetryItem(genCtx, database.UpsertTelemetryItemParams{
 Key:   seed.Key,
 Value: seed.Value,
 })
 require.NoError(t, err, "upsert telemetry item")
 item, err := db.GetTelemetryItem(genCtx, seed.Key)
 require.NoError(t, err, "get telemetry item")
 return item
 }

 func provisionerJobTiming(t testing.TB, db database.Store, seed database.ProvisionerJobTiming) database.ProvisionerJobTiming {
 timing, err := db.InsertProvisionerJobTimings(genCtx, database.InsertProvisionerJobTimingsParams{
 JobID:     takeFirst(seed.JobID, uuid.New()),
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
 locks:                     map[int64]struct{}{},
 runtimeConfig:             map[string]string{},
 userStatusChanges:         make([]database.UserStatusChange, 0),
 telemetryItems:            make([]database.TelemetryItem, 0),
 },
 }
 // Always start with a default org. Matching migration 198.
 defaultProxyDisplayName          string
 defaultProxyIconURL              string
 userStatusChanges                []database.UserStatusChange
 telemetryItems                   []database.TelemetryItem
 }

 func tryPercentile(fs []float64, p float64) float64 {
 return nil, ErrUnimplemented
 }

 func (q *FakeQuerier) GetTelemetryItem(_ context.Context, key string) (database.TelemetryItem, error) {
 q.mutex.RLock()
 defer q.mutex.RUnlock()

 for _, item := range q.telemetryItems {
 if item.Key == key {
 return item, nil
 }
 }

 return database.TelemetryItem{}, sql.ErrNoRows
 }

 func (q *FakeQuerier) GetTelemetryItems(_ context.Context) ([]database.TelemetryItem, error) {
 return q.telemetryItems, nil
 }

 func (q *FakeQuerier) GetTemplateAppInsights(ctx context.Context, arg database.GetTemplateAppInsightsParams) ([]database.GetTemplateAppInsightsRow, error) {
 err := validateDatabaseType(arg)
 if err != nil {
 return replica, nil
 }

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

 q.mutex.Lock()
 defer q.mutex.Unlock()

 for _, item := range q.telemetryItems {
 if item.Key == arg.Key {
 return nil
 }
 }

 q.telemetryItems = append(q.telemetryItems, database.TelemetryItem{
 Key:       arg.Key,
 Value:     arg.Value,
 CreatedAt: time.Now(),
 UpdatedAt: time.Now(),
 })
 return nil
 }

 func (q *FakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTemplateParams) error {
 if err := validateDatabaseType(arg); err != nil {
 return err
 return database.TailnetTunnel{}, ErrUnimplemented
 }

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

 q.mutex.Lock()
 defer q.mutex.Unlock()

 for i, item := range q.telemetryItems {
 if item.Key == arg.Key {
 q.telemetryItems[i].Value = arg.Value
 q.telemetryItems[i].UpdatedAt = time.Now()
 return nil
 }
 }

 q.telemetryItems = append(q.telemetryItems, database.TelemetryItem{
 Key:       arg.Key,
 Value:     arg.Value,
 CreatedAt: time.Now(),
 UpdatedAt: time.Now(),
 })

 return nil
 }

 func (q *FakeQuerier) UpsertTemplateUsageStats(ctx context.Context) error {
 q.mutex.Lock()
 defer q.mutex.Unlock()
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/dump.sql b/coderd/database/dump.sql
Original file line number	Diff line number	Diff line change
Expand Up		@@ -964,7 +964,7 @@ func TestServer(t *testing.T) {
		server := httptest.NewServer(r)
		defer server.Close()

		inv,_ := clitest.New(t,
		inv,cfg := clitest.New(t,
		"server",
		"--in-memory",
		"--http-address", ":0",
Expand All		@@ -977,6 +977,25 @@ func TestServer(t *testing.T) {

		<-deployment
		<-snapshot

		accessURL := waitAccessURL(t, cfg)

		ctx := testutil.Context(t, testutil.WaitMedium)
		client := codersdk.New(accessURL)
		body, err := client.Request(ctx, http.MethodGet, "/", nil)
		require.NoError(t, err)
		require.NoError(t, body.Body.Close())

		require.Eventually(t, func() bool {
		snap := <-snapshot
		htmlFirstServedFound := false
		for _, item := range snap.TelemetryItems {
		if item.Key == string(telemetry.TelemetryItemKeyHTMLFirstServedAt) {
		htmlFirstServedFound = true
		}
		}
		return htmlFirstServedFound
		}, testutil.WaitMedium, testutil.IntervalFast, "no html_first_served telemetry item")
		})
		t.Run("Prometheus", func(t *testing.T) {
		t.Parallel()
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -585,6 +585,8 @@ func New(options Options) API {
		AppearanceFetcher: &api.AppearanceFetcher,
		BuildInfo: buildInfo,
		Entitlements: options.Entitlements,
		Telemetry: options.Telemetry,
		Logger: options.Logger.Named("site"),
		})
		api.SiteHandler.Experiments.Store(&experiments)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2096,6 +2096,20 @@ func (q *querier) GetTailnetTunnelPeerIDs(ctx context.Context, srcID uuid.UUID)
		return q.db.GetTailnetTunnelPeerIDs(ctx, srcID)
		}

		func (q *querier) GetTelemetryItem(ctx context.Context, key string) (database.TelemetryItem, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
		return database.TelemetryItem{}, err
		}
		return q.db.GetTelemetryItem(ctx, key)
		}

		func (q *querier) GetTelemetryItems(ctx context.Context) ([]database.TelemetryItem, error) {
		if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
		return nil, err
		}
		return q.db.GetTelemetryItems(ctx)
		}

		func (q *querier) GetTemplateAppInsights(ctx context.Context, arg database.GetTemplateAppInsightsParams) ([]database.GetTemplateAppInsightsRow, error) {
		if err := q.authorizeTemplateInsights(ctx, arg.TemplateIDs); err != nil {
		return nil, err
Expand DownExpand Up		@@ -3085,6 +3099,13 @@ func (q *querier) InsertReplica(ctx context.Context, arg database.InsertReplicaP
		return q.db.InsertReplica(ctx, arg)
		}

		func (q *querier) InsertTelemetryItemIfNotExists(ctx context.Context, arg database.InsertTelemetryItemIfNotExistsParams) error {
		if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
		return err
		}
		return q.db.InsertTelemetryItemIfNotExists(ctx, arg)
		}

		func (q *querier) InsertTemplate(ctx context.Context, arg database.InsertTemplateParams) error {
		obj := rbac.ResourceTemplate.InOrg(arg.OrganizationID)
		if err := q.authorizeContext(ctx, policy.ActionCreate, obj); err != nil {
Expand DownExpand Up		@@ -4345,6 +4366,13 @@ func (q *querier) UpsertTailnetTunnel(ctx context.Context, arg database.UpsertTa
		return q.db.UpsertTailnetTunnel(ctx, arg)
		}

		func (q *querier) UpsertTelemetryItem(ctx context.Context, arg database.UpsertTelemetryItemParams) error {
		if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
		return err
		}
		return q.db.UpsertTelemetryItem(ctx, arg)
		}

		func (q *querier) UpsertTemplateUsageStats(ctx context.Context) error {
		if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
		return err
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4224,6 +4224,24 @@ func (s *MethodTestSuite) TestSystemFunctions() {
		s.Run("GetWorkspaceModulesCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
		check.Args(dbtime.Now()).Asserts(rbac.ResourceSystem, policy.ActionRead)
		}))
		s.Run("GetTelemetryItem", s.Subtest(func(db database.Store, check *expects) {
		check.Args("test").Asserts(rbac.ResourceSystem, policy.ActionRead).Errors(sql.ErrNoRows)
		}))
		s.Run("GetTelemetryItems", s.Subtest(func(db database.Store, check *expects) {
		check.Args().Asserts(rbac.ResourceSystem, policy.ActionRead)
		}))
		s.Run("InsertTelemetryItemIfNotExists", s.Subtest(func(db database.Store, check *expects) {
		check.Args(database.InsertTelemetryItemIfNotExistsParams{
		Key: "test",
		Value: "value",
		}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
		}))
		s.Run("UpsertTelemetryItem", s.Subtest(func(db database.Store, check *expects) {
		check.Args(database.UpsertTelemetryItemParams{
		Key: "test",
		Value: "value",
		}).Asserts(rbac.ResourceSystem, policy.ActionUpdate)
		}))
		}

		func (s *MethodTestSuite) TestNotifications() {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1093,6 +1093,23 @@ func ProvisionerJobTimings(t testing.TB, db database.Store, build database.Works
		return timings
		}

		func TelemetryItem(t testing.TB, db database.Store, seed database.TelemetryItem) database.TelemetryItem {
		if seed.Key == "" {
		seed.Key = testutil.GetRandomName(t)
		}
		if seed.Value == "" {
		seed.Value = time.Now().Format(time.RFC3339)
		}
		err := db.UpsertTelemetryItem(genCtx, database.UpsertTelemetryItemParams{
		Key: seed.Key,
		Value: seed.Value,
		})
		require.NoError(t, err, "upsert telemetry item")
		item, err := db.GetTelemetryItem(genCtx, seed.Key)
		require.NoError(t, err, "get telemetry item")
		return item
		}

		func provisionerJobTiming(t testing.TB, db database.Store, seed database.ProvisionerJobTiming) database.ProvisionerJobTiming {
		timing, err := db.InsertProvisionerJobTimings(genCtx, database.InsertProvisionerJobTimingsParams{
		JobID: takeFirst(seed.JobID, uuid.New()),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,6 +89,7 @@ func New() database.Store {
		locks: map[int64]struct{}{},
		runtimeConfig: map[string]string{},
		userStatusChanges: make([]database.UserStatusChange, 0),
		telemetryItems: make([]database.TelemetryItem, 0),
		},
		}
		// Always start with a default org. Matching migration 198.
Expand DownExpand Up		@@ -258,6 +259,7 @@ type data struct {
		defaultProxyDisplayName string
		defaultProxyIconURL string
		userStatusChanges []database.UserStatusChange
		telemetryItems []database.TelemetryItem
		}

		func tryPercentile(fs []float64, p float64) float64 {
Expand DownExpand Up		@@ -4330,6 +4332,23 @@ func (*FakeQuerier) GetTailnetTunnelPeerIDs(context.Context, uuid.UUID) ([]datab
		return nil, ErrUnimplemented
		}

		func (q *FakeQuerier) GetTelemetryItem(_ context.Context, key string) (database.TelemetryItem, error) {
		q.mutex.RLock()
		defer q.mutex.RUnlock()

		for _, item := range q.telemetryItems {
		if item.Key == key {
		return item, nil
		}
		}

		return database.TelemetryItem{}, sql.ErrNoRows
		}

		func (q *FakeQuerier) GetTelemetryItems(_ context.Context) ([]database.TelemetryItem, error) {
		return q.telemetryItems, nil
		}

		func (q *FakeQuerier) GetTemplateAppInsights(ctx context.Context, arg database.GetTemplateAppInsightsParams) ([]database.GetTemplateAppInsightsRow, error) {
		err := validateDatabaseType(arg)
		if err != nil {
Expand DownExpand Up		@@ -8120,6 +8139,30 @@ func (q *FakeQuerier) InsertReplica(_ context.Context, arg database.InsertReplic
		return replica, nil
		}

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

		q.mutex.Lock()
		defer q.mutex.Unlock()

		for _, item := range q.telemetryItems {
		if item.Key == arg.Key {
		return nil
		}
		}

		q.telemetryItems = append(q.telemetryItems, database.TelemetryItem{
		Key: arg.Key,
		Value: arg.Value,
		CreatedAt: time.Now(),
		UpdatedAt: time.Now(),
		})
		return nil
		}

		func (q *FakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTemplateParams) error {
		if err := validateDatabaseType(arg); err != nil {
		return err
Expand DownExpand Up		@@ -10874,6 +10917,33 @@ func (*FakeQuerier) UpsertTailnetTunnel(_ context.Context, arg database.UpsertTa
		return database.TailnetTunnel{}, ErrUnimplemented
		}

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

		q.mutex.Lock()
		defer q.mutex.Unlock()

		for i, item := range q.telemetryItems {
		if item.Key == arg.Key {
		q.telemetryItems[i].Value = arg.Value
		q.telemetryItems[i].UpdatedAt = time.Now()
		return nil
		}
		}

		q.telemetryItems = append(q.telemetryItems, database.TelemetryItem{
		Key: arg.Key,
		Value: arg.Value,
		CreatedAt: time.Now(),
		UpdatedAt: time.Now(),
		})

		return nil
		}

		func (q *FakeQuerier) UpsertTemplateUsageStats(ctx context.Context) error {
		q.mutex.Lock()
		defer q.mutex.Unlock()
Expand Down