Merge branch '2437-iss-default-enable-point-pool' into 'dev'

Resolve "1.60.0 几个已有问题修复"

See merge request cloudcare-tools/datakit!3252

cmd/installer/installer/upgrade.go

@@ -54,6 +54,11 @@ func Upgrade() error {
 }
 
 func upgradeMainConfig(c *config.Config) *config.Config {
+	if c.PointPool != nil {
+		l.Infof("default enable point pool")
+		c.PointPool.Enable = true // default enable point-pool
+	}
+
 	// setup dataway
 	if c.Dataway != nil {
 		c.Dataway.DeprecatedURL = ""

cmd/installer/installer/upgrade_test.go

@@ -296,6 +296,21 @@ func TestUpgradeMainConfig(t *T.T) {
 				return c
 			}(),
 		},
+
+		{
+			name: "default-enable-point-pool",
+			old: func() *config.Config {
+				c := config.DefaultConfig()
+				c.PointPool.Enable = false
+
+				return c
+			}(),
+
+			expect: func() *config.Config {
+				c := config.DefaultConfig()
+				return c
+			}(),
+		},
 	}
 
 	for _, tc := range cases {

cmd/make/build/build.go

@@ -235,7 +235,7 @@ func Compile() error {
 		}
 
 		if err := compileAPMInject(goos, goarch, BuildDir); err != nil {
-			return err
+			l.Warnf("build APM inject failed: %s, ignored", err)
 		}
 
 		upgraderDir := fmt.Sprintf("%s/%s-%s-%s", BuildDir, upgrader.BuildBinName, goos, goarch)

internal/io/dataway/flush.go

@@ -160,6 +160,10 @@ func (dw *Dataway) doFlush(w *writer, b *body, opts ...WriteOption) error {
 	}
 
 	isGzip := "F"
+	if w.cacheClean {
+		isGzip = "T" // fail-cache always gzipped before HTTP POST
+	}
+
 	if dw.GZip && !w.cacheClean { // under cacheClean, all body has been gzipped during previous POST
 		var (
 			zstart = time.Now()