remove GetHTMLFirstServedAt and SetHTMLFirstServedAt

coder · hugodutka · Jan 31, 2025 · Jan 29, 2025 · Jan 30, 2025 · Jan 30, 2025
commit a6a984f67441d1a40c22592d60c06134f1e181c7
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -2096,13 +2096,6 @@ func (q *querier) GetTailnetTunnelPeerIDs(ctx context.Context, srcID uuid.UUID)
 	return q.db.GetTailnetTunnelPeerIDs(ctx, srcID)
 }
 
-func (q *querier) GetTelemetryHTMLFirstServedAt(ctx context.Context) (string, error) {
-	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
-		return "", err
-	}
-	return q.db.GetTelemetryHTMLFirstServedAt(ctx)
-}
-
 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
@@ -3456,13 +3449,6 @@ func (q *querier) RevokeDBCryptKey(ctx context.Context, activeKeyDigest string)
 	return q.db.RevokeDBCryptKey(ctx, activeKeyDigest)
 }
 
-func (q *querier) SetTelemetryHTMLFirstServedAt(ctx context.Context, value string) error {
-	if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
-		return err
-	}
-	return q.db.SetTelemetryHTMLFirstServedAt(ctx, value)
-}
-
 func (q *querier) TryAcquireLock(ctx context.Context, id int64) (bool, error) {
 	return q.db.TryAcquireLock(ctx, id)
 }

diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -4224,12 +4224,6 @@ 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("GetTelemetryHTMLFirstServedAt", s.Subtest(func(db database.Store, check *expects) {
-		check.Args().Asserts(rbac.ResourceSystem, policy.ActionRead).Errors(sql.ErrNoRows)
-	}))
-	s.Run("SetTelemetryHTMLFirstServedAt", s.Subtest(func(db database.Store, check *expects) {
-		check.Args(time.Now().Format(time.RFC3339)).Asserts(rbac.ResourceSystem, policy.ActionUpdate)
-	}))
 	s.Run("GetTelemetryItem", s.Subtest(func(db database.Store, check *expects) {
 		check.Args("test").Asserts(rbac.ResourceSystem, policy.ActionRead).Errors(sql.ErrNoRows)
 	}))

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -4333,16 +4333,6 @@ func (*FakeQuerier) GetTailnetTunnelPeerIDs(context.Context, uuid.UUID) ([]datab
 	return nil, ErrUnimplemented
 }
 
-func (q *FakeQuerier) GetTelemetryHTMLFirstServedAt(ctx context.Context) (string, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-	if q.htmlFirstServedAt == "" {
-		return "", sql.ErrNoRows
-	}
-
-	return q.htmlFirstServedAt, nil
-}
-
 func (q *FakeQuerier) GetTelemetryItem(_ context.Context, key string) (database.TelemetryItem, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()
@@ -9177,16 +9167,6 @@ func (q *FakeQuerier) RevokeDBCryptKey(_ context.Context, activeKeyDigest string
 	return sql.ErrNoRows
 }
 
-func (q *FakeQuerier) SetTelemetryHTMLFirstServedAt(ctx context.Context, value string) error {
-	q.mutex.Lock()
-	defer q.mutex.Unlock()
-	if q.htmlFirstServedAt != "" {
-		return nil
-	}
-	q.htmlFirstServedAt = value
-	return nil
-}
-
 func (*FakeQuerier) TryAcquireLock(_ context.Context, _ int64) (bool, error) {
 	return false, xerrors.New("TryAcquireLock must only be called within a transaction")
 }

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/siteconfig.sql b/coderd/database/queries/siteconfig.sql
@@ -106,11 +106,3 @@ ON CONFLICT (key) DO UPDATE SET value = $2 WHERE site_configs.key = $1;
 -- name: DeleteRuntimeConfig :exec
 DELETE FROM site_configs
 WHERE site_configs.key = $1;
-
--- name: SetTelemetryHTMLFirstServedAt :exec
-INSERT INTO site_configs (key, value)
-VALUES ('telemetry_html_first_served_at', $1)
-ON CONFLICT (key) DO NOTHING;
-
--- name: GetTelemetryHTMLFirstServedAt :one
-SELECT value FROM site_configs WHERE key = 'telemetry_html_first_served_at';
diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -330,18 +330,6 @@ func checkIDPOrgSync(ctx context.Context, db database.Store, values *codersdk.De
 	return syncConfig.Field != "", nil
 }
 
-func getHTMLFirstServedAt(ctx context.Context, db database.Store) (*time.Time, error) {
-	htmlFirstServedAtStr, err := db.GetTelemetryHTMLFirstServedAt(ctx)
-	if err != nil {
-		return nil, xerrors.Errorf("get telemetry html first served at: %w", err)
-	}
-	t, err := time.Parse(time.RFC3339, htmlFirstServedAtStr)
-	if err != nil {
-		return nil, xerrors.Errorf("parse telemetry html first served at: %w", err)
-	}
-	return &t, nil
-}
-
 // createSnapshot collects a full snapshot from the database.
 func (r *remoteReporter) createSnapshot() (*Snapshot, error) {
 	var (