Skip to content

fix prune log message; ensure prune gets run UUID #377

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
merged 1 commit into from
Nov 21, 2024
Merged

fix prune log message; ensure prune gets run UUID #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func dumpCmd(passedExecs execs, cmdConfig *cmdConfiguration) (*cobra.Command, er
return fmt.Errorf("error running dump: %w", err)
}
if retention != "" {
if err := executor.Prune(tracerCtx, core.PruneOptions{Targets: targets, Retention: retention}); err != nil {
if err := executor.Prune(tracerCtx, core.PruneOptions{Targets: targets, Retention: retention, Run: uid}); err != nil {
dumpSpan.SetStatus(codes.Error, fmt.Sprintf("error running prune: %v", err))
return fmt.Errorf("error running prune: %w", err)
}
Expand Down
5 changes: 2 additions & 3 deletions cmd/dump_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,10 @@ func TestDumpCmd(t *testing.T) {
})).Return(nil)
if tt.expectedPruneOptions != nil {
m.On("Prune", mock.MatchedBy(func(pruneOpts core.PruneOptions) bool {
diff := deep.Equal(pruneOpts, *tt.expectedPruneOptions)
if diff == nil {
if equalIgnoreFields(pruneOpts, *tt.expectedPruneOptions, []string{"Run"}) {
return true
}
t.Errorf("pruneOpts compare failed: %v", diff)
t.Errorf("pruneOpts compare failed: %#v %#v", pruneOpts, tt.expectedPruneOptions)
return false
})).Return(nil)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/core/prune.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func pruneTarget(ctx context.Context, logger *logrus.Entry, target storage.Stora
ctx, span := util.GetTracerFromContext(ctx).Start(ctx, fmt.Sprintf("pruneTarget %s", target.URL()))
defer span.End()

logger.Debugf("pruning target %s", target)
logger.Debugf("pruning target %s", target.URL())
files, err := target.ReadDir(ctx, ".", logger)
if err != nil {
span.SetStatus(codes.Error, fmt.Sprintf("failed to read directory: %v", err))
Expand Down
Loading