Merge branch 'main' of github.com:rustfs/s3-rustfs into feature/observability-metrics

# Conflicts:
#	Cargo.lock
#	README.md
#	README_ZH.md
#	crates/obs/Cargo.toml
#	deploy/config/obs-zh.example.toml
#	scripts/run.sh

rustfs/src/config/mod.rs

@@ -64,8 +64,8 @@ pub struct Opt {
 
     /// Observability configuration file
     /// Default value: config/obs.toml
-    #[arg(long, default_value_t = rustfs_config::DEFAULT_OBS_CONFIG.to_string(), env = "RUSTFS_OBS_CONFIG")]
-    pub obs_config: String,
+    #[arg(long, default_value_t = rustfs_config::DEFAULT_OBS_ENDPOINT.to_string(), env = "RUSTFS_OBS_ENDPOINT")]
+    pub obs_endpoint: String,
 
     /// tls path for rustfs api and console.
     #[arg(long, env = "RUSTFS_TLS_PATH")]

rustfs/src/main.rs

@@ -104,7 +104,7 @@ async fn main() -> Result<()> {
     init_license(opt.license.clone());
 
     // Load the configuration file
-    let config = load_config(Some(opt.clone().obs_config));
+    let config = load_config(Some(opt.clone().obs_endpoint));
 
     // Initialize Observability
     let (_logger, guard) = init_obs(config.clone()).await;