Merge pull request #13 from mezmo/darinspivey/sync_3.14.3

Merge upstream private repo v3.14.3
mezmo · Apr 8, 2024 · ce4dafb · ce4dafb
2 parents 4b4cda8 + 8d40441
commit ce4dafb
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -318,7 +318,7 @@ stream-cancel = { version = "0.8.1", default-features = false }
 strip-ansi-escapes = { version = "0.2.0", default-features = false }
 syslog = { version = "6.1.0", default-features = false, optional = true }
 urlencoding = { version = "2.1.0", default-features = false }
-tikv-jemallocator = { version = "0.5.4", default-features = false, optional = true }
+tikv-jemallocator = { version = "0.5.4", default-features = false, optional = true, features = ["profiling"] }
 tokio-postgres = { version = "0.7.10", default-features = false, features = ["runtime", "with-chrono-0_4"], optional = true }
 tokio-tungstenite = {version = "0.20.1", default-features = false, features = ["connect"], optional = true}
 toml = { version = "0.8.6", default-features = false, features = ["parse", "display"] }

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -50,7 +50,9 @@ pipeline {
     ENVIRONMENT_AUTOBUILD = 'false'
     ENVIRONMENT_TTY = 'false'
     CI = 'true'
-    VECTOR_TARGET = "${BRANCH_BUILD}"
+    VECTOR_TARGET = "${BRANCH_BUILD}-target"
+    VECTOR_CARGO_CACHE = "${BRANCH_BUILD}-cargo"
+    VECTOR_RUSTUP_CACHE = "${BRANCH_BUILD}-rustup"
   }
   stages {
     stage('Validate PR Author') {
@@ -85,7 +87,6 @@ pipeline {
         }
       }
     }
