Skip to content

fix: Properly handle relational tables metrics #1788

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

Merged
kodiakhq merged 3 commits into from
Jul 9, 2024
Merged

fix: Properly handle relational tables metrics #1788

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1c4631
fix: Properly handle relational tables metrics
erezrokah Jul 8, 2024
592c47e
style: Fix lint
erezrokah Jul 9, 2024
f7c25d0
Merge branch 'main' into fix/relations_metrics
kodiakhq[bot] Jul 9, 2024
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
35 changes: 28 additions & 7 deletions scheduler/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package scheduler

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

Expand All @@ -17,12 +18,16 @@ type Metrics struct {
}

type OtelMeters struct {
resources metric.Int64Counter
errors metric.Int64Counter
panics metric.Int64Counter
startTime metric.Int64Counter
endTime metric.Int64Counter
attributes []attribute.KeyValue
resources metric.Int64Counter
errors metric.Int64Counter
panics metric.Int64Counter
startTime metric.Int64Counter
started bool
startedLock sync.Mutex
endTime metric.Int64Counter
previousEndTime int64
previousEndTimeLock sync.Mutex
attributes []attribute.KeyValue
}

type TableClientMetrics struct {
Expand Down Expand Up @@ -234,6 +239,13 @@ func (m *TableClientMetrics) OtelStartTime(ctx context.Context, start time.Time)
return
}

// If we have already started, don't start again. This can happen for relational tables that are resolved multiple times (per parent resource)
m.otelMeters.startedLock.Lock()
defer m.otelMeters.startedLock.Unlock()
if m.otelMeters.started {
return
}
m.otelMeters.started = true
m.otelMeters.startTime.Add(ctx, start.UnixNano(), metric.WithAttributes(m.otelMeters.attributes...))
}

Expand All @@ -242,5 +254,14 @@ func (m *TableClientMetrics) OtelEndTime(ctx context.Context, end time.Time) {
return
}

m.otelMeters.endTime.Add(ctx, end.UnixNano(), metric.WithAttributes(m.otelMeters.attributes...))
m.otelMeters.previousEndTimeLock.Lock()
defer m.otelMeters.previousEndTimeLock.Unlock()
val := end.UnixNano()
// If we got another end time to report, use the latest value. This can happen for relational tables that are resolved multiple times (per parent resource)
if m.otelMeters.previousEndTime != 0 {
m.otelMeters.endTime.Add(ctx, val-m.otelMeters.previousEndTime, metric.WithAttributes(m.otelMeters.attributes...))
} else {
m.otelMeters.endTime.Add(ctx, val, metric.WithAttributes(m.otelMeters.attributes...))
}
m.otelMeters.previousEndTime = val
}