refactor: adjust location and upstream of ctx

Author: vicanso

.gitignore

@@ -22,3 +22,5 @@ dist
 dhat*.json
 default_*
 report.*
+.shuttle*
+Secrets*.toml

Cargo.lock

@@ -182,7 +182,6 @@ reqwest = { version = "0.12.12", default-features = false, features = [
     "json",
     "default-tls",
 ] }
-hostname = "0.4.0"
 futures = "0.3.31"
 humantime = "2.1.0"
 url = "2.5.4"

Cargo.toml

@@ -293,7 +293,7 @@ fn bench_logger_format(c: &mut Criterion) {
             upstream_connected: Some(10),
             upstream_processing_time: Some(50),
             upstream_response_time: Some(5),
-            location: None,
+            location: "".to_string(),
             connection_time: 300,
             tls_version: Some("tls1.2".to_string()),
             processing: 10,
@@ -314,7 +314,12 @@ fn bench_logger_format(c: &mut Criterion) {
 
 fn bench_get_location(c: &mut Criterion) {
     let mut map: AHashMap<String, Arc<Location>> = AHashMap::new();
-    for _ in 0..10 {
+    let id = nanoid!(6);
+    map.insert(
+        id.clone(),
+        Arc::new(Location::new(id.as_str(), &LocationConf::default()).unwrap()),
+    );
+    for _ in 0..20 {
         let id = nanoid!(6);
         map.insert(
             id.clone(),
@@ -326,9 +331,10 @@ fn bench_get_location(c: &mut Criterion) {
 
     let locations: ArcSwap<AHashMap<String, Arc<Location>>> =
         ArcSwap::from_pointee(map);
+    locations.load().get(&id).unwrap();
     c.bench_function("get location", |b| {
         b.iter(|| {
-            let _ = locations.load().get("1").cloned();
+            let _ = locations.load().get(&id).cloned();
         })
     });
 }

benches/bench.rs

@@ -50,6 +50,7 @@ graph TD
     performance --> upstream
     performance --> util
 
+    plugin --> cache
     plugin --> config
     plugin --> http-extra
     plugin --> state

docs/modules.md

@@ -427,12 +427,8 @@ impl Parser {
 
 #[cfg(test)]
 mod tests {
-    use std::sync::Arc;
-
     use super::{format_extra_tag, Parser, Tag, TagCategory};
     use http::Method;
-    use pingap_config::LocationConf;
-    use pingap_location::Location;
     use pingap_state::Ctx;
     use pingora::proxy::Session;
     use pretty_assertions::assert_eq;
@@ -658,15 +654,7 @@ mod tests {
             upstream_address: "192.186.1.1:6188".to_string(),
             processing: 1,
             upstream_connect_time: Some(100),
-            location: Some(Arc::new(
-                Location::new(
-                    "test",
-                    &LocationConf {
-                        ..Default::default()
-                    },
-                )
-                .unwrap(),
-            )),
+            location: "test".to_string(),
             connection_time: 300,
             tls_version: Some("1.2".to_string()),
             request_id: Some("nanoid".to_string()),

pingap-logger/src/access.rs

@@ -179,12 +179,8 @@ impl Prometheus {
     /// This method performs multiple metric updates but uses efficient
     /// atomic operations to minimize overhead.
     pub fn after(&self, session: &Session, ctx: &Ctx) {
-        let mut location = "";
-        let mut upstream = "";
-        if let Some(lo) = &ctx.location {
-            location = &lo.name;
-            upstream = &lo.upstream;
-        }
+        let location = &ctx.location;
+        let upstream = &ctx.upstream;
         let response_time =
             ((pingap_util::now_ms()) - ctx.created_at) as f64 / SECOND;
         // payload size(kb)
@@ -255,7 +251,7 @@ impl Prometheus {
 
         // upstream
         if !upstream.is_empty() {
-            let upstream_labels = &[upstream];
+            let upstream_labels = &[upstream.as_str()];
             if let Some(count) = ctx.upstream_connected {
                 self.upstream_connections
                     .with_label_values(upstream_labels)
@@ -801,12 +797,9 @@ pub fn new_prometheus(server: &str) -> Result<Prometheus> {
 mod tests {
     use super::new_prometheus;
     use http::StatusCode;
-    use pingap_config::LocationConf;
-    use pingap_location::Location;
     use pingap_state::{CompressionStat, Ctx};
     use pingora::proxy::Session;
     use pretty_assertions::assert_eq;
-    use std::sync::Arc;
     use std::time::Duration;
     use tokio_test::io::Builder;
 
@@ -831,15 +824,6 @@ mod tests {
         let p = new_prometheus("pingap").unwrap();
         p.before("");
 
-        let lo = Location::new(
-            "lo",
-            &LocationConf {
-                upstream: Some("upstream".to_string()),
-                ..Default::default()
-            },
-        )
-        .unwrap();
-
         p.after(
             &session,
             &Ctx {
@@ -860,7 +844,8 @@ mod tests {
                     out_bytes: 512,
                     duration: Duration::from_millis(20),
                 }),
-                location: Some(Arc::new(lo)),
+                location: "lo".to_string(),
+                upstream: "upstream".to_string(),
                 ..Default::default()
             },
         );

pingap-performance/src/prom.rs

@@ -23,10 +23,7 @@ opentelemetry = { version = "0.27.1", default-features = false, features = [
     "trace",
 ], optional = true }
 tokio = { workspace = true }
-pingap-location = { path = "../pingap-location" }
-pingap-upstream = { path = "../pingap-upstream" }
 pingap-util = { path = "../pingap-util" }
-pingap-config = { path = "../pingap-config" }
 
 
 [features]

pingap-state/Cargo.toml

@@ -16,8 +16,6 @@ use ahash::AHashMap;
 use bytes::{Bytes, BytesMut};
 use http::StatusCode;
 use http::Uri;
-use pingap_location::Location;
-use pingap_upstream::Upstream;
 use pingap_util::format_duration;
 use pingora::cache::CacheKey;
 
@@ -28,7 +26,7 @@ use opentelemetry::{
     Context,
 };
 use pingora_limits::inflight::Guard;
-use std::{sync::Arc, time::Duration};
+use std::time::Duration;
 
 pub trait ModifyResponseBody: Sync + Send {
     fn handle(&self, data: Bytes) -> Bytes;
@@ -102,7 +100,7 @@ pub struct Ctx {
     /// Indicates if this connection is being reused
     pub connection_reused: bool,
     /// The location configuration handling this request
-    pub location: Option<Arc<Location>>,
+    pub location: String,
     /// Address of the upstream server
     pub upstream_address: String,
     /// Client's IP address
@@ -131,7 +129,7 @@ pub struct Ctx {
     pub cache_lock_time: Option<u64>,
     /// Maximum time-to-live for cache entries
     pub cache_max_ttl: Option<Duration>,
-    pub upstream: Option<Arc<Upstream>>,
+    pub upstream: String,
     /// Indicates if the upstream connection is being reused
     pub upstream_reused: bool,
     /// Number of requests being processed by upstream
@@ -309,8 +307,8 @@ impl Ctx {
                 }
             },
             "location" => {
-                if let Some(location) = &self.location {
-                    buf.extend(location.name.as_bytes())
+                if !self.location.is_empty() {
+                    buf.extend(self.location.as_bytes())
                 }
             },
             "connection_time" => {
@@ -395,10 +393,7 @@ pub fn get_cache_key(ctx: &Ctx, method: &str, uri: &Uri) -> CacheKey {
 mod tests {
     use super::*;
     use bytes::BytesMut;
-    use pingap_config::LocationConf;
-    use pingap_location::Location;
     use pretty_assertions::assert_eq;
-    use std::sync::Arc;
     use std::time::Duration;
 
     #[test]
@@ -477,15 +472,7 @@ mod tests {
                 .as_ref()
         );
 
-        ctx.location = Some(Arc::new(
-            Location::new(
-                "pingap",
-                &LocationConf {
-                    ..Default::default()
-                },
-            )
-            .unwrap(),
-        ));
+        ctx.location = "pingap".to_string();
         assert_eq!(
             b"pingap",
             ctx.append_value(BytesMut::new(), "location").as_ref()

pingap-state/src/ctx.rs

@@ -564,6 +564,9 @@ static UPSTREAM_MAP: Lazy<ArcSwap<Upstreams>> =
     Lazy::new(|| ArcSwap::from_pointee(AHashMap::new()));
 
 pub fn get_upstream(name: &str) -> Option<Arc<Upstream>> {
+    if name.is_empty() {
+        return None;
+    }
     UPSTREAM_MAP.load().get(name).cloned()
 }
 

pingap-upstream/src/upstream.rs

@@ -18,4 +18,3 @@ tracing = { workspace = true }
 strum = { workspace = true }
 reqwest = { workspace = true }
 pingap-util = { path = "../pingap-util" }
-hostname = { workspace = true }

pingap-webhook/Cargo.toml

@@ -159,11 +159,7 @@ pub async fn send_notification(params: SendNotificationParams) {
 
     let client = reqwest::Client::new();
     let mut data = serde_json::Map::new();
-    let hostname = hostname::get()
-        .unwrap_or_default()
-        .to_str()
-        .unwrap_or_default()
-        .to_string();
+    let hostname = pingap_util::get_hostname();
     // TODO get app name from config
     let name = "pingap".to_string();
     let color_type = match level {