Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

chore: track the first time html is served in telemetry#16334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
hugodutka merged 16 commits intomainfromhugodutka/telemetry-html-first-served
Jan 31, 2025
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
16 commits
Select commitHold shift + click to select a range
63246e8
track the first time html is served in telemetry
hugodutkaJan 29, 2025
32876a2
add the telemetry_items table
hugodutkaJan 30, 2025
f68a163
add the GetTelemetryItems query
hugodutkaJan 30, 2025
6554aa3
change TelemetryItem's key to PK
hugodutkaJan 30, 2025
0a95dcd
report html first served at with a TelemetryItem
hugodutkaJan 30, 2025
5118aeb
remove ReportDeployment from Reporter
hugodutkaJan 30, 2025
a6a984f
remove GetHTMLFirstServedAt and SetHTMLFirstServedAt
hugodutkaJan 30, 2025
3f6615b
remove htmlFirstServedAt from dbmem
hugodutkaJan 30, 2025
e338c8f
revert change to siteconfig.sql
hugodutkaJan 30, 2025
0828c1d
fix tests
hugodutkaJan 30, 2025
35e79bc
add a test for reporting html first served
hugodutkaJan 30, 2025
89c8371
make the snapshot check more robust
hugodutkaJan 30, 2025
ff86e66
add telemetry_items fixture
hugodutkaJan 30, 2025
d2ca62d
Simplify telemetry item reporting context handling
hugodutkaJan 30, 2025
00c27c5
address the PR review
hugodutkaJan 31, 2025
e297740
fix typo
hugodutkaJan 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
PrevPrevious commit
NextNext commit
remove GetHTMLFirstServedAt and SetHTMLFirstServedAt
  • Loading branch information
@hugodutka
hugodutka committedJan 30, 2025
commita6a984f67441d1a40c22592d60c06134f1e181c7
14 changes: 0 additions & 14 deletionscoderd/database/dbauthz/dbauthz.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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)
}
Expand Down
6 changes: 0 additions & 6 deletionscoderd/database/dbauthz/dbauthz_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)
}))
Expand Down
20 changes: 0 additions & 20 deletionscoderd/database/dbmem/dbmem.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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()
Expand DownExpand Up@@ -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")
}
Expand Down
14 changes: 0 additions & 14 deletionscoderd/database/dbmetrics/querymetrics.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

29 changes: 0 additions & 29 deletionscoderd/database/dbmock/dbmock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

2 changes: 0 additions & 2 deletionscoderd/database/querier.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

22 changes: 0 additions & 22 deletionscoderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more abouthow customized files appear on GitHub.

8 changes: 0 additions & 8 deletionscoderd/database/queries/siteconfig.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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';
12 changes: 0 additions & 12 deletionscoderd/telemetry/telemetry.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 (
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp