From 6f5c47154549dd9f697f4a44547eda5197d40a52 Mon Sep 17 00:00:00 2001 From: Andrew Dye Date: Fri, 19 Jan 2024 18:50:50 -0800 Subject: [PATCH] Use logger with formatter (#4747) --- flyteadmin/dataproxy/service.go | 4 ++-- flyteadmin/scheduler/executor/executor_impl.go | 6 +++--- flyteadmin/tests/bootstrap.go | 4 ++-- flyteadmin/tests/execution_test.go | 2 +- flytecopilot/cmd/root.go | 2 +- flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go | 2 +- flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go | 2 +- flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go | 2 +- flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go | 2 +- flyteplugins/go/tasks/plugins/webapi/athena/plugin.go | 2 +- flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go | 2 +- flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go | 2 +- flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go | 2 +- flytepropeller/cmd/kubectl-flyte/cmd/root.go | 2 +- flytepropeller/pkg/controller/nodes/executor.go | 2 +- .../pkg/controller/nodes/subworkflow/launchplan/admin.go | 2 +- flytepropeller/pkg/controller/nodes/task/backoff/handler.go | 2 +- flytestdlib/random/weighted_random_list.go | 2 +- flytestdlib/storage/protobuf_store.go | 2 +- 19 files changed, 23 insertions(+), 23 deletions(-) diff --git a/flyteadmin/dataproxy/service.go b/flyteadmin/dataproxy/service.go index 07c8ae1196..3d657c6958 100644 --- a/flyteadmin/dataproxy/service.go +++ b/flyteadmin/dataproxy/service.go @@ -81,10 +81,10 @@ func (s Service) CreateUploadLocation(ctx context.Context, req *service.CreateUp base32Digest := base32.StdEncoding.EncodeToString(req.ContentMd5) base64Digest := base64.StdEncoding.EncodeToString(req.ContentMd5) if hexDigest != metadata.Etag() && base32Digest != metadata.Etag() && base64Digest != metadata.Etag() { - logger.Debug(ctx, "File already exists at location [%v] but hashes do not match", knownLocation) + logger.Debugf(ctx, "File already exists at location [%v] but hashes do not match", knownLocation) return nil, errors.NewFlyteAdminErrorf(codes.AlreadyExists, "file already exists at location [%v], specify a matching hash if you wish to rewrite", knownLocation) } - logger.Debug(ctx, "File already exists at location [%v] but allowing rewrite", knownLocation) + logger.Debugf(ctx, "File already exists at location [%v] but allowing rewrite", knownLocation) } } diff --git a/flyteadmin/scheduler/executor/executor_impl.go b/flyteadmin/scheduler/executor/executor_impl.go index de711ff85e..30ab7f0677 100644 --- a/flyteadmin/scheduler/executor/executor_impl.go +++ b/flyteadmin/scheduler/executor/executor_impl.go @@ -62,7 +62,7 @@ func (w *executor) Execute(ctx context.Context, scheduledTime time.Time, s model }, scheduledTime) if err != nil { - logger.Error(ctx, "failed to generate execution identifier for schedule %+v due to %v", s, err) + logger.Errorf(ctx, "failed to generate execution identifier for schedule %+v due to %v", s, err) return err } @@ -107,7 +107,7 @@ func (w *executor) Execute(ctx context.Context, scheduledTime time.Time, s model return false } w.metrics.FailedExecutionCounter.Inc() - logger.Error(ctx, "failed to create execution create request %+v due to %v", executionRequest, err) + logger.Errorf(ctx, "failed to create execution create request %+v due to %v", executionRequest, err) // TODO: Handle the case when admin launch plan state is archived but the schedule is active. // After this bug is fixed in admin https://github.com/flyteorg/flyte/issues/1354 return true @@ -118,7 +118,7 @@ func (w *executor) Execute(ctx context.Context, scheduledTime time.Time, s model }, ) if err != nil && status.Code(err) != codes.AlreadyExists { - logger.Error(ctx, "failed to create execution create request %+v due to %v after all retries", executionRequest, err) + logger.Errorf(ctx, "failed to create execution create request %+v due to %v after all retries", executionRequest, err) return err } w.metrics.SuccessfulExecutionCounter.Inc() diff --git a/flyteadmin/tests/bootstrap.go b/flyteadmin/tests/bootstrap.go index 0bf1714f27..9fd3b27026 100644 --- a/flyteadmin/tests/bootstrap.go +++ b/flyteadmin/tests/bootstrap.go @@ -76,7 +76,7 @@ func truncateAllTablesForTestingOnly() { ctx := context.Background() db, err := repositories.GetDB(ctx, getDbConfig(), getLoggerConfig()) if err != nil { - logger.Fatal(ctx, "Failed to open DB connection due to %v", err) + logger.Fatalf(ctx, "Failed to open DB connection due to %v", err) } sqlDB, err := db.DB() if err != nil { @@ -110,7 +110,7 @@ func populateWorkflowExecutionForTestingOnly(project, domain, name string) { db, err := repositories.GetDB(context.Background(), getDbConfig(), getLoggerConfig()) ctx := context.Background() if err != nil { - logger.Fatal(ctx, "Failed to open DB connection due to %v", err) + logger.Fatalf(ctx, "Failed to open DB connection due to %v", err) } sqlDB, err := db.DB() if err != nil { diff --git a/flyteadmin/tests/execution_test.go b/flyteadmin/tests/execution_test.go index 2f97cfcd05..d0d373a1d5 100644 --- a/flyteadmin/tests/execution_test.go +++ b/flyteadmin/tests/execution_test.go @@ -160,7 +160,7 @@ func populateWorkflowExecutionsForTestingOnly() { db, err := repositories.GetDB(context.Background(), getDbConfig(), getLoggerConfig()) ctx := context.Background() if err != nil { - logger.Fatal(ctx, "Failed to open DB connection due to %v", err) + logger.Fatalf(ctx, "Failed to open DB connection due to %v", err) } sqlDB, err := db.DB() if err != nil { diff --git a/flytecopilot/cmd/root.go b/flytecopilot/cmd/root.go index 3e81f3655b..dd7683ef49 100644 --- a/flytecopilot/cmd/root.go +++ b/flytecopilot/cmd/root.go @@ -184,7 +184,7 @@ func init() { pflag.CommandLine.AddGoFlagSet(flag.CommandLine) err := flag.CommandLine.Parse([]string{}) if err != nil { - logger.Error(context.TODO(), "Error in initializing: %v", err) + logger.Errorf(context.TODO(), "Error in initializing: %v", err) os.Exit(-1) } labeled.SetMetricKeys(contextutils.ProjectKey, contextutils.DomainKey, contextutils.WorkflowIDKey, contextutils.TaskIDKey) diff --git a/flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go b/flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go index 5d194851f2..f79217443c 100644 --- a/flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go +++ b/flyteidl/clients/go/admin/pkce/auth_flow_orchestrator.go @@ -77,7 +77,7 @@ func (f TokenOrchestrator) FetchTokenFromAuthFlow(ctx context.Context) (*oauth2. go func() { if err = server.ListenAndServe(); err != nil && err != http.ErrServerClosed { - logger.Fatal(ctx, "Couldn't start the callback http server on host %v due to %v", redirectURL.Host, + logger.Fatalf(ctx, "Couldn't start the callback http server on host %v due to %v", redirectURL.Host, err) } }() diff --git a/flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go b/flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go index 28bacceaed..e499535e70 100644 --- a/flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go +++ b/flyteplugins/go/tasks/pluginmachinery/ioutils/paths.go @@ -43,7 +43,7 @@ func ConstructCheckpointPath(store storage.ReferenceConstructor, rawOutputPrefix func constructPath(store storage.ReferenceConstructor, base storage.DataReference, suffix string) storage.DataReference { res, err := store.ConstructReference(context.Background(), base, suffix) if err != nil { - logger.Error(context.Background(), "Failed to construct path. Base[%v] Error: %v", base, err) + logger.Errorf(context.Background(), "Failed to construct path. Base[%v] Error: %v", base, err) } return res diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go b/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go index cd3bca93c4..16d44b490e 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/jobs_store.go @@ -272,7 +272,7 @@ func syncBatches(_ context.Context, client Client, handler EventHandler, batchCh for _, jobDetail := range response { job, found := jobIDsMap[*jobDetail.JobId] if !found { - logger.Warn(ctx, "Received an update for unrequested job id [%v]", jobDetail.JobId) + logger.Warnf(ctx, "Received an update for unrequested job id [%v]", jobDetail.JobId) continue } diff --git a/flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go b/flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go index 666b1e741a..62bc5103dc 100644 --- a/flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go +++ b/flyteplugins/go/tasks/plugins/array/awsbatch/monitor.go @@ -49,7 +49,7 @@ func CheckSubTasksState(ctx context.Context, tCtx core.TaskExecutionContext, job // If job isn't currently being monitored (recovering from a restart?), add it to the sync-cache and return if job == nil { - logger.Info(ctx, "Job not found in cache, adding it. [%v]", jobName) + logger.Infof(ctx, "Job not found in cache, adding it. [%v]", jobName) _, err = jobStore.GetOrCreate(jobName, &Job{ ID: *currentState.ExternalJobID, diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go index 826a12e45f..b485589736 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go @@ -128,7 +128,7 @@ func (p Plugin) Delete(ctx context.Context, tCtx webapi.DeleteContext) error { return err } - logger.Info(ctx, "Deleted query execution [%v]", resp) + logger.Infof(ctx, "Deleted query execution [%v]", resp) return nil } diff --git a/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go b/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go index f08d1d15ea..6661550530 100644 --- a/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/bigquery/plugin.go @@ -256,7 +256,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error return err } - logger.Info(ctx, "Cancelled job [%s]", formatJobReference(resourceMeta.JobReference)) + logger.Infof(ctx, "Cancelled job [%s]", formatJobReference(resourceMeta.JobReference)) return nil } diff --git a/flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go b/flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go index 3bd03135dc..3e9b37ea93 100644 --- a/flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/databricks/plugin.go @@ -203,7 +203,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error return err } defer resp.Body.Close() - logger.Info(ctx, "Deleted query execution [%v]", resp) + logger.Infof(ctx, "Deleted query execution [%v]", resp) return nil } diff --git a/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go b/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go index 33334b4003..02bf947fd4 100644 --- a/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/snowflake/plugin.go @@ -179,7 +179,7 @@ func (p Plugin) Delete(ctx context.Context, taskCtx webapi.DeleteContext) error return err } defer resp.Body.Close() - logger.Info(ctx, "Deleted query execution [%v]", resp) + logger.Infof(ctx, "Deleted query execution [%v]", resp) return nil } diff --git a/flytepropeller/cmd/kubectl-flyte/cmd/root.go b/flytepropeller/cmd/kubectl-flyte/cmd/root.go index 4bfabe47b5..f6e2d92110 100644 --- a/flytepropeller/cmd/kubectl-flyte/cmd/root.go +++ b/flytepropeller/cmd/kubectl-flyte/cmd/root.go @@ -24,7 +24,7 @@ func init() { pflag.CommandLine.AddGoFlagSet(flag.CommandLine) err := flag.CommandLine.Parse([]string{}) if err != nil { - logger.Error(context.TODO(), "Error in initializing: %v", err) + logger.Errorf(context.TODO(), "Error in initializing: %v", err) os.Exit(-1) } } diff --git a/flytepropeller/pkg/controller/nodes/executor.go b/flytepropeller/pkg/controller/nodes/executor.go index 6ddde14c71..0c98aeeb5f 100644 --- a/flytepropeller/pkg/controller/nodes/executor.go +++ b/flytepropeller/pkg/controller/nodes/executor.go @@ -583,7 +583,7 @@ func (c *nodeExecutor) attemptRecovery(ctx context.Context, nCtx interfaces.Node state.PreviousNodeExecutionCheckpointURI = storage.DataReference(metadata.TaskNodeMetadata.CheckpointUri) err = nCtx.NodeStateWriter().PutTaskNodeState(state) if err != nil { - logger.Warn(ctx, "failed to save recovered checkpoint uri for [%+v]: [%+v]", + logger.Warnf(ctx, "failed to save recovered checkpoint uri for [%+v]: [%+v]", nCtx.NodeExecutionMetadata().GetNodeExecutionID(), err) } } diff --git a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go index 336f095e90..29de745acf 100644 --- a/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go +++ b/flytepropeller/pkg/controller/nodes/subworkflow/launchplan/admin.go @@ -148,7 +148,7 @@ func (a *adminLaunchPlanExecutor) Launch(ctx context.Context, launchCtx LaunchCo _, err = a.cache.GetOrCreate(executionID.String(), executionCacheItem{WorkflowExecutionIdentifier: *executionID}) if err != nil { - logger.Info(ctx, "Failed to add ExecID [%v] to auto refresh cache", executionID) + logger.Infof(ctx, "Failed to add ExecID [%v] to auto refresh cache", executionID) } return nil diff --git a/flytepropeller/pkg/controller/nodes/task/backoff/handler.go b/flytepropeller/pkg/controller/nodes/task/backoff/handler.go index 757c2420f8..fc890c7a09 100644 --- a/flytepropeller/pkg/controller/nodes/task/backoff/handler.go +++ b/flytepropeller/pkg/controller/nodes/task/backoff/handler.go @@ -49,7 +49,7 @@ func (b *SimpleBackOffBlocker) reset() { } func (b *SimpleBackOffBlocker) backOff(ctx context.Context) time.Duration { - logger.Debug(ctx, "BackOff params [BackOffBaseSecond: %v] [BackOffExponent: %v] [MaxBackOffDuration: %v]", + logger.Debugf(ctx, "BackOff params [BackOffBaseSecond: %v] [BackOffExponent: %v] [MaxBackOffDuration: %v]", b.BackOffBaseSecond, b.BackOffExponent, b.MaxBackOffDuration) backOffDuration := time.Duration(time.Second.Nanoseconds() * int64(math.Pow(float64(b.BackOffBaseSecond), diff --git a/flytestdlib/random/weighted_random_list.go b/flytestdlib/random/weighted_random_list.go index 7a0d44bbaa..d9e23943a4 100644 --- a/flytestdlib/random/weighted_random_list.go +++ b/flytestdlib/random/weighted_random_list.go @@ -84,7 +84,7 @@ func NewWeightedRandom(ctx context.Context, entries []Entry) (WeightedRandomList currentTotal += 1.0 / float32(numberOfEntries) } else if e.Weight == 0 { // Entries which have zero weight are ignored - logger.Debug(ctx, "ignoring entry due to empty weight %v", e) + logger.Debugf(ctx, "ignoring entry due to empty weight %v", e) continue } diff --git a/flytestdlib/storage/protobuf_store.go b/flytestdlib/storage/protobuf_store.go index 0fb5bdc5c2..cf5a0c790c 100644 --- a/flytestdlib/storage/protobuf_store.go +++ b/flytestdlib/storage/protobuf_store.go @@ -46,7 +46,7 @@ func (s DefaultProtobufStore) ReadProtobuf(ctx context.Context, reference DataRe defer func() { err = rc.Close() if err != nil { - logger.Warn(ctx, "Failed to close reference [%v]. Error: %v", reference, err) + logger.Warnf(ctx, "Failed to close reference [%v]. Error: %v", reference, err) } }()