From 9c6a161d01758d290d0cbf1d1854562b53e672e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=94=E5=8F=AF?= <wanruiping.wrp@alibaba-inc.com>
Date: Thu, 20 Jul 2023 10:42:19 +0800
Subject: [PATCH 1/4] mv sls_metrics to common/protobuf/metricstore, and add
 Makefile

---
 source/tools/monitor/unity/beeQ/pack.sh              |  9 +++------
 .../unity/common/protobuf/metricstore/Makefile       | 12 ++++++++++++
 .../native => common/protobuf/metricstore}/README.md |  0
 .../protobuf/metricstore}/build_shared.sh            |  0
 .../protobuf/metricstore}/ffi_lua.lua                |  0
 .../protobuf/metricstore}/metricSnappy.go            |  0
 .../protobuf/metricstore}/test_sls.go                |  0
 source/tools/monitor/unity/httplib/coMetrics.lua     |  2 +-
 8 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 source/tools/monitor/unity/common/protobuf/metricstore/Makefile
 rename source/tools/monitor/unity/{sls_metric/native => common/protobuf/metricstore}/README.md (100%)
 rename source/tools/monitor/unity/{sls_metric/native => common/protobuf/metricstore}/build_shared.sh (100%)
 rename source/tools/monitor/unity/{sls_metric/native => common/protobuf/metricstore}/ffi_lua.lua (100%)
 rename source/tools/monitor/unity/{sls_metric/native => common/protobuf/metricstore}/metricSnappy.go (100%)
 rename source/tools/monitor/unity/{sls_metric/native => common/protobuf/metricstore}/test_sls.go (100%)

diff --git a/source/tools/monitor/unity/beeQ/pack.sh b/source/tools/monitor/unity/beeQ/pack.sh
index dfabfce3..207b0ddd 100755
--- a/source/tools/monitor/unity/beeQ/pack.sh
+++ b/source/tools/monitor/unity/beeQ/pack.sh
@@ -75,17 +75,14 @@ cp collector/plugin.yaml ${APP}/collector/
 
 
 mkdir ${APP}/common
