disable telemetry by default (#2119)

pingcap · Feb 14, 2023 · e0aeda1 · e0aeda1
1 parent 4c2debc
commit e0aeda1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/pkg/telemetry/meta.go b/pkg/telemetry/meta.go
@@ -37,8 +37,6 @@ const (
 	DisableStatus Status = "disable"
 )
 
-const defaultStatus = EnableStatus
-
 // Meta data of telemetry.
 type Meta struct {
 	UUID   string `yaml:"uuid,omitempty"`
@@ -78,8 +76,7 @@ func LoadFrom(fname string) (meta *Meta, err error) {
 
 	if err != nil {
 		if os.IsNotExist(err) {
-			meta = NewMeta()
-			return meta, meta.SaveTo(fname)
+			return &Meta{}, nil
 		}
 		return
 	}
@@ -89,11 +86,11 @@ func LoadFrom(fname string) (meta *Meta, err error) {
 
 	// populate UUID and secret if not set
 	var updated bool
-	if meta.UUID == "" {
+	if meta.UUID == "" && meta.Status == EnableStatus {
 		meta.UUID = NewUUID()
 		updated = true
 	}
-	if meta.Secret == "" {
+	if meta.Secret == "" && meta.Status == EnableStatus {
 		meta.Secret = NewSecret()
 		updated = true
 	}

diff --git a/pkg/telemetry/meta_test.go b/pkg/telemetry/meta_test.go
@@ -23,8 +23,8 @@ func (s *teleSuite) TestTelemetry(c *check.C) {
 	// Should no error and get a default meta.
 	meta, err := LoadFrom(fname)
 	c.Assert(err, check.IsNil)
-	c.Assert(meta.Status, check.Equals, defaultStatus)
-	c.Assert(len(meta.UUID), check.Greater, 0)
+	c.Assert(meta.Status, check.Equals, Status(""))
+	c.Assert(len(meta.UUID), check.Equals, 0)
 
 	// Save and load back
 	err = meta.SaveTo(fname)