Revert "merge dev in staging perf" (#2990)

Reverts #2989

Author: Geal

.changesets/fix_geal_context_mutex.md

@@ -344,7 +344,6 @@ dependencies = [
  "opentelemetry-semantic-conventions",
  "opentelemetry-zipkin",
  "p256 0.12.0",
- "parking_lot 0.12.1",
  "paste",
  "pin-project-lite",
  "prometheus",
@@ -378,7 +377,6 @@ dependencies = [
  "test-log",
  "test-span",
  "thiserror",
- "tikv-jemallocator",
  "tokio",
  "tokio-rustls",
  "tokio-stream",
@@ -5882,26 +5880,6 @@ dependencies = [
  "tower",
 ]
 
-[[package]]
-name = "tikv-jemalloc-sys"
-version = "0.5.3+5.3.0-patched"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a678df20055b43e57ef8cddde41cdfda9a3c1a060b67f4c5836dfb1d78543ba8"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "tikv-jemallocator"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979"
-dependencies = [
- "libc",
- "tikv-jemalloc-sys",
-]
-
 [[package]]
 name = "time"
 version = "0.3.20"

.changesets/fix_geal_null_field_formatter.md

@@ -203,14 +203,12 @@ yaml-rust = "0.4.5"
 wsl = "0.1.0"
 tokio-rustls = "0.23.4"
 http-serde = "1.1.2"
-parking_lot = "0.12.1"
 
 [target.'cfg(macos)'.dependencies]
 uname = "0.1.1"
 
 [target.'cfg(unix)'.dependencies]
 uname = "0.1.1"
-tikv-jemallocator = "0.5"
 
 [dev-dependencies]
 ecdsa = { version = "0.15.1", features = ["signing", "pem", "pkcs8"] }
@@ -258,4 +256,3 @@ tonic-build = "0.8.4"
 [[test]]
 name = "integration_tests"
 path = "tests/integration_tests.rs"
-

.changesets/maint_garypen_jemalloc.md

@@ -436,7 +436,7 @@ async fn handle_graphql(
     let context = request.context.clone();
 
     let res = service.oneshot(request).await;
-    let dur = context.busy_time();
+    let dur = context.busy_time().await;
     let processing_seconds = dur.as_secs_f64();
 
     tracing::info!(histogram.apollo_router_processing_time = processing_seconds,);

.changesets/maint_geal_path_manipulation.md

@@ -10,17 +10,13 @@ use std::time::Instant;
 use dashmap::mapref::multiple::RefMulti;
 use dashmap::mapref::multiple::RefMutMulti;
 use dashmap::DashMap;
-use derivative::Derivative;
-use parking_lot::Mutex;
+use futures::lock::Mutex;
 use serde::Deserialize;
 use serde::Serialize;
 use tower::BoxError;
 
-use self::extensions::Extensions;
 use crate::json_ext::Value;
 
-pub(crate) mod extensions;
-
 /// Holds [`Context`] entries.
 pub(crate) type Entries = Arc<DashMap<String, Value>>;
 
@@ -35,22 +31,17 @@ pub(crate) type Entries = Arc<DashMap<String, Value>>;
 /// [`crate::services::SubgraphResponse`] processing. At such times,
 /// plugins should restrict themselves to the [`Context::get`] and [`Context::upsert`]
 /// functions to minimise the possibility of mis-sequenced updates.
-#[derive(Clone, Deserialize, Serialize, Derivative)]
-#[derivative(Debug)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Context {
     // Allows adding custom entries to the context.
     entries: Entries,
 
-    #[serde(skip, default)]
-    pub(crate) private_entries: Arc<parking_lot::Mutex<Extensions>>,
-
     /// Creation time
     #[serde(skip)]
     #[serde(default = "Instant::now")]
     pub(crate) created_at: Instant,
 
     #[serde(skip)]
-    #[derivative(Debug = "ignore")]
     busy_timer: Arc<Mutex<BusyTimer>>,
 }
 
@@ -59,7 +50,6 @@ impl Context {
     pub fn new() -> Self {
         Context {
             entries: Default::default(),
-            private_entries: Arc::new(parking_lot::Mutex::new(Extensions::default())),
             created_at: Instant::now(),
             busy_timer: Arc::new(Mutex::new(BusyTimer::new())),
         }
@@ -196,18 +186,18 @@ impl Context {
     }
 
     /// Notify the busy timer that we're waiting on a network request
-    pub(crate) fn enter_active_request(&self) {
-        self.busy_timer.lock().increment_active_requests()
+    pub(crate) async fn enter_active_request(&self) {
+        self.busy_timer.lock().await.increment_active_requests()
     }
 
     /// Notify the busy timer that we stopped waiting on a network request
-    pub(crate) fn leave_active_request(&self) {
-        self.busy_timer.lock().decrement_active_requests()
+    pub(crate) async fn leave_active_request(&self) {
+        self.busy_timer.lock().await.decrement_active_requests()
     }
 
     /// How much time was spent working on the request
-    pub(crate) fn busy_time(&self) -> Duration {
-        self.busy_timer.lock().current()
+    pub(crate) async fn busy_time(&self) -> Duration {
+        self.busy_timer.lock().await.current()
     }
 }