Merge branch 'main' into syncmap-cached-stats

elastic · Jul 20, 2023 · ba6d6f6 · ba6d6f6
2 parents d245775 + 4b64bad
commit ba6d6f6
Show file tree

Hide file tree

Showing 14 changed files with 1,191 additions and 291 deletions.
diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ gen-proto: $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_VTPROTO) $(PROTOC)
 	$(eval PROTOC_VT_STRUCTS := $(shell for s in $(STRUCTS); do echo --go-vtproto_opt=pool=./aggregationpb.$$s ;done))
 	$(PROTOC) -I . --go_out=$(PROTOC_OUT) --plugin protoc-gen-go="$(PROTOC_GEN_GO)" \
 	--go-vtproto_out=$(PROTOC_OUT) --plugin protoc-gen-go-vtproto="$(PROTOC_GEN_GO_VTPROTO)" \
-	--go-vtproto_opt=features=marshal+unmarshal+size+pool \
+	--go-vtproto_opt=features=marshal+unmarshal+size+pool+clone \
 	$(PROTOC_VT_STRUCTS) \
 	$(wildcard proto/*.proto)
 	$(MAKE) fmt