Skip to content

feat: expose template insights as Prometheus metrics #10255

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

feat: expose template insights as Prometheus metrics #10255

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
24e4ff3
WIP
mtojek Oct 13, 2023
a6c9c1a
Use db
mtojek Oct 13, 2023
86f45a0
debug
mtojek Oct 13, 2023
bfcd8f4
Merge branch 'main' into 9983-insights-metrics
mtojek Oct 17, 2023
a3c29a7
DB calls
mtojek Oct 17, 2023
24ae332
WIP
mtojek Oct 17, 2023
0cb1206
WIP dbfake
mtojek Oct 18, 2023
3c31168
Merge branch 'main' into 9983-insights-metrics
mtojek Oct 18, 2023
a764cef
Collect metrics data
mtojek Oct 18, 2023
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
Prev Previous commit
Collect metrics data
  • Loading branch information
@mtojek
mtojek committed Oct 18, 2023
commit a764cef16e67a8a215e6fcd1a2152752cb388ab6
47 changes: 36 additions & 11 deletions coderd/prometheusmetrics/insights/metricscollector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package insights

import (
"context"
"sync/atomic"
"time"

"github.com/google/uuid"
Expand All @@ -24,6 +25,16 @@ type MetricsCollector struct {
database database.Store
logger slog.Logger
duration time.Duration

data atomic.Pointer[insightsData]
}

type insightsData struct {
templates []database.GetTemplateInsightsByTemplateRow
apps []database.GetTemplateAppInsightsRow
parameters []database.GetTemplateParameterInsightsRow

templateNames map[uuid.UUID]string
}

var _ prometheus.Collector = new(MetricsCollector)
Expand Down Expand Up @@ -59,7 +70,7 @@ func (mc *MetricsCollector) Run(ctx context.Context) (func(), error) {

// TODO collect iteration time

var userActivity []database.GetUserActivityInsightsRow
var templateInsights []database.GetTemplateInsightsByTemplateRow
var appInsights []database.GetTemplateAppInsightsRow
var parameterInsights []database.GetTemplateParameterInsightsRow

Expand All @@ -69,7 +80,7 @@ func (mc *MetricsCollector) Run(ctx context.Context) (func(), error) {

eg.Go(func() error {
var err error
userActivity, err = mc.database.GetUserActivityInsights(egCtx, database.GetUserActivityInsightsParams{
templateInsights, err = mc.database.GetTemplateInsightsByTemplate(egCtx, database.GetTemplateInsightsByTemplateParams{
StartTime: startTime,
EndTime: endTime,
})
Expand Down Expand Up @@ -107,7 +118,7 @@ func (mc *MetricsCollector) Run(ctx context.Context) (func(), error) {
}

// Phase 2: Collect template IDs, and fetch relevant details
templateIDs := uniqueTemplateIDs(userActivity, appInsights, parameterInsights)
templateIDs := uniqueTemplateIDs(templateInsights, appInsights, parameterInsights)
templates, err := mc.database.GetTemplatesWithFilter(ctx, database.GetTemplatesWithFilterParams{
IDs: templateIDs,
})
Expand All @@ -116,8 +127,15 @@ func (mc *MetricsCollector) Run(ctx context.Context) (func(), error) {
return
}

/*templateNames := */
onlyTemplateNames(templates)
templateNames := onlyTemplateNames(templates)

mc.data.Store(&insightsData{
templates: templateInsights,
apps: appInsights,
parameters: parameterInsights,

templateNames: templateNames,
})
}

go func() {
Expand Down Expand Up @@ -147,17 +165,24 @@ func (*MetricsCollector) Describe(descCh chan<- *prometheus.Desc) {
func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {
// Phase 3: Collect metrics

// TODO
data := mc.data.Load()
if data == nil {
return // insights data not loaded yet
}

for _, templateRow := range data.templates {
metricsCh <- prometheus.MustNewConstMetric(activeUsersDesc, prometheus.GaugeValue, float64(templateRow.ActiveUsers), data.templateNames[templateRow.TemplateID])

// TODO applicationsUsageSeconds, parameters
}
}

// Helper functions below.

func uniqueTemplateIDs(userActivity []database.GetUserActivityInsightsRow, appInsights []database.GetTemplateAppInsightsRow, parameterInsights []database.GetTemplateParameterInsightsRow) []uuid.UUID {
func uniqueTemplateIDs(templateInsights []database.GetTemplateInsightsByTemplateRow, appInsights []database.GetTemplateAppInsightsRow, parameterInsights []database.GetTemplateParameterInsightsRow) []uuid.UUID {
tids := map[uuid.UUID]bool{}
for _, t := range userActivity {
for _, tid := range t.TemplateIDs {
tids[tid] = true
}
for _, t := range templateInsights {
tids[t.TemplateID] = true
}

for _, a := range appInsights {
Expand Down