Skip to content

Commit 9e30558

Browse files
committed
fix: Remove invocationID from metrics constructor calls
1 parent fd813fc commit 9e30558

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

scheduler/metrics/metrics.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var (
2929
once sync.Once
3030
)
3131

32-
func NewMetrics(invocationID string) *Metrics {
32+
func NewMetrics() *Metrics {
3333
once.Do(func() {
3434
resources, _ = otel.Meter(ResourceName).Int64Counter(resourcesMetricName,
3535
metric.WithDescription("Number of resources synced for a table"),
@@ -83,7 +83,7 @@ type measurement struct {
8383
duration *durationMeasurement
8484
}
8585

86-
func (m *Metrics) NewSelector(clientID, tableName string) Selector {
86+
func (*Metrics) NewSelector(clientID, tableName string) Selector {
8787
return Selector{
8888
Set: attribute.NewSet(
8989
attribute.Key("sync.table.name").String(tableName),

scheduler/metrics/metrics_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func TestMetrics(t *testing.T) {
11-
m := NewMetrics("test_invocation_id")
11+
m := NewMetrics()
1212

1313
m.measurements["test_table_1"] = tableMeasurements{
1414
clients: map[string]*measurement{

scheduler/queue/scheduler_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@ func testResolver(_ context.Context, _ schema.ClientMeta, parent *schema.Resourc
4545

4646
func TestScheduler(t *testing.T) {
4747
nopLogger := zerolog.Nop()
48-
invocationID := uuid.New().String()
49-
m := metrics.NewMetrics(invocationID)
50-
scheduler := NewShuffleQueueScheduler(nopLogger, m, int64(0), WithWorkerCount(1000), WithInvocationID(invocationID))
48+
m := metrics.NewMetrics()
49+
scheduler := NewShuffleQueueScheduler(nopLogger, m, int64(0), WithWorkerCount(1000), WithInvocationID(uuid.New().String()))
5150
tableClients := []WorkUnit{
5251
{
5352
Table: &schema.Table{

scheduler/scheduler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func (s *Scheduler) Sync(ctx context.Context, client schema.ClientMeta, tables s
208208
}
209209

210210
syncClient := &syncClient{
211-
metrics: metrics.NewMetrics(s.invocationID),
211+
metrics: metrics.NewMetrics(),
212212
tables: tables,
213213
client: client,
214214
scheduler: s,

0 commit comments

Comments
 (0)