From 0dcc814b1f9002591f61e672d2cfe6ad31f805d8 Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Mon, 7 Oct 2024 12:41:22 -0400
Subject: [PATCH] fix(op-reth): add jemalloc feature to optimism-cli for
 version (#11543)

---
 Cargo.lock                     | 1 +
 crates/optimism/bin/Cargo.toml | 2 +-
 crates/optimism/cli/Cargo.toml | 9 +++++++++
 crates/optimism/cli/src/lib.rs | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index a66887900cb46..93ae84221192b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7996,6 +7996,7 @@ dependencies = [
  "reth-node-builder",
  "reth-node-core",
  "reth-node-events",
+ "reth-node-metrics",
  "reth-optimism-chainspec",
  "reth-optimism-evm",
  "reth-optimism-node",
diff --git a/crates/optimism/bin/Cargo.toml b/crates/optimism/bin/Cargo.toml
index ecb92dfc454b3..2de0bb6ee181d 100644
--- a/crates/optimism/bin/Cargo.toml
+++ b/crates/optimism/bin/Cargo.toml
@@ -31,7 +31,7 @@ workspace = true
 [features]
 default = ["jemalloc"]
 
-jemalloc = ["reth-cli-util/jemalloc"]
+jemalloc = ["reth-cli-util/jemalloc", "reth-optimism-cli/jemalloc"]
 jemalloc-prof = ["reth-cli-util/jemalloc-prof"]
 tracy-allocator = ["reth-cli-util/tracy-allocator"]
 
diff --git a/crates/optimism/cli/Cargo.toml b/crates/optimism/cli/Cargo.toml
index 99d1641e36438..d53270cd62f82 100644
--- a/crates/optimism/cli/Cargo.toml
+++ b/crates/optimism/cli/Cargo.toml
@@ -27,6 +27,9 @@ reth-node-core.workspace = true
 reth-optimism-node.workspace = true
 reth-primitives.workspace = true
 
+# so jemalloc metrics can be included
+reth-node-metrics.workspace = true
+
 ## optimism
 reth-optimism-primitives.workspace = true
 reth-optimism-chainspec.workspace = true
@@ -82,3 +85,9 @@ asm-keccak = [
     "reth-optimism-node/asm-keccak",
     "reth-primitives/asm-keccak",
 ]
+
+# Jemalloc feature for vergen to generate correct env vars
+jemalloc = [
+    "reth-node-core/jemalloc",
+    "reth-node-metrics/jemalloc"
+]
diff --git a/crates/optimism/cli/src/lib.rs b/crates/optimism/cli/src/lib.rs
index 74bc80c426ef9..e6eed86bf7fc5 100644
--- a/crates/optimism/cli/src/lib.rs
+++ b/crates/optimism/cli/src/lib.rs
@@ -51,6 +51,10 @@ use reth_optimism_node::OptimismNode;
 use reth_tracing::FileWorkerGuard;
 use tracing::info;
 
+// This allows us to manually enable node metrics features, required for proper jemalloc metric
+// reporting
+use reth_node_metrics as _;
+
 /// The main op-reth cli interface.
 ///
 /// This is the entrypoint to the executable.