build: update build process for metrics-store

Signed-off-by: Rudraksh Pareek <[email protected]>
layer5io · Apr 27, 2021 · 8a4491f · 8a4491f
1 parent 6ad4a5a
commit 8a4491f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/metrics-store/Makefile b/metrics-store/Makefile
@@ -1,18 +1,37 @@
-build:
-	cd singleton-queue && cargo +nightly build --target=wasm32-unknown-unknown --release 
-	cd metrics-collector && cargo +nightly build --target=wasm32-unknown-unknown --release 
+# check wether compiled with wasm-pack
+ifeq ($(shell test -e ./metrics-collector/pkg/metrics_collector_bg.wasm && echo -n y),y)
+	METRICS_COLLECTOR_WASM=./metrics_collector/pkg/metrics_collector_bg.wasm
+endif
+ifeq ($(shell test -e ./singleton-queue/pkg/singleton_queue_bg.wasm && echo -n y),y)
+	SINGLETON_QUEUE_WASM=./singleton-queue/pkg/singleton_queue_bg.wasm
+endif
+
+# a small optimized binary without debug info, useful for releases
+build: clean
+	cd singleton-queue && wasm-pack build --release
+	cd metrics-collector && wasm-pack build --release
+
+build-unoptimized: clean
+	cd metrics-collector; \
+	cargo +nightly build --target=wasm32-unknown-unknown --release;
+	cd singleton-queue; \
+	cargo +nightly build --target=wasm32-unknown-unknown --release;
 
 deploy:
-	docker-compose up --build --remove-orphans
+	METRICS_COLLECTOR_WASM=$(METRICS_COLLECTOR_WASM) \
+	SINGLETON_QUEUE_WASM=$(SINGLETON_QUEUE_WASM) \
+	docker-compose up --build --remove-orphans;
 
 # shows only the logs related to WASM filter/singleton
 deploy-filtered:
-	docker-compose up --build --remove-orphans | grep "\[wasm\]\|Starting"
+	METRICS_COLLECTOR_WASM=$(METRICS_COLLECTOR_WASM) \
+	SINGLETON_QUEUE_WASM=$(SINGLETON_QUEUE_WASM) \
+	docker-compose up --build --remove-orphans | grep "\[wasm\]\|Starting";
 
 run: build deploy
 
 run-filtered: build deploy-filtered
 
 clean:
-	cd singleton-queue && cargo clean
-	cd metrics-collector && cargo clean
+	cd singleton-queue && cargo clean && rm -rf ./pkg
+	cd metrics-collector && cargo clean && rm -rf ./pkg
diff --git a/metrics-store/docker-compose.yaml b/metrics-store/docker-compose.yaml
@@ -7,8 +7,8 @@ services:
       dockerfile: envoy.Dockerfile
     volumes:
       - ./envoy.yaml:/etc/envoy.yaml
-      - ./metrics-collector/target/wasm32-unknown-unknown/release/metrics_collector.wasm:/etc/metrics_collector.wasm
-      - ./singleton-queue/target/wasm32-unknown-unknown/release/singleton_queue.wasm:/etc/singleton_queue.wasm
+      - ${METRICS_COLLECTOR_WASM:-./metrics-collector/target/wasm32-unknown-unknown/release/metrics_collector.wasm}:/etc/metrics_collector.wasm
+      - ${SINGLETON_QUEUE_WASM:-./singleton-queue/target/wasm32-unknown-unknown/release/singleton_queue.wasm}:/etc/singleton_queue.wasm
     networks:
       - envoymesh
     expose:
@@ -43,4 +43,4 @@ services:
       - "8080:8080"
 
 networks:
-  envoymesh: {}
+  envoymesh: {}
diff --git a/metrics-store/metrics-collector/Cargo.toml b/metrics-store/metrics-collector/Cargo.toml
@@ -12,4 +12,5 @@ crate-type = ["cdylib"]
 [dependencies]
 proxy-wasm = "0.1.0"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-bincode = "1.0"
+bincode = "1.0"
+wasm-bindgen = "0.2"
diff --git a/metrics-store/singleton-queue/Cargo.toml b/metrics-store/singleton-queue/Cargo.toml
@@ -12,4 +12,5 @@ crate-type = ["cdylib"]
 [dependencies]
 proxy-wasm = "0.1.0"
 serde = { version = "1.0", default-features = false, features = ["derive"] }
-bincode = "1.0"
+bincode = "1.0"
+wasm-bindgen = "0.2"