Skip to content

Commit 73fcd58

Browse files
authored
feat: Make logs consistent (#59)
#### Summary This makes sure we always use `table` and not `table` and `table_name` (maybe we can improve it in the future with zerolog `With` so we dont need to add it to ever log line) ---
1 parent b5c39d0 commit 73fcd58

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

schema/table.go

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -162,16 +162,16 @@ func (t Table) Resolve(ctx context.Context, meta ClientMeta, syncTime time.Time,
162162
sentry.CurrentHub().Recover(err)
163163
})
164164
stack := string(debug.Stack())
165-
meta.Logger().Error().Interface("error", err).Str("table_name", t.Name).TimeDiff("duration", time.Now(), startTime).Str("stack", stack).Msg("table resolver finished with panic")
165+
meta.Logger().Error().Interface("error", err).Str("table", t.Name).TimeDiff("duration", time.Now(), startTime).Str("stack", stack).Msg("table resolver finished with panic")
166166
}
167167
close(res)
168168
}()
169-
meta.Logger().Debug().Str("table_name", t.Name).Msg("table resolver started")
169+
meta.Logger().Debug().Str("table", t.Name).Msg("table resolver started")
170170
if err := t.Resolver(ctx, meta, parent, res); err != nil {
171-
meta.Logger().Error().Str("table_name", t.Name).TimeDiff("duration", time.Now(), startTime).Err(err).Msg("table resolver finished with error")
171+
meta.Logger().Error().Str("table", t.Name).TimeDiff("duration", time.Now(), startTime).Err(err).Msg("table resolver finished with error")
172172
return
173173
}
174-
meta.Logger().Debug().Str("table_name", t.Name).TimeDiff("duration", time.Now(), startTime).Msg("table resolver finished successfully")
174+
meta.Logger().Debug().Str("table", t.Name).TimeDiff("duration", time.Now(), startTime).Msg("table resolver finished successfully")
175175
}()
176176
totalResources := 0
177177
for elem := range res {
@@ -184,20 +184,21 @@ func (t Table) Resolve(ctx context.Context, meta ClientMeta, syncTime time.Time,
184184
resource := NewResourceData(&t, parent, syncTime, objects[i])
185185
if t.PreResourceResolver != nil {
186186
if err := t.PreResourceResolver(ctx, meta, resource); err != nil {
187-
meta.Logger().Error().Str("table_name", t.Name).Err(err).Msg("pre resource resolver failed")
187+
meta.Logger().Error().Str("table", t.Name).Err(err).Msg("pre resource resolver failed")
188188
} else {
189-
meta.Logger().Trace().Str("table_name", t.Name).Msg("pre resource resolver finished successfully")
189+
meta.Logger().Trace().Str("table", t.Name).Msg("pre resource resolver finished successfully")
190190
}
191191
}
192192
t.resolveColumns(ctx, meta, resource)
193193
if t.PostResourceResolver != nil {
194-
meta.Logger().Trace().Str("table_name", t.Name).Msg("post resource resolver started")
194+
meta.Logger().Trace().Str("table", t.Name).Msg("post resource resolver started")
195195
if err := t.PostResourceResolver(ctx, meta, resource); err != nil {
196-
meta.Logger().Error().Str("table_name", t.Name).Stack().Err(err).Msg("post resource resolver finished with error")
196+
meta.Logger().Error().Str("table", t.Name).Stack().Err(err).Msg("post resource resolver finished with error")
197197
} else {
198-
meta.Logger().Trace().Str("table_name", t.Name).Msg("post resource resolver finished successfully")
198+
meta.Logger().Trace().Str("table", t.Name).Msg("post resource resolver finished successfully")
199199
}
200200
}
201+
201202
resolvedResources <- resource
202203
for _, rel := range t.Relations {
203204
totalResources += rel.Resolve(ctx, meta, syncTime, resource, resolvedResources)
@@ -210,22 +211,22 @@ func (t Table) Resolve(ctx context.Context, meta ClientMeta, syncTime time.Time,
210211
func (t Table) resolveColumns(ctx context.Context, meta ClientMeta, resource *Resource) {
211212
for _, c := range t.Columns {
212213
if c.Resolver != nil {
213-
meta.Logger().Trace().Str("column_name", c.Name).Str("table_name", t.Name).Msg("column resolver custom started")
214+
meta.Logger().Trace().Str("column_name", c.Name).Str("table", t.Name).Msg("column resolver custom started")
214215
if err := c.Resolver(ctx, meta, resource, c); err != nil {
215-
meta.Logger().Error().Str("column_name", c.Name).Str("table_name", t.Name).Err(err).Msg("column resolver finished with error")
216+
meta.Logger().Error().Str("column_name", c.Name).Str("table", t.Name).Err(err).Msg("column resolver finished with error")
216217
}
217-
meta.Logger().Trace().Str("column_name", c.Name).Str("table_name", t.Name).Msg("column resolver finished successfully")
218+
meta.Logger().Trace().Str("column_name", c.Name).Str("table", t.Name).Msg("column resolver finished successfully")
218219
} else {
219-
meta.Logger().Trace().Str("column_name", c.Name).Str("table_name", t.Name).Msg("column resolver default started")
220+
meta.Logger().Trace().Str("column_name", c.Name).Str("table", t.Name).Msg("column resolver default started")
220221
// base use case: try to get column with CamelCase name
221222
v := funk.Get(resource.Item, strcase.ToCamel(c.Name), funk.WithAllowZero())
222223
if v != nil {
223224
if err := resource.Set(c.Name, v); err != nil {
224-
meta.Logger().Error().Str("column_name", c.Name).Str("table_name", t.Name).Err(err).Msg("column resolver default finished with error")
225+
meta.Logger().Error().Str("column_name", c.Name).Str("table", t.Name).Err(err).Msg("column resolver default finished with error")
225226
}
226-
meta.Logger().Trace().Str("column_name", c.Name).Str("table_name", t.Name).Msg("column resolver default finished successfully")
227+
meta.Logger().Trace().Str("column_name", c.Name).Str("table", t.Name).Msg("column resolver default finished successfully")
227228
} else {
228-
meta.Logger().Trace().Str("column_name", c.Name).Str("table_name", t.Name).Msg("column resolver default finished successfully with nil")
229+
meta.Logger().Trace().Str("column_name", c.Name).Str("table", t.Name).Msg("column resolver default finished successfully with nil")
229230
}
230231
}
231232
}

0 commit comments

Comments
 (0)