feat: add trace for executables #744
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,7 +3,9 @@ package cmd | |||||
| import ( | ||||||
| "context" | ||||||
|
|
||||||
| "github.com/notaryproject/notation-go/log" | ||||||
| "github.com/notaryproject/notation/internal/trace" | ||||||
| credentialstrace "github.com/oras-project/oras-credentials-go/trace" | ||||||
| "github.com/sirupsen/logrus" | ||||||
| "github.com/spf13/cobra" | ||||||
| "github.com/spf13/pflag" | ||||||
|
|
@@ -44,9 +46,27 @@ func (opts *LoggingFlagOpts) ApplyFlags(fs *pflag.FlagSet) { | |||||
| // SetLoggerLevel sets up the logger based on common options. | ||||||
| func (opts *LoggingFlagOpts) SetLoggerLevel(ctx context.Context) context.Context { | ||||||
|
There was a problem hiding this comment. A question: Do we need to rename this function given that it now does more than setting logger level? 🤔 @JeyJeyGao There was a problem hiding this comment. Renamed the function to |
||||||
| if opts.Debug { | ||||||
| ctx = trace.WithLoggerLevel(ctx, logrus.DebugLevel) | ||||||
| } else if opts.Verbose { | ||||||
| ctx = trace.WithLoggerLevel(ctx, logrus.InfoLevel) | ||||||
| } | ||||||
| return withExecutableTrace(ctx) | ||||||
JeyJeyGao marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| } | ||||||
|
|
||||||
| // withExecutableTrace adds tracing for credential helper executables. | ||||||
| func withExecutableTrace(ctx context.Context) context.Context { | ||||||
| logger := log.GetLogger(ctx) | ||||||
JeyJeyGao marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| ctx = credentialstrace.WithExecutableTrace(ctx, &credentialstrace.ExecutableTrace{ | ||||||
| ExecuteStart: func(executableName, action string) { | ||||||
| logger.Debugf("started executing credential helper program %s with action %s", executableName, action) | ||||||
| }, | ||||||
| ExecuteDone: func(executableName, action string, err error) { | ||||||
JeyJeyGao marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
| if err != nil { | ||||||
| logger.Errorf("finished executing credential helper program %s with action %s and got error %w", executableName, action, err) | ||||||
| } else { | ||||||
| logger.Debugf("finished executing credential helper program %s with action %s", executableName, action) | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. changed accordingly |
||||||
| } | ||||||
| }, | ||||||
| }) | ||||||
| return ctx | ||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cleanup is needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ran
go mod tidy.