add toolexec

Author: grambbledook

cmd/go-cache-plugin/commands.go

@@ -10,11 +10,13 @@ import (
 	"errors"
 	"fmt"
 	"github.com/grafana/go-cache-plugin/lib/otel"
+	"github.com/grafana/go-cache-plugin/lib/toolexec"
 	"io"
 	"log"
 	"net"
 	"net/http"
 	"os"
+	"os/exec"
 	"os/signal"
 	"strconv"
 	"strings"
@@ -78,7 +80,12 @@ var serveFlags struct {
 	SumDB      string `flag:"sumdb,default=$GOCACHE_SUMDB,SumDB servers to proxy for (comma-separated)"`
 }
 
-var logger *log.Logger
+var toolexecFlags struct {
+	LogFile              string `flag:"log-file,default=trace.log,File used for logs"`
+	TracingEnabled       bool   `flag:"tracing,default=false,Enable tracing (optional)"`
+	TracingContext       string `flag:"context,default=runId:runAttempt:jobName:stepName:stepNumber,Tracing params"`
+	OtelCollectorAddress string `flag:"otel-collector,default,OTEL collector address (optional)"`
+}
 
 func noopClose(context.Context) error { return nil }
 
@@ -189,7 +196,9 @@ func runConnect(env *command.Env, plugin string) error {
 
 	ctx := env.Context()
 	shutdownTracer, reportSpan, err := initTracing(ctx)
-
+	if err != nil {
+		return err
+	}
 	addr := plugin
 	// If the caller has not specified a host/port, then likely this is an older usage which only specifies port
 	if !strings.Contains(plugin, ":") {
@@ -224,6 +233,27 @@ func runConnect(env *command.Env, plugin string) error {
 	return nil
 }
 
+func runToolexec(env *command.Env) error {
+	ctx := env.Context()
+	shutdownTracer, tracingContext, err := initModTracing(ctx)
+	if err != nil {
+		return err
+	}
+	defer shutdownTracer(ctx)
+
+	tool := os.Args[1]
+	args := os.Args[2:]
+
+	pkg := toolexec.GetPackage(os.Args)
+
+	_, span := tracingContext.SpanWithContext(ctx, fmt.Sprintf("%s: %s", toolexec.GetTool(tool), pkg))
+	defer span.End()
+	cmd := exec.Command(tool, args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
+
 func initTracing(ctx context.Context) (func(context.Context) error, func([]byte), error) {
 	if !flags.TracingEnabled {
 		return func(context.Context) error { return nil }, func([]byte) {}, nil

cmd/go-cache-plugin/go-cache-plugin.go

@@ -74,6 +74,11 @@ This mode bridges stdin/stdout to a cache server (see the "serve" command)
 listening on the specified port.`,
 				Run: command.Adapt(runConnect),
 			},
+			{
+				Name:     "toolexec",
+				SetFlags: command.Flags(flax.MustBind, &toolexecFlags),
+				Run:      command.Adapt(runToolexec),
+			},
 			command.HelpCommand(helpTopics),
 			command.VersionCommand(),
 		},

lib/toolexec/toolexec.go

@@ -0,0 +1,28 @@
+package toolexec
+
+import "strings"
+
+const (
+	Asm     = "asm"
+	Compile = "compile"
+	Link    = "link"
+)
+
+func GetTool(tool string) string {
+	parts := strings.Split(tool, "/")
+	return parts[len(parts)-1]
+}
+
+func GetPackage(args []string) string {
+	for i, v := range args {
+		if i+1 == len(args) {
+			break
+		}
+
+		if v == "-p" {
+			return args[i+1]
+		}
+	}
+
+	return "unknown"
+}