From 68ecc44a4997ed425d408494eb7a796d4de04e07 Mon Sep 17 00:00:00 2001
From: Mihai Parparita <mihai@tailscale.com>
Date: Mon, 10 Apr 2023 14:17:31 -0700
Subject: [PATCH] cmd/tailscale: upload client metrics

More generally, make the logtail.Config similar to the one used by
clients for other platforms.

Updates tailscale/corp#9230
---
 cmd/tailscale/backend.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/cmd/tailscale/backend.go b/cmd/tailscale/backend.go
index 9693505..cf27da9 100644
--- a/cmd/tailscale/backend.go
+++ b/cmd/tailscale/backend.go
@@ -28,7 +28,9 @@ import (
 	"tailscale.com/smallzstd"
 	"tailscale.com/types/logger"
 	"tailscale.com/types/logid"
+	"tailscale.com/util/clientmetric"
 	"tailscale.com/util/dnsname"
+	"tailscale.com/util/must"
 	"tailscale.com/wgengine"
 	"tailscale.com/wgengine/netstack"
 	"tailscale.com/wgengine/router"
@@ -317,15 +319,14 @@ func (b *backend) CloseTUNs() {
 // SetupLogs sets up remote logging.
 func (b *backend) SetupLogs(logDir string, logID logid.PrivateID) {
 	logcfg := logtail.Config{
-		Collection: "tailnode.log.tailscale.io",
-		PrivateID:  logID,
-		Stderr:     log.Writer(),
+		Collection:          logtail.CollectionNode,
+		PrivateID:           logID,
+		Stderr:              log.Writer(),
+		MetricsDelta:        clientmetric.EncodeLogTailMetricsDelta,
+		IncludeProcID:       true,
+		IncludeProcSequence: true,
 		NewZstdEncoder: func() logtail.Encoder {
-			w, err := smallzstd.NewEncoder(nil)
-			if err != nil {
-				panic(err)
-			}
-			return w
+			return must.Get(smallzstd.NewEncoder(nil))
 		},
 		HTTPC: &http.Client{Transport: logpolicy.NewLogtailTransport(logtail.DefaultHost)},
 	}