From e01ac8ba76fb5404164a447d95144fcf05ed1744 Mon Sep 17 00:00:00 2001 From: DeviceInfra Date: Thu, 13 Feb 2025 16:50:19 -0800 Subject: [PATCH] Internal change PiperOrigin-RevId: 726687425 --- src/devtools/rbe/casuploader/main.go | 18 +++++++++--------- src/devtools/rbe/casuploader/uploader/dir.go | 10 +++++----- src/devtools/rbe/casuploader/uploader/file.go | 2 +- src/devtools/rbe/casuploader/uploader/zip.go | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/devtools/rbe/casuploader/main.go b/src/devtools/rbe/casuploader/main.go index 888ef7197..efc8d2b1f 100644 --- a/src/devtools/rbe/casuploader/main.go +++ b/src/devtools/rbe/casuploader/main.go @@ -114,7 +114,7 @@ func main() { ToolVersion: version, } if ctxMd, err := contextmd.WithMetadata(ctx, metadata); err != nil { - log.Infof("Failed to add metadata to context: %v", err) + log.InfoContextf(ctxMd, "Failed to add metadata to context: %v", err) } else { ctx = ctxMd } @@ -124,14 +124,14 @@ func main() { sigChan := make(chan os.Signal, 1) signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM) <-sigChan - log.Infoln("Interrupted, exiting...") + log.InfoContextf(ctx, "Interrupted, exiting...\n") cancel() time.Sleep(3 * time.Second) os.Exit(1) }() if err := checkFlags(); err != nil { - log.Exit(err) + log.ExitContext(ctx, err) } start := time.Now() @@ -139,7 +139,7 @@ func main() { // Create a new RBE client. client, err := rbeclient.New(ctx, rbeclient.Opts{Instance: *casInstance, ServiceAddress: *casAddr, ServiceAccountJSON: *serviceAccount, UseApplicationDefault: *useADC, CASConcurrency: *casConcurrency}) if err != nil { - log.Exit(err) + log.ExitContext(ctx, err) } defer client.Close() @@ -151,20 +151,20 @@ func main() { zipUploader := uploader.NewZipUploader(uploaderConfig, *zipPath) rootDigest, err = zipUploader.DoUpload() if err != nil { - log.Exitf("Failed to upload the zip archive to CAS: %v", err) + log.ExitContextf(ctx, "Failed to upload the zip archive to CAS: %v", err) } } else if *dirPath != "" { dirUploader := uploader.NewDirUploader(uploaderConfig, *dirPath, nil) rootDigest, err = dirUploader.DoUpload() if err != nil { - log.Exitf("Failed to upload the directory to CAS: %v", err) + log.ExitContextf(ctx, "Failed to upload the directory to CAS: %v", err) } path = *dirPath } else if *filePath != "" { fileUploader := uploader.NewFileUploader(uploaderConfig, *filePath) rootDigest, err = fileUploader.DoUpload() if err != nil { - log.Exitf("Failed to upload the file to CAS: %v", err) + log.ExitContextf(ctx, "Failed to upload the file to CAS: %v", err) } path = *filePath } @@ -175,12 +175,12 @@ func main() { } elapsedTime := time.Since(start) metrics.TimeMs = elapsedTime.Milliseconds() - log.Infof("Uploaded '%s' to RBE instance %s, root digest: %s. E2E time: %v\n", path, *casInstance, output, elapsedTime) + log.InfoContextf(ctx, "Uploaded '%s' to RBE instance %s, root digest: %s. E2E time: %v\n", path, *casInstance, output, elapsedTime) if *dumpMetrics != "" { metrics.Digest = output if err := metrics.Dump(*dumpMetrics); err != nil { - log.Errorf("Failed to dump metrics to %s: %v", *dumpMetrics, err) + log.ErrorContextf(ctx, "Failed to dump metrics to %s: %v", *dumpMetrics, err) } } } diff --git a/src/devtools/rbe/casuploader/uploader/dir.go b/src/devtools/rbe/casuploader/uploader/dir.go index 4b95261fa..f7962b12f 100644 --- a/src/devtools/rbe/casuploader/uploader/dir.go +++ b/src/devtools/rbe/casuploader/uploader/dir.go @@ -76,7 +76,7 @@ func (du *DirUploader) DoUpload() (digest.Digest, error) { printEntriesStats(uploadEntries, allEntriesMessage, du.CommonConfig.metrics) err = du.exportUploadFilesDetails(rootDigest, uploadEntries) if err != nil { - log.Warningf("failed to export upload files info: %v", err) + log.WarningContextf(du.CommonConfig.ctx, "failed to export upload files info: %v", err) } // Check with CAS service to find out all files that do not exist remotely, and only load these @@ -109,7 +109,7 @@ func (du *DirUploader) chunkAndUpload() (digest.Digest, error) { targetDir := createTmpDir() defer func() { if err := os.RemoveAll(targetDir); err != nil { - log.Errorf("Failed to remove tmp dir: %v\n", err) + log.ErrorContextf(du.CommonConfig.ctx, "Failed to remove tmp dir: %v\n", err) } }() @@ -166,7 +166,7 @@ func (du *DirUploader) chunkFiles(chunksDir string, paths []string) ([]chunkerut } elapsedTime := time.Since(start) du.CommonConfig.metrics.ChunkTimeMs = elapsedTime.Milliseconds() - log.Infof("Chunked %d files. Elapsed time: %v\n", len(paths), elapsedTime) + log.InfoContextf(du.CommonConfig.ctx, "Chunked %d files. Elapsed time: %v\n", len(paths), elapsedTime) return chunksIndexEntries, nil } @@ -202,7 +202,7 @@ func (du *DirUploader) upload(uploadInfos []*uploadinfo.Entry) error { if err == nil { du.CommonConfig.metrics.UploadedSizeBytes = size du.CommonConfig.metrics.UploadedEntries = len(digests) - log.Infof("Uploaded %d blobs, %d bytes. Elapsed time: %v\n", len(digests), size, time.Since(start)) + log.InfoContextf(du.CommonConfig.ctx, "Uploaded %d blobs, %d bytes. Elapsed time: %v\n", len(digests), size, time.Since(start)) } return err } @@ -301,6 +301,6 @@ func (du *DirUploader) exportUploadFilesDetails(root digest.Digest, entries []*u if err = ioutil.WriteFile(path, outputContent, 0644); err != nil { return fmt.Errorf("failed to export upload entries info to %s: %v", path, err) } - log.Infof("exported file digests to %s, size of files: %d", path, len(files)) + log.InfoContextf(du.CommonConfig.ctx, "exported file digests to %s, size of files: %d", path, len(files)) return nil } diff --git a/src/devtools/rbe/casuploader/uploader/file.go b/src/devtools/rbe/casuploader/uploader/file.go index 0f225a131..50843200a 100644 --- a/src/devtools/rbe/casuploader/uploader/file.go +++ b/src/devtools/rbe/casuploader/uploader/file.go @@ -31,7 +31,7 @@ func (fu *FileUploader) DoUpload() (digest.Digest, error) { targetDir := createTmpDir() defer func() { if err := os.RemoveAll(targetDir); err != nil { - log.Errorf("Failed to remove tmp dir: %v\n", err) + log.ErrorContextf(fu.CommonConfig.ctx, "Failed to remove tmp dir: %v\n", err) } }() diff --git a/src/devtools/rbe/casuploader/uploader/zip.go b/src/devtools/rbe/casuploader/uploader/zip.go index 39a2b713b..365c19b82 100644 --- a/src/devtools/rbe/casuploader/uploader/zip.go +++ b/src/devtools/rbe/casuploader/uploader/zip.go @@ -57,11 +57,11 @@ func (zu *ZipUploader) DoUpload() (digest.Digest, error) { targetDir := createTmpDir() defer func() { if err := os.RemoveAll(targetDir); err != nil { - log.Errorf("Failed to remove tmp dir: %v\n", err) + log.ErrorContextf(zu.CommonConfig.ctx, "Failed to remove tmp dir: %v\n", err) } }() - log.Infof("Extracting %s to %s with digests\n", zu.zipPath, targetDir) + log.InfoContextf(zu.CommonConfig.ctx, "Extracting %s to %s with digests\n", zu.zipPath, targetDir) unarchiver, err := newZipUnarchiver(zu.zipPath, targetDir) if err != nil {