Skip to content

Commit d3c8971

Browse files
committed
feat(tracing): migrate to OpenTelemetry OTLP and enrich trace metadata
Signed-off-by: Gaius <gaius.qi@gmail.com>
1 parent 1d63a07 commit d3c8971

File tree

8 files changed

+126
-135
lines changed

8 files changed

+126
-135
lines changed

Cargo.lock

Lines changed: 70 additions & 113 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dragonfly-client/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ lru.workspace = true
6363
fs2.workspace = true
6464
lazy_static.workspace = true
6565
futures.workspace = true
66-
tracing-log = "0.2"
67-
tracing-subscriber = { version = "0.3", features = ["env-filter", "time", "chrono"] }
6866
tracing-appender = "0.2.3"
67+
tracing-subscriber = { version = "0.3", features = ["env-filter", "time", "chrono"] }
68+
tracing-opentelemetry = "0.30.0"
69+
opentelemetry = { version = "0.29.1", default-features = false, features = ["trace"] }
70+
opentelemetry-otlp = { version = "0.29.0", default-features = false, features = ["trace", "grpc-tonic"] }
71+
opentelemetry_sdk = { version = "0.29.0", default-features = false, features = ["trace"] }
6972
rolling-file = "0.2.0"
70-
tracing-opentelemetry = "0.18.0"
71-
opentelemetry = { version = "0.18.0", default-features = false, features = ["trace", "rt-tokio"] }
72-
opentelemetry-jaeger = { version = "0.17.0", features = ["rt-tokio"] }
7373
pprof = { version = "0.14", features = ["flamegraph", "protobuf-codec"] }
7474
prometheus = { version = "0.13", features = ["process"] }
7575
tonic-health = "0.12.3"

dragonfly-client/src/bin/dfcache/export.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ impl ExportCommand {
137137
self.log_level,
138138
self.log_max_files,
139139
None,
140+
None,
140141
self.verbose,
141142
);
142143

dragonfly-client/src/bin/dfcache/import.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ impl ImportCommand {
143143
self.log_level,
144144
self.log_max_files,
145145
None,
146+
None,
146147
self.verbose,
147148
);
148149

dragonfly-client/src/bin/dfcache/stat.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ impl StatCommand {
8989
self.log_level,
9090
self.log_max_files,
9191
None,
92+
None,
9293
self.verbose,
9394
);
9495

dragonfly-client/src/bin/dfdaemon/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ use dragonfly_client::shutdown;
3030
use dragonfly_client::stats::Stats;
3131
use dragonfly_client::tracing::init_tracing;
3232
use dragonfly_client_backend::BackendFactory;
33-
use dragonfly_client_config::dfdaemon;
34-
use dragonfly_client_config::VersionValueParser;
33+
use dragonfly_client_config::{dfdaemon, VersionValueParser};
3534
use dragonfly_client_storage::Storage;
3635
use dragonfly_client_util::id_generator::IDGenerator;
3736
use std::net::SocketAddr;
@@ -151,6 +150,7 @@ async fn main() -> Result<(), anyhow::Error> {
151150
args.log_level,
152151
args.log_max_files,
153152
config.tracing.addr.to_owned(),
153+
Some(config.host.clone()),
154154
args.verbose,
155155
);
156156

dragonfly-client/src/bin/dfget/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ async fn main() -> anyhow::Result<()> {
308308
args.log_level,
309309
args.log_max_files,
310310
None,
311+
None,
311312
args.verbose,
312313
);
313314

0 commit comments

Comments
 (0)