Add network field to GlobalInfo (GET /api/v1/global)

integration-tests/Cargo.toml

@@ -25,6 +25,7 @@ tokio-util = { version = "0.7", default-features = false }
 tracing = { version = "0.1.41", default-features = false }
 tracing-subscriber = { version = "0.3.19", default-features = false }
 hex = "0.4.3"
+serde_json = "1"
 
 [lib]
 path = "lib/mod.rs"

integration-tests/lib/mod.rs

@@ -118,6 +118,23 @@ pub async fn start_pool(
     supported_extensions: Vec<u16>,
     required_extensions: Vec<u16>,
     enable_monitoring: bool,
+) -> (PoolSv2, SocketAddr, Option<SocketAddr>) {
+    start_pool_with_network(
+        template_provider_config,
+        supported_extensions,
+        required_extensions,
+        enable_monitoring,
+        None,
+    )
+    .await
+}
+
+pub async fn start_pool_with_network(
+    template_provider_config: TemplateProviderType,
+    supported_extensions: Vec<u16>,
+    required_extensions: Vec<u16>,
+    enable_monitoring: bool,
+    network: Option<String>,
 ) -> (PoolSv2, SocketAddr, Option<SocketAddr>) {
     use pool_sv2::config::PoolConfig;
     let listening_address = get_available_address();
@@ -160,7 +177,8 @@ pub async fn start_pool(
         monitoring_address,
         monitoring_cache_refresh_secs,
         None, // no JDS
-    );
+    )
+    .with_network(network);
     let pool = PoolSv2::new(config);
     let pool_clone = pool.clone();
     tokio::spawn(async move {
@@ -334,6 +352,27 @@ pub async fn start_sv2_translator(
     required_extensions: Vec<u16>,
     job_keepalive_interval_secs: Option<u16>,
     enable_monitoring: bool,
+) -> (TranslatorSv2, SocketAddr, Option<SocketAddr>) {
+    start_sv2_translator_with_upstream_monitoring(
+        upstreams,
+        aggregate_channels,
+        supported_extensions,
+        required_extensions,
+        job_keepalive_interval_secs,
+        enable_monitoring,
+        None,
+    )
+    .await
+}
+
+pub async fn start_sv2_translator_with_upstream_monitoring(
+    upstreams: &[SocketAddr],
+    aggregate_channels: bool,
+    supported_extensions: Vec<u16>,
+    required_extensions: Vec<u16>,
+    job_keepalive_interval_secs: Option<u16>,
+    enable_monitoring: bool,
+    upstream_monitoring_url: Option<String>,
 ) -> (TranslatorSv2, SocketAddr, Option<SocketAddr>) {
     let job_keepalive_interval_secs = job_keepalive_interval_secs.unwrap_or(60);
     let upstreams = upstreams
@@ -391,7 +430,8 @@ pub async fn start_sv2_translator(
         required_extensions,
         monitoring_address,
         monitoring_cache_refresh_secs,
-    );
+    )
+    .with_upstream_monitoring_url(upstream_monitoring_url);
     let translator_v2 = translator_sv2::TranslatorSv2::new(config);
     let clone_translator_v2 = translator_v2.clone();
     tokio::spawn(async move {