jeprof, jemalloc & friends

.drone.yml

@@ -1,10 +1,9 @@
-when:
+---
-  event:
+kind: pipeline
-  - push
+name: default
-  - pull_request
+
-  - tag
+node:
-  - cron
+  nix-daemon: 1
-  - manual
 
 steps:
   - name: check formatting
@@ -24,3 +23,18 @@ steps:
     commands:
       - nix build --extra-experimental-features nix-command --extra-experimental-features flakes .#test.x86_64-linux.tricot
       - ./result-bin/bin/tricot-*
+
+trigger:
+  event:
+  - custom
+  - push
+  - pull_request
+  - tag
+  - cron
+
+
+---
+kind: signature
+hmac: 49cde53ec25364cc3b3f041092c8e658fe9252342253757d86814ca12d5cb0f7
+
+...

Cargo.toml

@@ -38,11 +38,9 @@ opentelemetry = "0.20"
 opentelemetry-prometheus = "0.13"
 prometheus = "0.13"
 df-consul = "0.3.5"
-
+tikv-jemallocator = { version = "0.5", features = ["profiling"] }
-dhat = { version = "0.3", optional = true }
+tikv-jemalloc-ctl = "0.5"
+common-mem-prof = { git = "https://github.com/GreptimeTeam/greptimedb", rev = "fcff66e03904d80aacb91b8edd4e15240161d264" }
 
 [profile.release]
 debug = 1
-
-[features]
-dhat-heap = [ "dhat" ]

README.md

@@ -1,6 +1,6 @@
 # Tricot
 
