Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit dd3cf57

Browse files
populate monitors_enabled_unique_users (#57163)
* populate monitors_enabled_unique_users and monitors_enabled_last_run_errored code monitors so they don't return nil * remove code_monitors_last_run_errored * adds comment about unpopulated monitors_enabled_last_run_errored
1 parent 52a66a9 commit dd3cf57

4 files changed

Lines changed: 15 additions & 7 deletions

File tree

internal/types/types.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,12 +1837,14 @@ type CodeMonitoringUsageStatistics struct {
18371837
WebhookActionsEnabledUniqueUsers *int32
18381838
MonitorsEnabled *int32
18391839
MonitorsEnabledUniqueUsers *int32
1840-
MonitorsEnabledLastRunErrored *int32
1841-
ReposMonitored *int32
1842-
TriggerRuns *int32
1843-
TriggerRunsErrored *int32
1844-
P50TriggerRunTimeSeconds *float32
1845-
P90TriggerRunTimeSeconds *float32
1840+
// (TODO @jasonhawkharris ) Currently, MonitorsEnabledLastRunErrored is unpopulated
1841+
// It will require adjusting the query to select a row inside of a group
1842+
MonitorsEnabledLastRunErrored *int32
1843+
ReposMonitored *int32
1844+
TriggerRuns *int32
1845+
TriggerRunsErrored *int32
1846+
P50TriggerRunTimeSeconds *float32
1847+
P90TriggerRunTimeSeconds *float32
18461848
}
18471849

18481850
type NotebooksUsageStatistics struct {

internal/usagestats/code_monitoring.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ func GetCodeMonitoringUsageStatistics(ctx context.Context, db database.DB) (*typ
4646
&stats.P50TriggerRunTimeSeconds,
4747
&stats.P90TriggerRunTimeSeconds,
4848
&stats.MonitorsEnabled,
49+
&stats.MonitorsEnabledUniqueUsers,
4950
); err != nil {
5051
return nil, err
5152
}

internal/usagestats/code_monitoring_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ func TestCodeMonitoringUsageStatistics(t *testing.T) {
251251
P50TriggerRunTimeSeconds: ptr(float32(3)),
252252
P90TriggerRunTimeSeconds: ptr(float32(6)),
253253
MonitorsEnabled: ptr(int32(8)),
254+
MonitorsEnabledUniqueUsers: ptr(int32(8)),
254255
}
255256
require.Equal(t, want, have)
256257
}

internal/usagestats/code_monitoring_usage_stats.sql

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,11 @@ SELECT
126126
-- monitors_enabled
127127
COALESCE(slack_actions.slack_actions_enabled, 0) +
128128
COALESCE(email_actions.email_actions_enabled, 0) +
129-
COALESCE(webhook_actions.webhook_actions_enabled, 0) AS monitors_enabled
129+
COALESCE(webhook_actions.webhook_actions_enabled, 0) AS monitors_enabled,
130+
-- monitors_enabled_unique_users
131+
COALESCE(slack_actions.slack_actions_enabled_unique_users, 0) +
132+
COALESCE(email_actions.email_actions_enabled_unique_users, 0) +
133+
COALESCE(webhook_actions.webhook_actions_enabled_unique_users, 0) AS monitors_enabled_unique_users
130134
FROM
131135
event_log_stats,
132136
email_actions,

0 commit comments

Comments
 (0)