diff --git a/source/tools/monitor/unity/beeQ/Makefile b/source/tools/monitor/unity/beeQ/Makefile index 401159bcd58d580fd9c6f0282a0270ad9c0553f4..93737366f72774ee2c20eefcaaebf98f5aca634d 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/beeQ/pack.sh b/source/tools/monitor/unity/beeQ/pack.sh index dfabfce33cb4029dea2684076f1f7c5059b48574..207b0ddda8e13947d63ad6984c36b8fd5b01b160 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 0000000000000000000000000000000000000000..dc2f130791d3ed1aa5034ac4698849d62405caf9 --- /dev/null +++ b/source/tools/monitor/unity/common/protobuf/metricstore/Makefile @@ -0,0 +1,11 @@ +SO := libmetricSnappy.so + +all: + echo "1" + bash ./build_shared.sh + + +clean: + rm -f $(SO) + rm go.mod + rm go.sum 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 76% rename from source/tools/monitor/unity/sls_metric/native/build_shared.sh rename to source/tools/monitor/unity/common/protobuf/metricstore/build_shared.sh index 743e6b0d96c4ad872263d3088d98eb6a751093b9..c59e139bf980a49e1a2def010615b5010acd1796 100644 --- a/source/tools/monitor/unity/sls_metric/native/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 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 510cd54e310df92198253c053524c621d1054dc4..1f3a9316d41f0415cf7bc2eef22519363f4f259c 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