-[![status-badge](https://woodpecker.deuxfleurs.fr/api/badges/36/status.svg)](https://woodpecker.deuxfleurs.fr/repos/36)
+[![Build Status](https://drone.deuxfleurs.fr/api/badges/Deuxfleurs/tricot/status.svg)](https://drone.deuxfleurs.fr/Deuxfleurs/tricot)
 
 Tricot is a reverse-proxy for exposing your services via TLS that integrates well with Consul and Nomad.
 

flake.lock

@@ -10,17 +10,17 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1713199118,
+        "lastModified": 1666087781,
-        "narHash": "sha256-MlLdAvk+zXCFUy280sY6LqtykqWXIkKVXo72J7a6HlU=",
+        "narHash": "sha256-trKVdjMZ8mNkGfLcY5LsJJGtdV3xJDZnMVrkFjErlcs=",
-        "owner": "cargo2nix",
+        "owner": "Alexis211",
         "repo": "cargo2nix",
-        "rev": "1efb03f2f794ad5eed17e807e858c4da001dbc3e",
+        "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
         "type": "github"
       },
       "original": {
-        "owner": "cargo2nix",
+        "owner": "Alexis211",
         "repo": "cargo2nix",
-        "rev": "1efb03f2f794ad5eed17e807e858c4da001dbc3e",
+        "rev": "a7a61179b66054904ef6a195d8da736eaaa06c36",
         "type": "github"
       }
     },
@@ -55,47 +55,93 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731094700,
+        "lastModified": 1696234590,
-        "narHash": "sha256-lSiVjHP7sgnCt2hZabnq+tCLmBerDKmAdd2CS6BrBjw=",
+        "narHash": "sha256-mgOzQYTvaTT4bFopVOadlndy2RPwLy60rDjIWOGujwo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "551ba0fa7653afb9d590db225c3bcbccf68931c0",
+        "rev": "f902cb49892d300ff15cb237e48aa1cad79d68c3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1665657542,
+        "narHash": "sha256-mojxNyzbvmp8NtVtxqiHGhRfjCALLfk9i/Uup68Y5q8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a3073c49bc0163fea6a121c276f526837672b555",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "551ba0fa7653afb9d590db225c3bcbccf68931c0",
+        "rev": "a3073c49bc0163fea6a121c276f526837672b555",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
         "cargo2nix": "cargo2nix",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "rust-overlay": {
       "inputs": {
-        "nixpkgs": [
+        "flake-utils": "flake-utils_2",
-          "cargo2nix",
+        "nixpkgs": "nixpkgs"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1731032894,
+        "lastModified": 1682389182,
-        "narHash": "sha256-dQSyYPmrQiPr+PGEd+K8038rubFGz7G/dNXVeaGWE0w=",
+        "narHash": "sha256-8t2nmFnH+8V48+IJsf8AK51ebXNlVbOSVYOpiqJKvJE=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d52f2a4c103a0acf09ded857b9e2519ae2360e59",
+        "rev": "74f1a64dd28faeeb85ef081f32cad2989850322c",
         "type": "github"
       },
       "original": {
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d52f2a4c103a0acf09ded857b9e2519ae2360e59",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
         "type": "github"
       }
     }

flake.nix

@@ -1,43 +1,31 @@
 {
-  description = "Tricot, a reverse proxy with consul integration";
+  description = "A very basic flake";
 
-  # Nixpkgs 24.05 as of 2024-11-08, has rustc v1.77.2
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/a3073c49bc0163fea6a121c276f526837672b555";
-  inputs.nixpkgs.url =
-    "github:NixOS/nixpkgs/551ba0fa7653afb9d590db225c3bcbccf68931c0";
   inputs.cargo2nix = {
-    # cargo2nix as of 2024-04-25
+    # As of 2022-10-18: two small patches over unstable branch, one for clippy and one to fix feature detection
-    # NB: upgrading to a more recent commit of cargo2nix will not work (as of 2024-11-08),
+    url = "github:Alexis211/cargo2nix/a7a61179b66054904ef6a195d8da736eaaa06c36";
-    # because the patch making openssl-sys cross-compilation work has been reverted.
-    # (patch: https://github.com/cargo2nix/cargo2nix/pull/237,
-    #  revert: https://github.com/cargo2nix/cargo2nix/commit/cfd086deb565314f3a11b5bb25807a3ce17315d4)
-    url = "github:cargo2nix/cargo2nix/1efb03f2f794ad5eed17e807e858c4da001dbc3e";
 
-    # Rust overlay as of 2024-11-08
+    # Rust overlay as of 2023-04-25
     inputs.rust-overlay.url =
-      "github:oxalica/rust-overlay/d52f2a4c103a0acf09ded857b9e2519ae2360e59";
+      "github:oxalica/rust-overlay/74f1a64dd28faeeb85ef081f32cad2989850322c";
 
     inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = { self, nixpkgs, cargo2nix }:
   let
-    targetHost = "x86_64-unknown-linux-musl";
     pkgs = import nixpkgs {
       system = "x86_64-linux";
-      crossSystem = {
-        config = targetHost;
-        isStatic = true;
-      };
       overlays = [ cargo2nix.overlays.default ];
     };
     packageFun = import ./Cargo.nix;
-    rustVersion = "1.77.2";
+    rustVersion = "1.68.0";
 
     compile = args: compileMode:
       let
         packageSet = pkgs.rustBuilder.makePackageSet ({
           inherit packageFun rustVersion;
-          target = targetHost;
         } // args);
       in
         packageSet.workspace.tricot {
@@ -49,13 +37,5 @@
     debug.x86_64-linux.tricot = compile { release = false; } "build";
     packages.x86_64-linux.tricot = compile { release = true; } "build";
     packages.x86_64-linux.default = self.packages.x86_64-linux.tricot;
-
-    docker = pkgs.dockerTools.buildImage {
-      name = "tricot";
-      config = {
-        contents = [ pkgs.cacert ];
-        Cmd = [ "${self.packages.x86_64-linux.default}/bin/tricot" ];
-      };
-    };
   };
 }

src/https.rs

@@ -371,8 +371,8 @@ async fn do_proxy(
 		reverse_proxy::call(remote_addr.ip(), &to_addr, req).await?
 	};
 
-	if response.status().is_success() || response.status().is_redirection() {
+	if response.status().is_success() {
-		// (TODO: maybe we want to add these headers even if it's not a success or redirection?)
+		// (TODO: maybe we want to add these headers even if it's not a success?)
 		for (header, value) in proxy_to.add_headers.iter() {
 			response.headers_mut().insert(
 				HeaderName::from_bytes(header.as_bytes())?,

src/main.rs

@@ -24,9 +24,12 @@ mod tls_util;
 pub use df_consul as consul;
 use proxy_config::ProxyConfig;
 
-#[cfg(feature = "dhat-heap")]
+#[cfg(not(target_env = "msvc"))]
+use tikv_jemallocator::Jemalloc;
+
+#[cfg(not(target_env = "msvc"))]
 #[global_allocator]
-static ALLOC: dhat::Alloc = dhat::Alloc;
+static GLOBAL: Jemalloc = Jemalloc;
 
 #[derive(StructOpt, Debug)]
 #[structopt(name = "tricot")]
@@ -110,6 +113,7 @@ struct Opt {
 	pub warmup_cert_memory_store: bool,
 }
 
+
 #[tokio::main(flavor = "multi_thread", worker_threads = 10)]
 async fn main() {
 	#[cfg(feature = "dhat-heap")]
@@ -132,7 +136,6 @@ async fn main() {
 	let opt = Opt::from_args();
 
 	info!("Starting Tricot");
-	println!("Starting Tricot");
 
 	let (exit_signal, provoke_exit) = watch_ctrl_c();
 	let exit_on_err = move |err: anyhow::Error| {
@@ -211,7 +214,8 @@ async fn main() {
 		.then(|_| async { info!("HTTPS server exited") }),
 	);
 
-	let dump_task = tokio::spawn(dump_config_on_change(rx_proxy_config, exit_signal.clone()));
+    let dump_task = tokio::spawn(dump_config_on_change(rx_proxy_config, exit_signal.clone()));
+
 
 	metrics_task.await.expect("Tokio task await failure");
 	http_task.await.expect("Tokio task await failure");

src/metrics.rs

@@ -70,6 +70,11 @@ impl MetricsServer {
 		debug!("{} {}", req.method(), req.uri());
 
 		let response = match (req.method(), req.uri().path()) {
+            (&Method::GET, "/hprof") => {
+                let buff = common_mem_prof::dump_profile().await.unwrap();
+                tokio::fs::write("memdump.hprof", buff).await.unwrap();
+                Response::builder().status(204).body(Body::from(vec![])).unwrap()
+            },
 			(&Method::GET, "/metrics") => {
 				let mut buffer = vec![];
 				let encoder = TextEncoder::new();