refactor: remove flags from analytics (#3803)

* remove parameters and sensitive data * remove unused set * add changelog * Apply suggestions from code review * Apply suggestions from code review --------- Co-authored-by: Pantani <Pantani> Co-authored-by: İlker G. Öztürk <[email protected]>
ignite · Dec 5, 2023 · 296e226 · 296e226
1 parent 70e787f
commit 296e226
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/ignite/cmd/ignite/main.go b/ignite/cmd/ignite/main.go
@@ -23,11 +23,6 @@ func main() {
 
 func run() int {
 	const exitCodeOK, exitCodeError = 0, 1
-	var wg sync.WaitGroup
-	if len(os.Args) > 1 {
-		analytics.SendMetric(&wg, os.Args)
-	}
-
 	ctx := clictx.From(context.Background())
 	cmd, cleanUp, err := ignitecmd.New(ctx)
 	if err != nil {
@@ -36,6 +31,15 @@ func run() int {
 	}
 	defer cleanUp()
 
+	// find command and send to analytics
+	subCmd, _, err := cmd.Find(os.Args[1:])
+	if err != nil {
+		fmt.Printf("%v\n", err)
+		return exitCodeError
+	}
+	var wg sync.WaitGroup
+	analytics.SendMetric(&wg, subCmd)
+
 	err = cmd.ExecuteContext(ctx)
 	if errors.Is(ctx.Err(), context.Canceled) || errors.Is(err, context.Canceled) {
 		fmt.Println("aborted")

diff --git a/ignite/internal/analytics/analytics.go b/ignite/internal/analytics/analytics.go
@@ -9,6 +9,7 @@ import (
 	"sync"
 
 	"github.com/manifoldco/promptui"
+	"github.com/spf13/cobra"
 
 	"github.com/ignite/cli/ignite/pkg/gacli"
 	"github.com/ignite/cli/ignite/pkg/randstr"
@@ -37,13 +38,8 @@ func init() {
 }
 
 // SendMetric send command metrics to analytics.
-func SendMetric(wg *sync.WaitGroup, args []string) {
-	// only the app name
-	if len(args) <= 1 {
-		return
-	}
-
-	if args[1] == "version" {
+func SendMetric(wg *sync.WaitGroup, cmd *cobra.Command) {
+	if cmd.Name() == "version" {
 		return
 	}
 
@@ -52,14 +48,16 @@ func SendMetric(wg *sync.WaitGroup, args []string) {
 		return
 	}
 
+	path := cmd.CommandPath()
 	met := gacli.Metric{
+		Name:      cmd.Name(),
+		Cmd:       path,
+		Tag:       strings.ReplaceAll(path, " ", "+"),
 		OS:        runtime.GOOS,
 		Arch:      runtime.GOARCH,
-		FullCmd:   strings.Join(args[1:], " "),
 		SessionID: dntInfo.Name,
 		Version:   version.Version,
 	}
-	met.Cmd = args[1]
 
 	wg.Add(1)
 	go func() {

diff --git a/ignite/pkg/gacli/gacli.go b/ignite/pkg/gacli/gacli.go
@@ -29,10 +29,11 @@ type (
 	}
 	// Metric represents a data point.
 	Metric struct {
+		Name               string `json:"name,omitempty"`
+		Cmd                string `json:"command,omitempty"`
+		Tag                string `json:"tag,omitempty"`
 		OS                 string `json:"os,omitempty"`
 		Arch               string `json:"arch,omitempty"`
-		FullCmd            string `json:"full_command,omitempty"`
-		Cmd                string `json:"command,omitempty"`
 		Version            string `json:"version,omitempty"`
 		SessionID          string `json:"session_id,omitempty"`
 		EngagementTimeMsec string `json:"engagement_time_msec,omitempty"`