improve code for dockerfile (#256)

* improve code for dockerfile

* Update Dockerfile

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* improve code for file name

* improve code for dockerfile

* fix

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

crates/config/src/constants/app.rs

@@ -108,14 +108,26 @@ pub const DEFAULT_CONSOLE_ADDRESS: &str = concat!(":", DEFAULT_CONSOLE_PORT);
 /// It is used to store the logs of the application.
 /// Default value: rustfs.log
 /// Environment variable: RUSTFS_OBSERVABILITY_LOG_FILENAME
-pub const DEFAULT_LOG_FILENAME: &str = "rustfs.log";
+pub const DEFAULT_LOG_FILENAME: &str = "rustfs";
+
+/// Default OBS log filename for rustfs
+/// This is the default log filename for OBS.
+/// It is used to store the logs of the application.
+/// Default value: rustfs.log
+pub const DEFAULT_OBS_LOG_FILENAME: &str = concat!(DEFAULT_LOG_FILENAME, ".log");
+
+/// Default sink file log file for rustfs
+/// This is the default sink file log file for rustfs.
+/// It is used to store the logs of the application.
+/// Default value: rustfs-sink.log
+pub const DEFAULT_SINK_FILE_LOG_FILE: &str = concat!(DEFAULT_LOG_FILENAME, "-sink.log");
 
 /// Default log directory for rustfs
 /// This is the default log directory for rustfs.
 /// It is used to store the logs of the application.
 /// Default value: logs
 /// Environment variable: RUSTFS_OBSERVABILITY_LOG_DIRECTORY
-pub const DEFAULT_LOG_DIR: &str = "deploy/logs";
+pub const DEFAULT_LOG_DIR: &str = "/logs";
 
 /// Default log rotation size mb for rustfs
 /// This is the default log rotation size for rustfs.

crates/obs/src/config.rs

@@ -14,7 +14,8 @@
 
 use rustfs_config::{
     APP_NAME, DEFAULT_LOG_DIR, DEFAULT_LOG_FILENAME, DEFAULT_LOG_KEEP_FILES, DEFAULT_LOG_LEVEL, DEFAULT_LOG_ROTATION_SIZE_MB,
-    DEFAULT_LOG_ROTATION_TIME, ENVIRONMENT, METER_INTERVAL, SAMPLE_RATIO, SERVICE_VERSION, USE_STDOUT,
+    DEFAULT_LOG_ROTATION_TIME, DEFAULT_OBS_LOG_FILENAME, DEFAULT_SINK_FILE_LOG_FILE, ENVIRONMENT, METER_INTERVAL, SAMPLE_RATIO,
+    SERVICE_VERSION, USE_STDOUT,
 };
 use serde::{Deserialize, Serialize};
 use std::env;
@@ -104,7 +105,7 @@ impl OtelConfig {
             log_filename: env::var("RUSTFS_OBS_LOG_FILENAME")
                 .ok()
                 .and_then(|v| v.parse().ok())
-                .or(Some(DEFAULT_LOG_FILENAME.to_string())),
+                .or(Some(DEFAULT_OBS_LOG_FILENAME.to_string())),
             log_rotation_size_mb: env::var("RUSTFS_OBS_LOG_ROTATION_SIZE_MB")
                 .ok()
                 .and_then(|v| v.parse().ok())
@@ -210,16 +211,15 @@ pub struct FileSinkConfig {
 
 impl FileSinkConfig {
     pub fn get_default_log_path() -> String {
-        let temp_dir = env::temp_dir().join("rustfs");
-
+        let temp_dir = env::temp_dir().join(DEFAULT_LOG_FILENAME);
         if let Err(e) = std::fs::create_dir_all(&temp_dir) {
             eprintln!("Failed to create log directory: {e}");
-            return "rustfs/rustfs.log".to_string();
+            return DEFAULT_LOG_DIR.to_string();
         }
         temp_dir
-            .join("rustfs.log")
+            .join(DEFAULT_SINK_FILE_LOG_FILE)
             .to_str()
-            .unwrap_or("rustfs/rustfs.log")
+            .unwrap_or(DEFAULT_LOG_DIR)
             .to_string()
     }
     pub fn new() -> Self {

crates/obs/src/logger.rs

@@ -77,8 +77,7 @@ impl Logger {
     }
 
     /// Asynchronous logging of unified log entries
-    #[tracing::instrument(skip(self), fields(log_source = "logger"))]
-    #[tracing::instrument(level = "error", skip_all)]
+    #[tracing::instrument(skip_all, fields(log_source = "logger"))]
     pub async fn log_entry(&self, entry: UnifiedLogEntry) -> Result<(), GlobalError> {
         // Extract information for tracing based on entry type
         match &entry {

crates/obs/src/sinks/mod.rs

@@ -14,6 +14,7 @@
 
 use crate::{AppConfig, SinkConfig, UnifiedLogEntry};
 use async_trait::async_trait;
+use rustfs_config::DEFAULT_SINK_FILE_LOG_FILE;
 use std::sync::Arc;
 
 #[cfg(feature = "file")]
@@ -71,7 +72,7 @@ pub async fn create_sinks(config: &AppConfig) -> Vec<Arc<dyn Sink>> {
             SinkConfig::File(file_config) => {
                 tracing::debug!("FileSink: Using path: {}", file_config.path);
                 match file::FileSink::new(
-                    file_config.path.clone(),
+                    format!("{}/{}", file_config.path.clone(), DEFAULT_SINK_FILE_LOG_FILE),
                     file_config.buffer_size.unwrap_or(8192),
                     file_config.flush_interval_ms.unwrap_or(1000),
                     file_config.flush_threshold.unwrap_or(100),