cmd/scollector: fix DisableSelf flag not working for version and post.batchsize metrics (bosun-monitor#1868)

Author: gbrayut

cmd/scollector/main.go

@@ -220,7 +220,7 @@ func main() {
 	if err := collect.InitChan(u, "scollector", cdp); err != nil {
 		slog.Fatal(err)
 	}
-	if version.VersionDate != "" {
+	if collect.DisableDefaultCollectors == false && version.VersionDate != "" {
 		v, err := strconv.ParseInt(version.VersionDate, 10, 64)
 		if err == nil {
 			go func() {

collect/queue.go

@@ -78,7 +78,9 @@ func send() {
 				slog.Infof("sending: %d, remaining: %d", i, len(queue))
 			}
 			qlock.Unlock()
-			Sample("collect.post.batchsize", Tags, float64(len(sending)))
+			if DisableDefaultCollectors == false {
+				Sample("collect.post.batchsize", Tags, float64(len(sending)))
+			}
 			sendBatch(sending)
 		} else {
 			qlock.Unlock()