kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

plan: improve log messages

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-12-09 14:17:19 -05:00
parent 2164875737
commit 2b22d1c981
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plan/plan.go
View File

@ -24,8 +24,9 @@ type Plan struct {
} }
func Load(ctx context.Context, args ...string) (*Plan, error) { func Load(ctx context.Context, args ...string) (*Plan, error) {
// FIXME: universe vendoring log.Ctx(ctx).Debug().Interface("args", args).Msg("loading plan")
// FIXME: universe vendoring
if err := state.VendorUniverse(ctx, ""); err != nil { if err := state.VendorUniverse(ctx, ""); err != nil {
return nil, err return nil, err
} }
@ -121,7 +122,7 @@ func newRunner(pctx *plancontext.Context, s solver.Solver, computed *compiler.Va
ctx := t.Context() ctx := t.Context()
lg := log.Ctx(ctx).With().Str("task", t.Path().String()).Logger() lg := log.Ctx(ctx).With().Str("task", t.Path().String()).Logger()
ctx = lg.WithContext(ctx) ctx = lg.WithContext(ctx)
ctx, span := otel.Tracer("dagger").Start(ctx, fmt.Sprintf("compute: %s", t.Path().String())) ctx, span := otel.Tracer("dagger").Start(ctx, fmt.Sprintf("up: %s", t.Path().String()))
defer span.End() defer span.End()
lg.Info().Str("state", string(environment.StateComputing)).Msg(string(environment.StateComputing)) lg.Info().Str("state", string(environment.StateComputing)).Msg(string(environment.StateComputing))
@ -145,7 +146,7 @@ func newRunner(pctx *plancontext.Context, s solver.Solver, computed *compiler.Va
lg.Info().Dur("duration", time.Since(start)).Str("state", string(environment.StateCompleted)).Msg(string(environment.StateCompleted)) lg.Info().Dur("duration", time.Since(start)).Str("state", string(environment.StateCompleted)).Msg(string(environment.StateCompleted))
// If the result is not concrete, there's nothing to merge. // If the result is not concrete (e.g. empty value), there's nothing to merge.
if !result.IsConcrete() { if !result.IsConcrete() {
return nil return nil
} }