Merge branch 'ignite:main' into add-feeabs

Author: trungnt1811

changelog.md

@@ -20,6 +20,8 @@
 - [#4133](https://github.com/ignite/cli/pull/4133) Improve buf rate limit
 - [#4113](https://github.com/ignite/cli/pull/4113) Generate chain config documentation automatically
 - [#4131](https://github.com/ignite/cli/pull/4131) Support `bytes` as data type in the `scaffold` commands
+- [#4095](https://github.com/ignite/cli/pull/4095) Migrate to matomo analytics
+- [#4183](https://github.com/ignite/cli/pull/4183) Set `chain-id` in the client.toml
 
 ### Changes
 
@@ -45,6 +47,7 @@
 - [#4000](https://github.com/ignite/cli/pull/4000) Run all dry runners before the wet run in the `xgenny` pkg
 - [#4091](https://github.com/ignite/cli/pull/4091) Fix race conditions in the plugin logic
 - [#4128](https://github.com/ignite/cli/pull/4128) Check for duplicate proto fields in config
+- [#4184](https://github.com/ignite/cli/pull/4184) Set custom `InitChainer` because of manually registered modules
 
 ## [`v28.4.0`](https://github.com/ignite/cli/releases/tag/v28.4.0)
 

ignite/cmd/version.go

@@ -11,8 +11,13 @@ func NewVersion() *cobra.Command {
 	c := &cobra.Command{
 		Use:   "version",
 		Short: "Print the current build information",
-		Run: func(cmd *cobra.Command, _ []string) {
-			cmd.Println(version.Long(cmd.Context()))
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			v, err := version.Long(cmd.Context())
+			if err != nil {
+				return err
+			}
+			cmd.Println(v)
+			return nil
 		},
 	}
 	return c

ignite/internal/analytics/analytics.go

@@ -1,10 +1,10 @@
 package analytics
 
 import (
+	"context"
 	"encoding/json"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -13,21 +13,21 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/ignite/cli/v29/ignite/config"
-	"github.com/ignite/cli/v29/ignite/pkg/gacli"
 	"github.com/ignite/cli/v29/ignite/pkg/gitpod"
+	"github.com/ignite/cli/v29/ignite/pkg/matomo"
 	"github.com/ignite/cli/v29/ignite/pkg/randstr"
 	"github.com/ignite/cli/v29/ignite/version"
 )
 
 const (
-	telemetryEndpoint  = "https://telemetry-cli.ignite.com"
+	telemetryEndpoint  = "https://matomo-cli.ignite.com"
 	envDoNotTrack      = "DO_NOT_TRACK"
 	envCI              = "CI"
 	envGitHubActions   = "GITHUB_ACTIONS"
 	igniteAnonIdentity = "anon_identity.json"
 )
 
-var gaclient gacli.Client
+var matomoClient matomo.Client
 
 // anonIdentity represents an analytics identity file.
 type anonIdentity struct {
@@ -38,7 +38,11 @@ type anonIdentity struct {
 }
 
 func init() {
-	gaclient = gacli.New(telemetryEndpoint)
+	matomoClient = matomo.New(
+		telemetryEndpoint,
+		matomo.WithIDSite(4),
+		matomo.WithSource("https://cli.ignite.com"),
+	)
 }
 
 // SendMetric send command metrics to analytics.
@@ -52,23 +56,46 @@ func SendMetric(wg *sync.WaitGroup, cmd *cobra.Command) {
 		return
 	}
 
-	path := cmd.CommandPath()
-	met := gacli.Metric{
-		Name:      cmd.Name(),
-		Cmd:       path,
-		Tag:       strings.ReplaceAll(path, " ", "+"),
-		OS:        runtime.GOOS,
-		Arch:      runtime.GOARCH,
-		SessionID: dntInfo.Name,
-		Version:   version.Version,
-		IsGitPod:  gitpod.IsOnGitpod(),
-		IsCI:      getIsCI(),
+	versionInfo, err := version.GetInfo(context.Background())
+	if err != nil {
+		return
+	}
+
+	var (
+		path         = cmd.CommandPath()
+		scaffoldType = ""
+	)
+	if strings.Contains(path, "ignite scaffold") {
+		splitCMD := strings.Split(path, " ")
+		if len(splitCMD) > 2 {
+			scaffoldType = splitCMD[2]
+		}
+	}
+
+	met := matomo.Metric{
+		Name:            cmd.Name(),
+		Cmd:             path,
+		ScaffoldType:    scaffoldType,
+		OS:              versionInfo.OS,
+		Arch:            versionInfo.Arch,
+		Version:         versionInfo.CLIVersion,
+		CLIVersion:      versionInfo.CLIVersion,
+		GoVersion:       versionInfo.GoVersion,
+		SDKVersion:      versionInfo.SDKVersion,
+		BuildDate:       versionInfo.BuildDate,
+		SourceHash:      versionInfo.SourceHash,
+		ConfigVersion:   versionInfo.ConfigVersion,
+		Uname:           versionInfo.Uname,
+		CWD:             versionInfo.CWD,
+		BuildFromSource: versionInfo.BuildFromSource,
+		IsGitPod:        gitpod.IsOnGitpod(),
+		IsCI:            getIsCI(),
 	}
 
 	wg.Add(1)
 	go func() {
 		defer wg.Done()
-		_ = gaclient.SendMetric(met)
+		_ = matomoClient.SendMetric(dntInfo.Name, met)
 	}()
 }
 
@@ -98,7 +125,7 @@ func checkDNT() (anonIdentity, error) {
 		return i, nil
 	}
 
-	i.Name = randstr.Runes(10)
+	i.Name = randstr.Runes(16)
 	i.DoNotTrack = false
 
 	prompt := promptui.Select{