Merge branch 'main' of ssh://github.com/moshebe/gtrace

Author: moshebe

README.md

@@ -65,7 +65,7 @@ gtrace get --project production-a,production-b 5e26a889fa12da351beee9ea16ce0a65
 
 Format trace spans by a specific template:
 ```shell
-gtrace format --input /tmp/trace.json --template "{{ .Name }}, {{ .Duration }}"
+gtrace format -f /tmp/trace.json --template "{{ .Name }}, {{ .Duration }}"
 ```
 
 Query traces by multiple filters from the last 3 hours:

internal/cli/cli.go

@@ -38,10 +38,3 @@ func read(path string) ([]byte, error) {
 	}
 	return os.ReadFile(path)
 }
-
-func writer(path string) (io.WriteCloser, error) {
-	if path == "-" {
-		return os.Stdout, nil
-	}
-	return os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0660)
-}

internal/cli/format.go

@@ -2,6 +2,7 @@ package cli
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/moshebe/gtrace/pkg/span"
 	"github.com/urfave/cli/v2"
@@ -11,9 +12,9 @@ import (
 
 var formatAction = func(c *cli.Context) error {
 	format := c.String("template")
-	input, output := c.String("input"), c.String("output")
+	file := c.String("file")
 
-	in, err := read(input)
+	in, err := read(file)
 	if err != nil {
 		return err
 	}
@@ -24,13 +25,7 @@ var formatAction = func(c *cli.Context) error {
 		return fmt.Errorf("unmarshal trace: %w", err)
 	}
 
-	out, err := writer(output)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = out.Close() }()
-
-	return span.Format(trace.Spans, format, out)
+	return span.Format(trace.Spans, format, os.Stdout)
 }
 
 var FormatCommand = &cli.Command{
@@ -41,17 +36,11 @@ var FormatCommand = &cli.Command{
 	Action:      formatAction,
 	Flags: []cli.Flag{
 		&cli.PathFlag{
-			Name:    "input",
-			Aliases: []string{"i", "in"},
+			Name:    "file",
+			Aliases: []string{"f"},
 			Value:   "-",
 			Usage:   "input file path. '-' means stdin",
 		},
-		&cli.PathFlag{
-			Name:    "output",
-			Aliases: []string{"o", "out"},
-			Value:   "-",
-			Usage:   "output file path. '-' means stdout",
-		},
 		&cli.StringFlag{
 			Name:  "template",
 			Value: "{{ .Name }}  ({{ .Start }}  -  took {{ .Duration }})\n{{ if .Labels }}\t{{ .Labels }}\n{{ end }}",

internal/cli/get.go

@@ -13,7 +13,6 @@ import (
 
 var getAction = func(c *cli.Context) error {
 	id := c.Args().First()
-	output := c.Path("output")
 	projects := stringSlice(c, "project")
 
 	if len(projects) == 0 {
@@ -23,12 +22,6 @@ var getAction = func(c *cli.Context) error {
 		return fmt.Errorf("missing trace id")
 	}
 
-	out, err := writer(output)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = out.Close() }()
-
 	ctx, cancel := context.WithTimeout(c.Context, time.Minute)
 	defer cancel()
 
@@ -54,10 +47,7 @@ var getAction = func(c *cli.Context) error {
 		return fmt.Errorf("marshal trace: %w", err)
 	}
 
-	_, err = out.Write(traceJSON)
-	if err != nil {
-		return fmt.Errorf("write trace: %w", err)
-	}
+	fmt.Println(string(traceJSON))
 
 	return nil
 }
@@ -74,12 +64,6 @@ var GetCommand = &cli.Command{
 			Aliases: []string{"p"},
 			Usage:   "the Google Cloud project ID to use for this invocation. values can be set multiple times or separated by comma",
 		},
-		&cli.PathFlag{
-			Name:    "output",
-			Aliases: []string{"o", "out"},
-			Value:   "-",
-			Usage:   "output file path. '-' means stdout",
-		},
 		&cli.BoolFlag{
 			Name:  "pretty",
 			Usage: "prettify JSON output",

internal/cli/list.go

@@ -2,16 +2,20 @@ package cli
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
-	"os"
-	"text/tabwriter"
 
 	"github.com/moshebe/gtrace/pkg/span"
 	"github.com/moshebe/gtrace/pkg/tracer"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
 )
 
+type listResult struct {
+	Span   string   `json:"name"`
+	Traces []string `json:"traces"`
+}
+
 var listAction = func(c *cli.Context) error {
 	if !c.IsSet("project") {
 		return fmt.Errorf("missing project")
@@ -58,18 +62,25 @@ var listAction = func(c *cli.Context) error {
 
 	rootSpans := span.ListRootSpans(traces)
 
-	w := tabwriter.NewWriter(os.Stdout, 0, 150, 10, '\t', tabwriter.AlignRight)
+	results := make([]listResult, 0, len(rootSpans))
 	for name, ids := range rootSpans {
-		if len(ids) > 1 {
-			_, err = fmt.Fprintf(w, "%s\t\t[%v + %d more...]\n", name, ids[0], len(ids)-1)
-		} else {
-			_, err = fmt.Fprintf(w, "%s\t\t%v\n", name, ids)
-		}
-		if err != nil {
-			return err
-		}
+		results = append(results, listResult{
+			Span:   name,
+			Traces: ids,
+		})
+	}
+
+	var output []byte
+	if c.Bool("pretty") {
+		output, err = json.MarshalIndent(results, "", "\t")
+	} else {
+		output, err = json.Marshal(results)
+	}
+	if err != nil {
+		return fmt.Errorf("marshal results: %w", err)
 	}
-	_ = w.Flush()
+
+	fmt.Println(string(output))
 
 	return nil
 }
@@ -109,5 +120,9 @@ var ListCommand = &cli.Command{
 			Layout: "2006-01-02T15:04:05",
 			Usage:  "end of the time interval (inclusive) during which the trace data was collected from the application",
 		},
+		&cli.BoolFlag{
+			Name:  "pretty",
+			Usage: "prettify JSON output",
+		},
 	},
 }