Fix broken merge results

DataDog · Dec 19, 2024 · 5e6051d · 5e6051d
1 parent 9087653
commit 5e6051d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/cmd/server.go b/internal/cmd/server.go
@@ -52,12 +52,12 @@ var Server = &cli.Command{
 			Name:        "build-flags",
 			Usage:       "Specify the 'go build' flags to use when resolving packages. This is specified as a YAML array and must start with a valid go subcommand (e.g, 'build').",
 			DefaultText: "Looked up the process hierarchy",
-			Action: func(_ *cli.Context, val string) error {
+			Action: func(ctx *cli.Context, val string) error {
 				var args []string
 				if err := yaml.Unmarshal([]byte(val), &args); err != nil {
 					return cli.Exit(fmt.Errorf("invalid -build-flags value: %w", err), 2)
 				}
-				goflags.SetFlags(".", args)
+				goflags.SetFlags(ctx.Context, ".", args)
 				return nil
 			},
 		},

diff --git a/internal/toolexec/aspect/onlink.go b/internal/toolexec/aspect/onlink.go
@@ -39,7 +39,7 @@ func (Weaver) OnLink(ctx context.Context, cmd *proxy.LinkCommand) error {
 				continue
 			}
 
-			log.Tracef("Resolving %s dependency on %q...\n", linkdeps.Filename, depPath)
+			log.Trace().Str("import-path", depPath).Msg("Resolving " + linkdeps.Filename + " dependency")
 			deps, err := resolvePackageFiles(ctx, depPath, cmd.WorkDir)
 			if err != nil {
 				return fmt.Errorf("resolving %q: %w", depPath, err)