larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update time and status fields in op events (#1793)

Browse Source 
## Type of change

- [x] 🐹 Trivial/Minor

## Issue(s)

* #1792

## Test Plan

- [x] 💪 Manual
This commit is contained in:
Keepers 2022-12-14 10:43:51 -07:00 committed by GitHub
parent a7a0ebf017
commit a10c1c6bbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/internal/operations/backup.go
View File

@ -9,6 +9,7 @@ import (
"github.com/kopia/kopia/snapshot" "github.com/kopia/kopia/snapshot"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/alcionai/corso/src/internal/common"
"github.com/alcionai/corso/src/internal/connector" "github.com/alcionai/corso/src/internal/connector"
"github.com/alcionai/corso/src/internal/connector/graph" "github.com/alcionai/corso/src/internal/connector/graph"
"github.com/alcionai/corso/src/internal/connector/support" "github.com/alcionai/corso/src/internal/connector/support"
@ -422,18 +423,20 @@ func (op *BackupOperation) createBackupModels(
return errors.Wrap(err, "creating backup model") return errors.Wrap(err, "creating backup model")
} }
dur := op.Results.CompletedAt.Sub(op.Results.StartedAt)
op.bus.Event( op.bus.Event(
ctx, ctx,
events.BackupEnd, events.BackupEnd,
map[string]any{ map[string]any{
events.BackupID: b.ID, events.BackupID: b.ID,
events.DataStored: op.Results.BytesUploaded, events.DataStored: op.Results.BytesUploaded,
events.Duration: op.Results.CompletedAt.Sub(op.Results.StartedAt), events.Duration: dur,
events.EndTime: op.Results.CompletedAt, events.EndTime: common.FormatTime(op.Results.CompletedAt),
events.Resources: op.Results.ResourceOwners, events.Resources: op.Results.ResourceOwners,
events.Service: op.Selectors.PathService().String(), events.Service: op.Selectors.PathService().String(),
events.StartTime: op.Results.StartedAt, events.StartTime: common.FormatTime(op.Results.StartedAt),
events.Status: op.Status, events.Status: op.Status.String(),
}, },
) )

11
src/internal/operations/restore.go
View File

@ -9,6 +9,7 @@ import (
multierror "github.com/hashicorp/go-multierror" multierror "github.com/hashicorp/go-multierror"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/alcionai/corso/src/internal/common"
"github.com/alcionai/corso/src/internal/connector/support" "github.com/alcionai/corso/src/internal/connector/support"
"github.com/alcionai/corso/src/internal/data" "github.com/alcionai/corso/src/internal/data"
D "github.com/alcionai/corso/src/internal/diagnostics" D "github.com/alcionai/corso/src/internal/diagnostics"
@ -232,21 +233,23 @@ func (op *RestoreOperation) persistResults(
op.Results.ItemsWritten = opStats.gc.Successful op.Results.ItemsWritten = opStats.gc.Successful
op.Results.ResourceOwners = opStats.resourceCount op.Results.ResourceOwners = opStats.resourceCount
dur := op.Results.CompletedAt.Sub(op.Results.StartedAt)
op.bus.Event( op.bus.Event(
ctx, ctx,
events.RestoreEnd, events.RestoreEnd,
map[string]any{ map[string]any{
events.BackupID: op.BackupID, events.BackupID: op.BackupID,
events.DataRetrieved: op.Results.BytesRead, events.DataRetrieved: op.Results.BytesRead,
events.Duration: op.Results.CompletedAt.Sub(op.Results.StartedAt), events.Duration: dur,
events.EndTime: op.Results.CompletedAt, events.EndTime: common.FormatTime(op.Results.CompletedAt),
events.ItemsRead: op.Results.ItemsRead, events.ItemsRead: op.Results.ItemsRead,
events.ItemsWritten: op.Results.ItemsWritten, events.ItemsWritten: op.Results.ItemsWritten,
events.Resources: op.Results.ResourceOwners, events.Resources: op.Results.ResourceOwners,
events.RestoreID: opStats.restoreID, events.RestoreID: opStats.restoreID,
events.Service: op.Selectors.Service.String(), events.Service: op.Selectors.Service.String(),
events.StartTime: op.Results.StartedAt, events.StartTime: common.FormatTime(op.Results.StartedAt),
events.Status: op.Status, events.Status: op.Status.String(),
}, },
) )