no mo jemalloc

DataDog · Sep 16, 2024 · d2701a0 · d2701a0
1 parent 539f1c9
commit d2701a0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/agent-data-plane/Cargo.toml b/bin/agent-data-plane/Cargo.toml
@@ -8,7 +8,6 @@ repository = { workspace = true }
 [dependencies]
 async-trait = { workspace = true }
 bytesize = { workspace = true }
-tikv-jemallocator = { version = "0.5", features = ["unprefixed_malloc_on_supported_platforms", "background_threads", "background_threads_runtime_support"] }
 memory-accounting = { workspace = true }
 saluki-app = { workspace = true }
 saluki-components = { workspace = true }

diff --git a/bin/agent-data-plane/src/main.rs b/bin/agent-data-plane/src/main.rs
@@ -5,7 +5,7 @@
 
 #![deny(warnings)]
 #![deny(missing_docs)]
-use std::{future::pending, time::Instant};
+use std::{alloc::System, future::pending, time::Instant};
 
 use memory_accounting::{allocator::TrackingAllocator, ComponentRegistry};
 use saluki_app::{api::APIBuilder, prelude::*};
@@ -21,7 +21,6 @@ use saluki_core::topology::TopologyBlueprint;
 use saluki_error::{ErrorContext as _, GenericError};
 use saluki_health::HealthRegistry;
 use saluki_io::net::ListenAddress;
-use tikv_jemallocator::Jemalloc;
 use tracing::{error, info};
 
 mod components;
@@ -31,7 +30,7 @@ mod env_provider;
 use self::env_provider::ADPEnvironmentProvider;
 
 #[global_allocator]
-static ALLOC: TrackingAllocator<Jemalloc> = TrackingAllocator::new(Jemalloc);
+static ALLOC: TrackingAllocator<System> = TrackingAllocator::new(System);
 
 const ADP_VERSION: &str = env!("ADP_VERSION");
 const ADP_BUILD_DESC: &str = env!("ADP_BUILD_DESC");

diff --git a/docker/Dockerfile.agent-data-plane b/docker/Dockerfile.agent-data-plane
@@ -5,7 +5,6 @@ FROM ${BUILD_IMAGE} AS builder
 
 ARG TARGETARCH
 ARG BUILD_PROFILE=release
-ARG JEMALLOC_SYS_WITH_MALLOC_CONF=abort_conf:true,background_thread:true,narenas:2,tcache_max:512,oversize_threshold:1048576,dirty_decay_ms:2500,muzzy_decay_ms:2500
 
 # Install basic utilities and an updated compiler/binutils toolchain, which is necessary for compiling.
 #