Defer stats Increment in compile command and explicit set for success/failure

Author: rsora

commands/compile/compile.go

@@ -58,24 +58,24 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		"exportFile":      req.ExportFile,
 		"jobs":            strconv.FormatInt(int64(req.Jobs), 10),
 		"libraries":       strings.Join(req.Libraries, ","),
-		"success":         "false",
 	}
 
+	defer stats.Incr("compile", stats.M(tags)...)
+
 	pm := commands.GetPackageManager(req.GetInstance().GetId())
 	if pm == nil {
-		stats.Incr("compile", stats.M(tags)...)
 		return nil, errors.New("invalid instance")
 	}
 
 	logrus.Tracef("Compile %s for %s started", req.GetSketchPath(), req.GetFqbn())
 	if req.GetSketchPath() == "" {
-		stats.Incr("compile", stats.M(tags)...)
+		tags["success"] = "false"
 		return nil, fmt.Errorf("missing sketchPath")
 	}
 	sketchPath := paths.New(req.GetSketchPath())
 	sketch, err := sketches.NewSketchFromPath(sketchPath)
 	if err != nil {
-		stats.Incr("compile", stats.M(tags)...)
+		tags["success"] = "false"
 		return nil, fmt.Errorf("opening sketch: %s", err)
 	}
 
@@ -84,12 +84,12 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		fqbnIn = sketch.Metadata.CPU.Fqbn
 	}
 	if fqbnIn == "" {
-		stats.Incr("compile", stats.M(tags)...)
+		tags["success"] = "false"
 		return nil, fmt.Errorf("no FQBN provided")
 	}
 	fqbn, err := cores.ParseFQBN(fqbnIn)
 	if err != nil {
-		stats.Incr("compile", stats.M(tags)...)
+		tags["success"] = "false"
 		return nil, fmt.Errorf("incorrect FQBN: %s", err)
 	}
 
@@ -103,7 +103,7 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		// 	"\"%[1]s:%[2]s\" platform is not installed, please install it by running \""+
 		// 		version.GetAppName()+" core install %[1]s:%[2]s\".", fqbn.Package, fqbn.PlatformArch)
 		// feedback.Error(errorMessage)
-		stats.Incr("compile", stats.M(tags)...)
+		tags["success"] = "false"
 		return nil, fmt.Errorf("platform not installed")
 	}
 
@@ -123,7 +123,7 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		builderCtx.BuildPath = paths.New(req.GetBuildPath())
 		err = builderCtx.BuildPath.MkdirAll()
 		if err != nil {
-			stats.Incr("compile", stats.M(tags)...)
+			tags["success"] = "false"
 			return nil, fmt.Errorf("cannot create build directory: %s", err)
 		}
 	}
@@ -152,7 +152,7 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		builderCtx.BuildCachePath = paths.New(req.GetBuildCachePath())
 		err = builderCtx.BuildCachePath.MkdirAll()
 		if err != nil {
-			stats.Incr("compile", stats.M(tags)...)
+			tags["success"] = "false"
 			return nil, fmt.Errorf("cannot create build cache directory: %s", err)
 		}
 	}
@@ -186,17 +186,15 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 	// if --preprocess or --show-properties were passed, we can stop here
 	if req.GetShowProperties() {
 		tags["success"] = "true"
-		stats.Incr("compile", stats.M(tags)...)
 		return &rpc.CompileResp{}, builder.RunParseHardwareAndDumpBuildProperties(builderCtx)
 	} else if req.GetPreprocess() {
 		tags["success"] = "true"
-		stats.Incr("compile", stats.M(tags)...)
 		return &rpc.CompileResp{}, builder.RunPreprocess(builderCtx)
 	}
 
 	// if it's a regular build, go on...
 	if err := builder.RunBuilder(builderCtx); err != nil {
-		stats.Incr("compile", stats.M(tags)...)
+		tags["success"] = "false"
 		return nil, err
 	}
 
@@ -232,7 +230,7 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 	// Copy "sketch.ino.*.hex" / "sketch.ino.*.bin" artifacts to sketch directory
 	srcDir, err := outputPath.Parent().ReadDir() // read "/build/path/*"
 	if err != nil {
-		stats.Incr("compile", stats.M(tags)...)
+		tags["success"] = "false"
 		return nil, fmt.Errorf("reading build directory: %s", err)
 	}
 	srcDir.FilterPrefix(base + ".")
@@ -243,7 +241,7 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		dstOutput := exportPath.Join(exportFile + srcFilename)
 		logrus.WithField("from", srcOutput).WithField("to", dstOutput).Debug("copying sketch build output")
 		if err = srcOutput.CopyTo(dstOutput); err != nil {
-			stats.Incr("compile", stats.M(tags)...)
+			tags["success"] = "false"
 			return nil, fmt.Errorf("copying output file: %s", err)
 		}
 	}
@@ -254,13 +252,12 @@ func Compile(ctx context.Context, req *rpc.CompileReq, outStream, errStream io.W
 		dstElf := exportPath.Join(exportFile + ".elf")
 		logrus.WithField("from", srcElf).WithField("to", dstElf).Debug("copying sketch build output")
 		if err = srcElf.CopyTo(dstElf); err != nil {
-			stats.Incr("compile", stats.M(tags)...)
+			tags["success"] = "false"
 			return nil, fmt.Errorf("copying elf file: %s", err)
 		}
 	}
 
 	logrus.Tracef("Compile %s for %s successful", sketch.Name, fqbnIn)
 	tags["success"] = "true"
-	stats.Incr("compile", stats.M(tags)...)
 	return &rpc.CompileResp{}, nil
 }