mirror/hatchet
1
0
Fork 0
mirror of https://github.com/hatchet-dev/hatchet.git synced 2026-02-05 07:39:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Make metrics in graph align with badge metrics (#2858)

Browse Source 
* Revert "Revert "fix: make point metrics line up with badges (#2739)" (#2857)"

This reverts commit bc37fc7750.

* fix: naming
This commit is contained in:
matt
2026-01-27 10:36:19 -05:00
committed by GitHub
parent a520fb6ec5
commit 1a5ea825bc
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/v1/server/handlers/v1/tasks/get_point_metrics.go
View File

@@ -78,11 +78,11 @@ func convertToGenMetrics(metrics []*sqlcv1.GetTaskPointMetricsRow) []gen.V1TaskP
converted := make([]gen.V1TaskPointMetric, len(metrics))
for i, metric := range metrics {
if metric == nil || !metric.Bucket2.Valid {
if metric == nil || !metric.MinuteBucket.Valid {
continue
}
timeMinute := metric.Bucket2.Time.UTC()
timeMinute := metric.MinuteBucket.Time.UTC()
converted[i] = gen.V1TaskPointMetric{
FAILED: int(metric.FailedCount),

13
pkg/repository/sqlcv1/olap.sql
View File

@@ -1307,18 +1307,17 @@ ORDER BY r.inserted_at DESC, r.run_id DESC;
SELECT
DATE_BIN(
COALESCE(sqlc.narg('interval')::INTERVAL, '1 minute'),
task_inserted_at,
inserted_at,
TIMESTAMPTZ '1970-01-01 00:00:00+00'
) :: TIMESTAMPTZ AS bucket_2,
) :: TIMESTAMPTZ AS minute_bucket,
COUNT(*) FILTER (WHERE readable_status = 'COMPLETED') AS completed_count,
COUNT(*) FILTER (WHERE readable_status = 'FAILED') AS failed_count
FROM
v1_task_events_olap
FROM v1_statuses_olap
WHERE
tenant_id = @tenantId::UUID
AND task_inserted_at BETWEEN @createdAfter::TIMESTAMPTZ AND @createdBefore::TIMESTAMPTZ
GROUP BY bucket_2
ORDER BY bucket_2;
AND inserted_at BETWEEN @createdAfter::TIMESTAMPTZ AND @createdBefore::TIMESTAMPTZ
GROUP BY minute_bucket
ORDER BY minute_bucket;
-- name: GetTenantStatusMetrics :one

17
pkg/repository/sqlcv1/olap.sql.go
View File

@@ -1089,18 +1089,17 @@ const getTaskPointMetrics = `-- name: GetTaskPointMetrics :many
SELECT
DATE_BIN(
COALESCE($1::INTERVAL, '1 minute'),
task_inserted_at,
inserted_at,
TIMESTAMPTZ '1970-01-01 00:00:00+00'
) :: TIMESTAMPTZ AS bucket_2,
) :: TIMESTAMPTZ AS minute_bucket,
COUNT(*) FILTER (WHERE readable_status = 'COMPLETED') AS completed_count,
COUNT(*) FILTER (WHERE readable_status = 'FAILED') AS failed_count
FROM
v1_task_events_olap
FROM v1_statuses_olap
WHERE
tenant_id = $2::UUID
AND task_inserted_at BETWEEN $3::TIMESTAMPTZ AND $4::TIMESTAMPTZ
GROUP BY bucket_2
ORDER BY bucket_2
AND inserted_at BETWEEN $3::TIMESTAMPTZ AND $4::TIMESTAMPTZ
GROUP BY minute_bucket
ORDER BY minute_bucket
`
type GetTaskPointMetricsParams struct {
@@ -1111,7 +1110,7 @@ type GetTaskPointMetricsParams struct {
}
type GetTaskPointMetricsRow struct {
Bucket2 pgtype.Timestamptz `json:"bucket_2"`
MinuteBucket pgtype.Timestamptz `json:"minute_bucket"`
CompletedCount int64 `json:"completed_count"`
FailedCount int64 `json:"failed_count"`
}
@@ -1130,7 +1129,7 @@ func (q *Queries) GetTaskPointMetrics(ctx context.Context, db DBTX, arg GetTaskP
var items []*GetTaskPointMetricsRow
for rows.Next() {
var i GetTaskPointMetricsRow
if err := rows.Scan(&i.Bucket2, &i.CompletedCount, &i.FailedCount); err != nil {
if err := rows.Scan(&i.MinuteBucket, &i.CompletedCount, &i.FailedCount); err != nil {
return nil, err
}
items = append(items, &i)