+mkdir ${APP}/common/protobuf
+mkdir ${APP}/common/protobuf/metricstore
 cp common/*.lua ${APP}/common/
+cp common/protobuf/metricstore/*.lua ${APP}/common/protobuf/metricstore/
 
 mkdir ${APP}/httplib
 cp httplib/*.lua ${APP}/httplib/
 
-mkdir ${APP}/sls_metric
-mkdir ${APP}/sls_metric/native
-cp sls_metric/native/*.so* ${APP}/sls_metric/native/
-cp sls_metric/native/*.lua ${APP}/sls_metric/native/
-cp sls_metric/*.lua ${APP}/sls_metric/
-
 mkdir ${APP}/tsdb
 mkdir ${APP}/tsdb/native
 cp tsdb/native/*.so* ${APP}/tsdb/native/
diff --git a/source/tools/monitor/unity/common/protobuf/metricstore/Makefile b/source/tools/monitor/unity/common/protobuf/metricstore/Makefile
new file mode 100644
index 00000000..a48ca69c
--- /dev/null
+++ b/source/tools/monitor/unity/common/protobuf/metricstore/Makefile
@@ -0,0 +1,12 @@
+SO := libmetricSnappy.so
+
+all: $(SO) install
+
+$(SO):
+	$(shell ./build_shared.sh)
+
+install: $(SO)
+	cp $(SO) ../../beeQ/lib
+
+clean:
+	rm -f $(SO)
diff --git a/source/tools/monitor/unity/sls_metric/native/README.md b/source/tools/monitor/unity/common/protobuf/metricstore/README.md
similarity index 100%
rename from source/tools/monitor/unity/sls_metric/native/README.md
rename to source/tools/monitor/unity/common/protobuf/metricstore/README.md
diff --git a/source/tools/monitor/unity/sls_metric/native/build_shared.sh b/source/tools/monitor/unity/common/protobuf/metricstore/build_shared.sh
similarity index 100%
rename from source/tools/monitor/unity/sls_metric/native/build_shared.sh
rename to source/tools/monitor/unity/common/protobuf/metricstore/build_shared.sh
diff --git a/source/tools/monitor/unity/sls_metric/native/ffi_lua.lua b/source/tools/monitor/unity/common/protobuf/metricstore/ffi_lua.lua
similarity index 100%
rename from source/tools/monitor/unity/sls_metric/native/ffi_lua.lua
rename to source/tools/monitor/unity/common/protobuf/metricstore/ffi_lua.lua
diff --git a/source/tools/monitor/unity/sls_metric/native/metricSnappy.go b/source/tools/monitor/unity/common/protobuf/metricstore/metricSnappy.go
similarity index 100%
rename from source/tools/monitor/unity/sls_metric/native/metricSnappy.go
rename to source/tools/monitor/unity/common/protobuf/metricstore/metricSnappy.go
diff --git a/source/tools/monitor/unity/sls_metric/native/test_sls.go b/source/tools/monitor/unity/common/protobuf/metricstore/test_sls.go
similarity index 100%
rename from source/tools/monitor/unity/sls_metric/native/test_sls.go
rename to source/tools/monitor/unity/common/protobuf/metricstore/test_sls.go
diff --git a/source/tools/monitor/unity/httplib/coMetrics.lua b/source/tools/monitor/unity/httplib/coMetrics.lua
index 510cd54e..1f3a9316 100644
--- a/source/tools/monitor/unity/httplib/coMetrics.lua
+++ b/source/tools/monitor/unity/httplib/coMetrics.lua
@@ -43,7 +43,7 @@ function CcoMetrics:_init_(fYaml)
     }
     CcoHttpCliInst._init_(self, instance, pushMetrics)
     -- go ffi
-    local ffi = require("sls_metric.native.ffi_lua")
+    local ffi = require("common.protobuf.metricstore.ffi_lua")
     self.ffi = ffi.ffi
     self.awesome = ffi.awesome
 
-- 
Gitee


From 57ed8197a6ff4ae4edc228650d1125133cdfe368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=94=E5=8F=AF?= <wanruiping.wrp@alibaba-inc.com>
Date: Thu, 20 Jul 2023 14:28:45 +0800
Subject: [PATCH 2/4] modify metricstore/Makefile

---
 source/tools/monitor/unity/beeQ/Makefile              |  2 +-
 .../unity/common/protobuf/metricstore/Makefile        | 11 +++++------
 .../unity/common/protobuf/metricstore/build_shared.sh |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/source/tools/monitor/unity/beeQ/Makefile b/source/tools/monitor/unity/beeQ/Makefile
index 401159bc..93737366 100644
--- a/source/tools/monitor/unity/beeQ/Makefile
+++ b/source/tools/monitor/unity/beeQ/Makefile
@@ -6,7 +6,7 @@ LDFLAG := -g -lm -ldl -lrt -lpthread -lluajit-5.1 -L./lib/ -lbeeQ -L../beaver -l
 
 PRG=unity-mon
 OBJ=apps.o bees.o daemon.o pushTo.o
-DEPMOD=lib rbtree clock postQue ../beaver ../collector/native ../collector/interface ../collector/outline ../collector/plugin ../tsdb/native ../collector/container/cg_pmu_events_ffi
+DEPMOD=lib rbtree clock postQue ../beaver ../collector/native ../collector/interface ../collector/outline ../collector/plugin ../tsdb/native ../collector/container/cg_pmu_events_ffi ../common/protobuf/metricstore
 
 $(PRG): $(DEPMOD) $(OBJ)
 	$(CC) $(LIB) -o $@ $(OBJ) $(LDFLAG)
diff --git a/source/tools/monitor/unity/common/protobuf/metricstore/Makefile b/source/tools/monitor/unity/common/protobuf/metricstore/Makefile
index a48ca69c..dc2f1307 100644
--- a/source/tools/monitor/unity/common/protobuf/metricstore/Makefile
+++ b/source/tools/monitor/unity/common/protobuf/metricstore/Makefile
@@ -1,12 +1,11 @@
 SO := libmetricSnappy.so
 
-all: $(SO) install
+all:
+	echo "1"
+	bash ./build_shared.sh
 
-$(SO):
-	$(shell ./build_shared.sh)
-
-install: $(SO)
-	cp $(SO) ../../beeQ/lib
 
 clean:
 	rm -f $(SO)
+	rm go.mod
+	rm go.sum
diff --git a/source/tools/monitor/unity/common/protobuf/metricstore/build_shared.sh b/source/tools/monitor/unity/common/protobuf/metricstore/build_shared.sh
index 743e6b0d..c59e139b 100644
--- a/source/tools/monitor/unity/common/protobuf/metricstore/build_shared.sh
+++ b/source/tools/monitor/unity/common/protobuf/metricstore/build_shared.sh
@@ -3,5 +3,5 @@ rm go.sum
 go mod init metricSnappy.go
 go mod tidy
 go build -o libmetricSnappy.so -buildmode=c-shared metricSnappy.go
-cp libmetricSnappy.so ../../beeQ/lib
+cp libmetricSnappy.so ../../../beeQ/lib
 
-- 
Gitee


From 2cb472059dc08b6b938105a96ae603858d0cec2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=94=E5=8F=AF?= <wanruiping.wrp@alibaba-inc.com>
Date: Thu, 20 Jul 2023 16:31:20 +0800
Subject: [PATCH 3/4] rm sync.sh

---
 sync.sh | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 sync.sh

diff --git a/sync.sh b/sync.sh
deleted file mode 100644
index ab2adceb..00000000
--- a/sync.sh
+++ /dev/null
@@ -1 +0,0 @@
-rsync -avz -e 'ssh -p 1049' * root@100.82.20.22:/root/1ext/code/sysak
\ No newline at end of file
-- 
Gitee


From 4505e9cffaef54d0256832029cfedc3d445f6a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=94=E5=8F=AF?= <wanruiping.wrp@alibaba-inc.com>
Date: Thu, 20 Jul 2023 20:26:52 +0800
Subject: [PATCH 4/4] rm README

---
 .../common/protobuf/metricstore/README.md     |  10 --
 .../common/protobuf/metricstore/test_sls.go   | 136 ------------------
 2 files changed, 146 deletions(-)
 delete mode 100644 source/tools/monitor/unity/common/protobuf/metricstore/README.md
 delete mode 100644 source/tools/monitor/unity/common/protobuf/metricstore/test_sls.go

diff --git a/source/tools/monitor/unity/common/protobuf/metricstore/README.md b/source/tools/monitor/unity/common/protobuf/metricstore/README.md
deleted file mode 100644
index 95e08e3e..00000000
--- a/source/tools/monitor/unity/common/protobuf/metricstore/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-模块功能：
-	将prometheus格式字符串转化为snappy压缩后的字节流
- 
-run：
-	sh ./build_shared.sh
-  luajit ffi_lua.lua
-
-test:
-  修改metricstore信息
-  go run test_sls.go
\ No newline at end of file
diff --git a/source/tools/monitor/unity/common/protobuf/metricstore/test_sls.go b/source/tools/monitor/unity/common/protobuf/metricstore/test_sls.go
deleted file mode 100644
index 6f011c39..00000000
--- a/source/tools/monitor/unity/common/protobuf/metricstore/test_sls.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package main
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"github.com/gogo/protobuf/proto"
-	"github.com/prometheus/prometheus/prompb"
-	"io/ioutil"
-	"net/http"
-	"github.com/golang/snappy"
-	"time"
-	"strings"
-	"strconv"
-	"regexp"
-)
-
-func metricSnappy(prome_ptr *string, ret *[]byte) int {
-	/*
-		input:
-			prome_ptr, *string, prometheus data
-			ret, *[]byte, receive return byte data
-		output:
-			int, length of return data
-	*/
-	// initialize
-	var prome = strings.Split(*prome_ptr, "\n")
-	timeSeries := []prompb.TimeSeries{};
-	timestamp := time.Now().UnixNano()
-
-	for i:=0;i<len(prome);i=i+1{
-		metric := prome[i];
-
-		// seperate data
-		sep := "[{} ]"
-		result := regexp.MustCompile(sep).Split(metric, -1)
-		fmt.Println(result)
-		if (len(result)!=4){
-			continue
-		}
-		name := result[0]
-		labels_ := result[1]
-		value, _ := strconv.ParseFloat(result[2], 64)
-		re := regexp.MustCompile(`([^=]+)=["]*([^,"]+)["]*[,]*`)
-		labelTotal := re.FindAllStringSubmatch(labels_, -1)
-
-		// start to construct
-		var labels = []prompb.Label{
-			{Name: "__name__", Value: name},
-		}
-		for j:=0;j<len(labelTotal);j=j+1{
-			labelName := labelTotal[j][1]
-			labelValue := labelTotal[j][2]
-			var label = prompb.Label{
-				Name: labelName, Value: labelValue,
-			}
-			labels = append(labels, label)
-		}
-		var samples = []prompb.Sample{
-			{Timestamp: timestamp / 1000000, Value: value},
-		}
-		timeMetric := prompb.TimeSeries{
-			Labels:labels,
-			Samples:samples,
-		};
-		timeSeries = append(timeSeries,timeMetric)
-
-	}
-	if (len(timeSeries)==0){
-		return 0
-	}
-
-	// do proto and snappy
-	data, _ := proto.Marshal(&prompb.WriteRequest{Timeseries: timeSeries})
-	bufBody := snappy.Encode(nil, data)
-	*ret = bufBody
-	return len(bufBody)
-}
-
-
-func MockRemoteWrite() {
-// 	project := flag.String("project", "unity-cn-shenzhen", "")
-// 	metricStore := flag.String("metricstore", "qiaoke-work", "")
-// 	endpoint := flag.String("endpoint", "cn-shenzhen.log.aliyuncs.com", "")
-	akId := flag.String("akid", "LTAI5tMjZfyTSMeAFeA19Xx4", "") // AccessKey信息。
-	akKey := flag.String("aksecret", "t0mQM4t3NqOPdiPpDbQwzcpj5a9P0R", "")
-	flag.Parse()
-
-// 	Url := fmt.Sprintf("https://%s.%s/prometheus/%s/%s/api/v1/write", *project, *endpoint, *project, *metricStore)
-    Url := "http://unity-cn-shenzhen.cn-shenzhen-intranet.log.aliyuncs.com/prometheus/unity-cn-shenzhen/qiaoke-work/api/v1/write"
-	var data []byte;
-	ret := &data;
-	var s = "sysak_proc_cpu_total{mode=\"user\",instance=\"i-wz9d3tqjhpb8esj8ps4z\"} 0.8\nsysak_proc_cpu_total{mode=\"total\",instance=\"i-wz9d3tqjhpb8esj8ps4z\"} 3960.0\nsysak_proc_cpu_total{mode=\"user2\",instance=\"i-wz9d3tqjhpb8iesj8ps4z\"} 0.9\n"
-	prome_ptr := &s
-	r := metricSnappy(prome_ptr, ret)
-	bufBody := *ret
-	if (r==0){
-		fmt.Println("len(data)=",len(data))
-		fmt.Println("len=0")
-		return
-	}
-
-	// data, _ := proto.Marshal(&prompb.WriteRequest{Timeseries: timeSeries})
-	// bufBody := snappy.Encode(nil, data)
-	fmt.Println(bufBody)
-	rwR, err := http.NewRequest("POST", Url, ioutil.NopCloser(bytes.NewReader(bufBody)))
-	rwR.Header.Add("Content-Encoding", "snappy")
-	rwR.Header.Set("Content-Type", "application/x-protobuf")
-	rwR.SetBasicAuth(*akId, *akKey) // 设置basic auth信息。
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	start := time.Now().UnixNano() / 1000000 //ms
-	do, err := http.DefaultClient.Do(rwR)
-	end := time.Now().UnixNano() / 1000000 // ms
-	if err != nil {
-		panic(err)
-	}
-	status, result := parseResp(do)
-
-	fmt.Println("status:", status, "result:", result, "duration:", end-start)
-}
-
-func parseResp(resp *http.Response) (status, data string) {
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body) // 需要读完body内容。
-	if err != nil {
-		panic(err)
-	}
-	return resp.Status, string(body)
-}
-
-func main(){
-	MockRemoteWrite()
-}
\ No newline at end of file
-- 
Gitee