-
     stage('Unit test'){
       // Important: do one step serially since it'll be the one to prepare the testing container
       // and install the rust toolchain in it. Volume mounts are created here, too.
@@ -197,9 +198,9 @@ pipeline {
   }
   post {
     always {
-      // Clear disk space by removing the `target` volume mount where the binaries are stored.
-      // The volume is unique to the current build, so there should be no "in use" errors.
-      sh 'make target-clean'
+      // Clear disk space by removing the test container and all of its volumes.
+      // The container and volumes are unique to the current build, so there should be no "in use" errors.
+      sh 'make environment-clean'
 
       script {
         if (env.SANITY_BUILD == 'true') {

diff --git a/MEZMO_CHANGELOG.md b/MEZMO_CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Changelog
 
 ## [3.14.1](https://github.com/mezmo/vector/compare/v3.14.0...v3.14.1) (2024-04-04)
+## [3.14.3](https://github.com/answerbook/vector/compare/v3.14.2...v3.14.3) (2024-04-08)
 
 
 ### Bug Fixes
@@ -14,6 +15,9 @@
 
 * **ci**: Clean disk space after ci runs [ci skip] [7963582](https://github.com/mezmo/vector/commit/796358215aaa5eecd597addbd39a6e5fad998a13) - Darin Spivey [LOG-19590](https://logdna.atlassian.net/browse/LOG-19590)
 * **throttle**: use ms for window config [f898c1f](https://github.com/mezmo/vector/commit/f898c1ff8b873a63937e061d722a9499cd8da9b4) - Mike Del Tito [LOG-19565](https://logdna.atlassian.net/browse/LOG-19565)
+* **ci**: Make all vector dev volumnes unique [ee0749c](https://github.com/answerbook/vector/commit/ee0749c296fdeef2220b889b6bce8ec74771f040) - Darin Spivey [LOG-19643](https://logdna.atlassian.net/browse/LOG-19643)
+
+## [3.14.2](https://github.com/answerbook/vector/compare/v3.14.1...v3.14.2) (2024-04-05)
 
 
 ### Chores
@@ -27,6 +31,7 @@
 
 * **throttle**: add state persistence [ad882f2](https://github.com/mezmo/vector/commit/ad882f26c0f88b660b75b6be9f9c443fac554620) - Mike Del Tito [LOG-19565](https://logdna.atlassian.net/browse/LOG-19565)
 * **throttle**: reimplement throttle transform with basic rate limiting [066cac3](https://github.com/mezmo/vector/commit/066cac3957882804c6174f11924e1b2ea4a0b91f) - Mike Del Tito [LOG-19565](https://logdna.atlassian.net/browse/LOG-19565)
+* reenable `profiling` feature for jemalloc [6e3e3d5](https://github.com/answerbook/vector/commit/6e3e3d57f9c67e4a4683cba22cf838e0f33588d5) - Mike Del Tito [LOG-19647](https://logdna.atlassian.net/browse/LOG-19647)
 
 
 ### Miscellaneous
@@ -37,6 +42,8 @@
 * Merge pull request #438 from answerbook/mdeltito/LOG-19565 [f8854d6](https://github.com/mezmo/vector/commit/f8854d6c07b4cc173531acb70ced6a2aea424b17) - GitHub [LOG-19565](https://logdna.atlassian.net/browse/LOG-19565)
 
 ## [3.13.6](https://github.com/mezmo/vector/compare/v3.13.5...v3.13.6) (2024-04-03)
+* Merge pull request #442 from answerbook/mdeltito/LOG-19647 [10e26f6](https://github.com/answerbook/vector/commit/10e26f6e4cb0d7fd311f4c3ab0e432f208903414) - GitHub [LOG-19647](https://logdna.atlassian.net/browse/LOG-19647)
+
 ## [3.14.1](https://github.com/answerbook/vector/compare/v3.14.0...v3.14.1) (2024-04-03)
 
 

diff --git a/Makefile b/Makefile
@@ -95,6 +95,8 @@ export VERSION ?= $(shell command -v cargo >/dev/null && cargo vdev version || e
 export CI ?= false
 
 export VECTOR_TARGET ?= vector-target
+export VECTOR_CARGO_CACHE ?= vector-cargo-cache
+export VECTOR_RUSTUP_CACHE ?= vector-rustup-cache
 
 export RUST_VERSION ?= $(shell grep channel rust-toolchain.toml | cut -d '"' -f 2)
 
@@ -149,6 +151,7 @@ BUILD_TAG ?=
 CONTAINER_ID = vector-environment-$(shell echo $(BUILD_TAG) | sed -E 's/[^a-zA-Z0-9_.-]/-/g')$(shell date +%s)-$(shell echo $$PPID)
 
 # We use a volume here as non-Linux hosts are extremely slow to share disks, and Linux hosts tend to get permissions clobbered.
+# Note that `--rm` does not remove named volumes, so these will provide caching until removed with `evironment-clean`
 define ENVIRONMENT_EXEC
 	${ENVIRONMENT_PREPARE}
 	@echo "Entering environment..."
@@ -165,8 +168,8 @@ define ENVIRONMENT_EXEC
 			--mount type=bind,source=${CURRENT_DIR},target=/git/vectordotdev/vector \
 			$(if $(findstring docker,$(CONTAINER_TOOL)),--mount type=bind$(COMMA)source=/var/run/docker.sock$(COMMA)target=/var/run/docker.sock,) \
 			--mount type=volume,source=${VECTOR_TARGET},target=/git/vectordotdev/vector/target \
-			--mount type=volume,source=vector-cargo-cache,target=/root/.cargo \
-			--mount type=volume,source=vector-rustup-cache,target=/root/.rustup \
+			--mount type=volume,source=${VECTOR_CARGO_CACHE},target=/root/.cargo \
+			--mount type=volume,source=${VECTOR_RUSTUP_CACHE},target=/root/.rustup \
 			$(foreach publish,$(ENVIRONMENT_PUBLISH),--publish $(publish)) \
 			$(ENVIRONMENT_UPSTREAM)
 endef
@@ -208,14 +211,17 @@ environment:
 environment-prepare: ## Prepare the Vector dev shell using $CONTAINER_TOOL.
 	${ENVIRONMENT_PREPARE}
 
-.PHONY: target-clean
-target-clean: ## Clean just the target volume, and leave toolchain/cargo in tact
-	@echo "Removing vector target volume: ${VECTOR_TARGET}"
-	@$(CONTAINER_TOOL) volume rm -f ${VECTOR_TARGET}
-
 .PHONY: environment-clean
 environment-clean: ## Clean the Vector dev shell using $CONTAINER_TOOL.
-	@$(CONTAINER_TOOL) volume rm -f ${VECTOR_TARGET} vector-cargo-cache vector-rustup-cache
+	@echo "\nList of active volumes"
+	@$(CONTAINER_TOOL) volume ls
+	@echo "\nList of all containers"
+	@$(CONTAINER_TOOL) ps -a
+	@echo "\nRemoving vector dev volumes"
+	@$(CONTAINER_TOOL) volume rm -f ${VECTOR_TARGET} ${VECTOR_CARGO_CACHE} ${VECTOR_RUSTUP_CACHE}
+	@echo "\nRemoving stopped containers"
+	@$(CONTAINER_TOOL) container prune
+	@echo "\nRemoving vector dev image (if possible)"
 	@$(CONTAINER_TOOL) rmi $(ENVIRONMENT_UPSTREAM) || true
 
 .PHONY: environment-push

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vector",
-  "version": "3.14.1",
+  "version": "3.14.3",
   "description": "Vector is a high-performance, end-to-end (agent & aggregator) observability data pipeline",
   "repository": {
     "type": "git",