Skip to content
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

Jump to bottom

Use the metrics route scoped to a queue to get metrics for the queue #92

Merged
merged 2 commits into from
Jul 25, 2023
Merged

Use the metrics route scoped to a queue to get metrics for the queue #92

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed14c42
Use the metrics route scoped to a queue to get metrics for the queue
triarius Jul 4, 2023
a2cb160
Use safer encodeing of query params
triarius Jul 25, 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
42 changes: 18 additions & 24 deletions buildkite/buildkite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,45 +51,37 @@ func (c *Client) GetAgentMetrics(queue string) (AgentMetrics, error) {
Slug string `json:"slug"`
} `json:"organization"`
Agents struct {
Queues map[string]struct {
Busy int64 `json:"busy"`
Idle int64 `json:"idle"`
Total int64 `json:"total"`
} `json:"queues"`
Busy int64 `json:"busy"`
Idle int64 `json:"idle"`
Total int64 `json:"total"`
} `json:"agents"`
Jobs struct {
Queues map[string]struct {
Scheduled int64 `json:"scheduled"`
Running int64 `json:"running"`
Waiting int64 `json:"waiting"`
} `json:"queues"`
Scheduled int64 `json:"scheduled"`
Running int64 `json:"running"`
Waiting int64 `json:"waiting"`
} `json:"jobs"`
}

t := time.Now()
pollDuration, err := c.queryMetrics(&resp)
pollDuration, err := c.queryMetrics(&resp, queue)
if err != nil {
return AgentMetrics{}, err
}

queryDuration := time.Now().Sub(t)
queryDuration := time.Since(t)

var metrics AgentMetrics
metrics.OrgSlug = resp.Organization.Slug
metrics.Queue = queue
metrics.PollDuration = pollDuration

if queue, exists := resp.Agents.Queues[queue]; exists {
metrics.IdleAgents = queue.Idle
metrics.BusyAgents = queue.Busy
metrics.TotalAgents = queue.Total
}
metrics.IdleAgents = resp.Agents.Idle
metrics.BusyAgents = resp.Agents.Busy
metrics.TotalAgents = resp.Agents.Total

if queue, exists := resp.Jobs.Queues[queue]; exists {
metrics.ScheduledJobs = queue.Scheduled
metrics.RunningJobs = queue.Running
metrics.WaitingJobs = queue.Waiting
}
metrics.ScheduledJobs = resp.Jobs.Scheduled
metrics.RunningJobs = resp.Jobs.Running
metrics.WaitingJobs = resp.Jobs.Waiting

log.Printf("↳ Agents: idle=%d, busy=%d, total=%d",
metrics.IdleAgents, metrics.BusyAgents, metrics.TotalAgents)
Expand All @@ -99,12 +91,14 @@ func (c *Client) GetAgentMetrics(queue string) (AgentMetrics, error) {
return metrics, nil
}

func (c *Client) queryMetrics(into interface{}) (pollDuration time.Duration, err error) {
func (c *Client) queryMetrics(into interface{}, queue string) (pollDuration time.Duration, err error) {
endpoint, err := url.Parse(c.Endpoint)
if err != nil {
return time.Duration(0), err
}
endpoint.Path += "/metrics"
endpoint.Path += "/metrics/queue"
q := url.Values{"name": []string{queue}}
endpoint.RawQuery = q.Encode()

req, err := http.NewRequest(http.MethodGet, endpoint.String(), nil)
if err != nil {
Expand Down