improve code for docker

.docker/observability/docker-compose.yml

@@ -16,7 +16,7 @@ services:
     networks:
       - otel-network
   jaeger:
-    image: jaegertracing/jaeger:2.6.0
+    image: jaegertracing/jaeger:2.7.0
     environment:
       - TZ=Asia/Shanghai
     ports:
@@ -47,7 +47,7 @@ services:
     networks:
       - otel-network
   grafana:
-    image: grafana/grafana:12.0.1
+    image: grafana/grafana:12.0.2
     ports:
       - "3000:3000"  # Web UI
     environment:

.docker/observability/jaeger-config.yaml

@@ -50,10 +50,10 @@ extensions:
     backends:
       some_store:
         memory:
-          max_traces: 100000
+          max_traces: 1000000
       another_store:
         memory:
-          max_traces: 100000
+          max_traces: 1000000
     metric_backends:
       some_metrics_storage:
         prometheus:

.gitignore

@@ -17,4 +17,5 @@ deploy/certs/*
 .rustfs.sys
 .cargo
 profile.json
-.docker/openobserve-otel/data
+.docker/openobserve-otel/data
+*.zst

Cargo.lock

@@ -928,7 +928,7 @@ dependencies = [
  "hyper-util",
  "pin-project-lite",
  "rustls 0.21.12",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
@@ -1134,7 +1134,7 @@ dependencies = [
  "hyper 1.6.0",
  "hyper-util",
  "pin-project-lite",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "tokio",
@@ -3637,7 +3637,7 @@ dependencies = [
  "rustfs-rio",
  "rustfs-rsc",
  "rustfs-utils",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "s3s",
  "serde",
  "serde-xml-rs 0.8.1",
@@ -4854,7 +4854,7 @@ dependencies = [
  "hyper 1.6.0",
  "hyper-util",
  "log",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-native-certs 0.8.1",
  "rustls-pki-types",
  "tokio",
@@ -7533,7 +7533,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.1.1",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "socket2",
  "thiserror 2.0.12",
  "tokio",
@@ -7553,7 +7553,7 @@ dependencies = [
  "rand 0.9.1",
  "ring",
  "rustc-hash 2.1.1",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.12",
@@ -7923,7 +7923,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -8249,7 +8249,7 @@ dependencies = [
  "rustfs-rio",
  "rustfs-utils",
  "rustfs-zip",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "s3s",
  "serde",
  "serde_json",
@@ -8467,7 +8467,7 @@ dependencies = [
  "rand 0.9.1",
  "regex",
  "rustfs-config",
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "s3s",
@@ -8553,9 +8553,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.27"
+version = "0.23.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
+checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643"
 dependencies = [
  "aws-lc-rs",
  "log",
@@ -9995,7 +9995,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
 dependencies = [
- "rustls 0.23.27",
+ "rustls 0.23.28",
  "tokio",
 ]
 

Cargo.toml

@@ -187,7 +187,7 @@ rumqttc = { version = "0.24" }
 rust-embed = { version = "8.7.2" }
 rust-i18n = { version = "3.1.4" }
 rustfs-rsc = "2025.506.1"
-rustls = { version = "0.23.27" }
+rustls = { version = "0.23.28" }
 rustls-pki-types = "1.12.0"
 rustls-pemfile = "2.2.0"
 s3s = { git = "https://github.com/Nugine/s3s.git", rev = "4733cdfb27b2713e832967232cbff413bb768c10" }

crates/config/src/constants/app.rs

@@ -101,7 +101,7 @@ pub const DEFAULT_LOG_FILENAME: &str = "rustfs.log";
 /// 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 = "logs";
+pub const DEFAULT_LOG_DIR: &str = "deploy/logs";
 
 /// Default log rotation size mb for rustfs
 /// This is the default log rotation size for rustfs.

scripts/run.sh

@@ -36,7 +36,7 @@ export RUSTFS_CONSOLE_ADDRESS=":9001"
 # export RUSTFS_TLS_PATH="./deploy/certs"
 
 # 可观测性 相关配置信息
-#export RUSTFS_OBS_ENDPOINT=http://localhost:4317 # OpenTelemetry Collector 的地址
+export RUSTFS_OBS_ENDPOINT=http://localhost:4317 # OpenTelemetry Collector 的地址
 #export RUSTFS_OBS_USE_STDOUT=false # 是否使用标准输出
 #export RUSTFS_OBS_SAMPLE_RATIO=2.0 # 采样率，0.0-1.0之间，0.0表示不采样，1.0表示全部采样
 #export RUSTFS_OBS_METER_INTERVAL=1 # 采样间隔，单位为秒
@@ -50,10 +50,10 @@ export RUSTFS_OBS_LOG_ROTATION_TIME="minute" # Log rotation time unit, can be "s
 export RUSTFS_OBS_LOG_ROTATION_SIZE_MB=1 # Log rotation size in MB
 
 #
-#export RUSTFS_SINKS_FILE_PATH=./deploy/logs/rustfs.log
+export RUSTFS_SINKS_FILE_PATH=./deploy/logs/rustfs.log
-#export RUSTFS_SINKS_FILE_BUFFER_SIZE=12
+export RUSTFS_SINKS_FILE_BUFFER_SIZE=12
-#export RUSTFS_SINKS_FILE_FLUSH_INTERVAL_MS=1000
+export RUSTFS_SINKS_FILE_FLUSH_INTERVAL_MS=1000
-#export RUSTFS_SINKS_FILE_FLUSH_THRESHOLD=100
+export RUSTFS_SINKS_FILE_FLUSH_THRESHOLD=100
 #
 # Kafka sink 配置
 #export RUSTFS_SINKS_KAFKA_BROKERS=localhost:9092