instance: protobuf migration v2 (#1315)

* instance: protobuf migration v2

* fix tests

Author: BeryJu

Makefile

@@ -87,6 +87,12 @@ gen-build:
 	DEBUG=true go run ${GO_FLAGS} ${PWD} generateSchema ${SCHEMA_FILE}
 	git add ${SCHEMA_FILE}
 
+gen-proto:
+	protoc \
+		--proto_path . \
+		--go_out . \
+		protobuf/**
+
 gen-clean:
 	rm -rf ${PWD}/gen-ts-api/
 	rm -rf ${PWD}/api/api/

pkg/roles/tsdb/api.go

@@ -11,6 +11,7 @@ import (
 	"github.com/swaggest/usecase/status"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
+	"google.golang.org/protobuf/proto"
 )
 
 func (r *Role) APIMetrics() usecase.Interactor {
@@ -45,16 +46,21 @@ func (r *Role) APIMetrics() usecase.Interactor {
 			if input.Node != "" && input.Node != node {
 				continue
 			}
-			value, err := strconv.ParseInt(string(kv.Value), 10, 0)
+			v := types.MetricsRecord{}
+			err = proto.Unmarshal(kv.Value, &v)
 			if err != nil {
-				r.log.Warn("failed to parse metric value", zap.Error(err))
-				continue
+				value, err := strconv.ParseInt(string(kv.Value), 10, 0)
+				if err != nil {
+					r.log.Warn("failed to parse metric value", zap.Error(err))
+					continue
+				}
+				v.Value = value
 			}
 			output.Records = append(output.Records, types.APIMetricsRecord{
 				Keys:  keyParts[:2],
 				Time:  time.Unix(int64(ts), 0),
 				Node:  node,
-				Value: value,
+				Value: v.Value,
 			})
 		}
 		return nil

pkg/roles/tsdb/role.go

@@ -20,6 +20,7 @@ import (
 	"github.com/swaggest/rest/web"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.uber.org/zap"
+	"google.golang.org/protobuf/proto"
 )
 
 type Role struct {
@@ -165,10 +166,17 @@ func (r *Role) write(ctx context.Context) {
 			extconfig.Get().Instance.Identifier,
 			strconv.FormatInt(time.Now().Unix(), 10),
 		).String()
-		_, err := r.i.KV().Put(
+		v := types.MetricsRecord{
+			Value: int64(value.Value),
+		}
+		rv, err := proto.Marshal(&v)
+		if err != nil {
+			r.log.Warn("failed to marshal message", zap.Error(err))
+		}
+		_, err = r.i.KV().Put(
 			ks.Context(),
 			key,
-			strconv.Itoa(value.Value),
+			string(rv),
 			clientv3.WithLease(lease.ID),
 		)
 		if err != nil {

pkg/roles/tsdb/role_test.go

@@ -101,7 +101,7 @@ func TestRoleWrite(t *testing.T) {
 			types.KeyRole, nameBeforeWrite,
 			extconfig.Get().Instance.Identifier,
 		).Prefix(true),
-		42,
+		&types.MetricsRecord{Value: 42},
 	)
 	tests.AssertEtcd(
 		t,
@@ -110,7 +110,7 @@ func TestRoleWrite(t *testing.T) {
 			types.KeyRole, nameSet,
 			extconfig.Get().Instance.Identifier,
 		).Prefix(true),
-		43,
+		&types.MetricsRecord{Value: 43},
 	)
 	tests.AssertEtcd(
 		t,
@@ -119,6 +119,6 @@ func TestRoleWrite(t *testing.T) {
 			types.KeyRole, nameInc,
 			extconfig.Get().Instance.Identifier,
 		).Prefix(true),
-		1,
+		&types.MetricsRecord{Value: 1},
 	)
 }

pkg/roles/tsdb/types/role_tsdb_record.pb.go

@@ -17,6 +17,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	clientv3 "go.etcd.io/etcd/client/v3"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 var (
@@ -40,6 +42,14 @@ func MustJSON(in interface{}) string {
 	return string(j)
 }
 
+func MustProto(in protoreflect.ProtoMessage) []byte {
+	r, err := proto.Marshal(in)
+	if err != nil {
+		panic(err)
+	}
+	return r
+}
+
 func MustParseNetIP(t *testing.T, r string) netip.Addr {
 	i, err := netip.ParseAddr(r)
 	assert.NoError(t, err)
@@ -72,6 +82,8 @@ func AssertEtcd(t *testing.T, c *storage.Client, key *storage.Key, expected ...i
 			assert.Equal(t, rb, values.Kvs[idx].Value)
 		} else if rb, ok := res.(string); ok {
 			assert.Equal(t, rb, string(values.Kvs[idx].Value))
+		} else if rb, ok := res.(protoreflect.ProtoMessage); ok {
+			assert.Equal(t, MustProto(rb), values.Kvs[idx].Value)
 		} else {
 			assert.Equal(t, MustJSON(res), string(values.Kvs[idx].Value))
 		}

pkg/tests/utils.go

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+option go_package = "pkg/roles/tsdb/types";
+
+message MetricsRecord {
+    int64 value = 1;
+}