Add metric IDs

crew/metrics.go

@@ -36,7 +36,9 @@ func registerMetrics() (err error) {
 		nil,
 		&metrics.Options{
 			Name:       "SPN Total Connect Operations",
+			InternalID: "spn_connect_count",
 			Permission: api.PermitUser,
+			Persist:    true,
 		},
 	)
 	if err != nil {
@@ -61,7 +63,9 @@ func registerMetrics() (err error) {
 		nil,
 		&metrics.Options{
 			Name:       "SPN Connect Operation Incoming Bytes",
+			InternalID: "spn_connect_in_bytes",
 			Permission: api.PermitUser,
+			Persist:    true,
 		},
 	)
 	if err != nil {
@@ -73,7 +77,9 @@ func registerMetrics() (err error) {
 		nil,
 		&metrics.Options{
 			Name:       "SPN Connect Operation Outgoing Bytes",
+			InternalID: "spn_connect_out_bytes",
 			Permission: api.PermitUser,
+			Persist:    true,
 		},
 	)
 	if err != nil {

crew/op_connect.go

@@ -94,6 +94,9 @@ func init() {
 
 // NewConnectOp starts a new connect operation.
 func NewConnectOp(tunnel *Tunnel) (*ConnectOp, *terminal.Error) {
+	// Submit metrics.
+	newConnectOp.Inc()
+
 	// Create request.
 	request := &ConnectRequest{
 		Domain:              tunnel.connInfo.Entity.Domain,

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/mr-tron/base58 v1.2.0
 	github.com/rot256/pblind v0.0.0-20230622102829-4dc2c6e4b857
 	github.com/safing/jess v0.3.1
-	github.com/safing/portbase v0.17.2
+	github.com/safing/portbase v0.17.3
 	github.com/safing/portmaster v1.4.4-prep
 	github.com/spf13/cobra v1.7.0
 	github.com/stretchr/testify v1.8.4

go.sum

@@ -196,6 +196,8 @@ github.com/safing/portbase v0.15.2/go.mod h1:5bHi99fz7Hh/wOsZUOI631WF9ePSHk57c4f
 github.com/safing/portbase v0.16.2/go.mod h1:mzNCWqPbO7vIYbbK5PElGbudwd2vx4YPNawymL8Aro8=
 github.com/safing/portbase v0.17.2 h1:HzJkURMmXkv30wMHB7xJ+Z5U5aTMe+EzvlHavKoKkos=
 github.com/safing/portbase v0.17.2/go.mod h1:1cVgDZIsPiqM5b+K88Kshir5PGIvsftYkx7y1x925+8=
+github.com/safing/portbase v0.17.3 h1:LLV2kq4mli2phHFHxigTkIoOjConieMTWsDyi9kJd00=
+github.com/safing/portbase v0.17.3/go.mod h1:1cVgDZIsPiqM5b+K88Kshir5PGIvsftYkx7y1x925+8=
 github.com/safing/portmaster v1.4.4-prep h1:r1GqXl8UEyWOqC1QecCO+HEV5YFhHrWvwGC7FQ+wTfs=
 github.com/safing/portmaster v1.4.4-prep/go.mod h1:u35kfStZppEViVmONmSTtaQh7/6vtGEB2kAraj8C9OU=
 github.com/safing/portmaster-android/go v0.0.0-20230605085256-6abf4c495626 h1:olc/REnUdpJN/Gmz8B030OxLpMYxyPDTrDILNEw0eKs=
@@ -413,3 +415,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5 h1:cv/zaNV0nr1mJzaeo4S5mHIm5va1W0/9J3/5prlsuRM=
 gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5/go.mod h1:TIvkJD0sxe8pIob3p6T8IzxXunlp6yfgktvTNp+DGNM=
+honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
+honnef.co/go/tools v0.2.2/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=