Added prefix and moved Insrumentation inside the command package

Author: Roberto Sora

cli/daemon/daemon.go

@@ -58,26 +58,22 @@ var daemonize bool
 func runDaemonCommand(cmd *cobra.Command, args []string) {
 
 	// Configure telemetry engine
+	// Create a Prometheus default handler
 	ph := prometheus.DefaultHandler
-
-	// Register the client so it receives metrics from the default engine.
-	engine := stats.WithPrefix("daemon")
-	engine.Register(ph)
-
+	// Replace the default stats engine with an engine that prepends the "daemon" prefix to all metrics
+	stats.DefaultEngine = stats.WithPrefix("daemon")
+	// Register the handler so it receives metrics from the default engine.
+	stats.Register(ph)
 	// Flush the default stats engine on return to ensure all buffered
 	// metrics are sent to the server.
 	defer stats.Flush()
-
 	// move everything inside commands and search for setting up a common prefix for all metrics sent!
 	logrus.Infof("Setting up Prometheus telemetry on /metrics, TCP port 2112")
 	go func() {
 		http.Handle("/metrics", ph)
 		logrus.Error(http.ListenAndServe(":2112", nil))
 	}()
 
-	engine.Incr("board.yes", stats.Tag{"success", "false"})
-	stats.Flush()
-	engine.Flush()
 	port := viper.GetString("daemon.port")
 	s := grpc.NewServer()
 

commands/board/list.go

@@ -18,6 +18,7 @@ package board
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/segmentio/stats/v4"
 	"io/ioutil"
 	"net/http"
 	"regexp"
@@ -106,11 +107,13 @@ func List(instanceID int32) ([]*rpc.DetectedPort, error) {
 
 	pm := commands.GetPackageManager(instanceID)
 	if pm == nil {
+		stats.Incr("board.list", stats.Tag{"success", "false"})
 		return nil, errors.New("invalid instance")
 	}
 
 	ports, err := commands.ListBoards(pm)
 	if err != nil {
+		stats.Incr("board.list", stats.Tag{"success", "false"})
 		return nil, errors.Wrap(err, "error getting port list from serial-discovery")
 	}
 
@@ -136,6 +139,7 @@ func List(instanceID int32) ([]*rpc.DetectedPort, error) {
 				logrus.Debug("Board not recognized")
 			} else if err != nil {
 				// this is bad, bail out
+				stats.Incr("board.list", stats.Tag{"success", "false"})
 				return nil, errors.Wrap(err, "error getting board info from Arduino Cloud")
 			}
 
@@ -156,5 +160,6 @@ func List(instanceID int32) ([]*rpc.DetectedPort, error) {
 		retVal = append(retVal, p)
 	}
 
+	stats.Incr("board.list", stats.Tag{"success", "true"})
 	return retVal, nil
 }

commands/daemon/daemon.go

@@ -29,7 +29,6 @@ import (
 	"github.com/arduino/arduino-cli/commands/lib"
 	"github.com/arduino/arduino-cli/commands/upload"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
-	"github.com/segmentio/stats/v4"
 )
 
 // ArduinoCoreServerImpl FIXMEDOC
@@ -47,12 +46,9 @@ func (s *ArduinoCoreServerImpl) BoardDetails(ctx context.Context, req *rpc.Board
 func (s *ArduinoCoreServerImpl) BoardList(ctx context.Context, req *rpc.BoardListReq) (*rpc.BoardListResp, error) {
 	ports, err := board.List(req.GetInstance().GetId())
 	if err != nil {
-		// helper function from grpc req to tags
-		stats.Incr("board.list", stats.Tag{"success", "false"})
 		return nil, err
 	}
 
-	stats.Incr("board.list", stats.Tag{"success", "true"})
 	return &rpc.BoardListResp{
 		Ports: ports,
 	}, nil