mirror of
https://github.com/juspay/hyperswitch.git
synced 2025-10-28 04:04:55 +08:00
chore: move tracing to workspace deps and remove router_env as a dependency of redis_interface (#4717)
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -5420,11 +5420,11 @@ dependencies = [
|
|||||||
"error-stack",
|
"error-stack",
|
||||||
"fred",
|
"fred",
|
||||||
"futures 0.3.30",
|
"futures 0.3.30",
|
||||||
"router_env",
|
|
||||||
"serde",
|
"serde",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio 1.37.0",
|
"tokio 1.37.0",
|
||||||
"tokio-stream",
|
"tokio-stream",
|
||||||
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@ -5,6 +5,9 @@ package.edition = "2021"
|
|||||||
package.rust-version = "1.70"
|
package.rust-version = "1.70"
|
||||||
package.license = "Apache-2.0"
|
package.license = "Apache-2.0"
|
||||||
|
|
||||||
|
[workspace.dependencies]
|
||||||
|
tracing = { version = "0.1.40" }
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
strip = true
|
strip = true
|
||||||
lto = true
|
lto = true
|
||||||
|
|||||||
@ -15,10 +15,10 @@ serde = { version = "1.0.197", features = ["derive"] }
|
|||||||
thiserror = "1.0.58"
|
thiserror = "1.0.58"
|
||||||
tokio = "1.37.0"
|
tokio = "1.37.0"
|
||||||
tokio-stream = {version = "0.1.15", features = ["sync"]}
|
tokio-stream = {version = "0.1.15", features = ["sync"]}
|
||||||
|
tracing = { workspace = true }
|
||||||
|
|
||||||
# First party crates
|
# First party crates
|
||||||
common_utils = { version = "0.1.0", path = "../common_utils", features = ["async_ext"] }
|
common_utils = { version = "0.1.0", path = "../common_utils", features = ["async_ext"] }
|
||||||
router_env = { version = "0.1.0", path = "../router_env", features = ["log_extra_implicit_fields", "log_custom_entries_to_extra"] }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] }
|
tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] }
|
||||||
|
|||||||
@ -23,7 +23,7 @@ use fred::{
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use router_env::{instrument, logger, tracing};
|
use tracing::instrument;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
errors,
|
errors,
|
||||||
@ -379,7 +379,7 @@ impl super::RedisConnectionPool {
|
|||||||
Some(futures::stream::iter(v))
|
Some(futures::stream::iter(v))
|
||||||
}
|
}
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
logger::error!(?err);
|
tracing::error!(?err);
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,7 +26,6 @@ use common_utils::errors::CustomResult;
|
|||||||
use error_stack::ResultExt;
|
use error_stack::ResultExt;
|
||||||
pub use fred::interfaces::PubsubInterface;
|
pub use fred::interfaces::PubsubInterface;
|
||||||
use fred::{interfaces::ClientLike, prelude::EventInterface};
|
use fred::{interfaces::ClientLike, prelude::EventInterface};
|
||||||
use router_env::logger;
|
|
||||||
|
|
||||||
pub use self::types::*;
|
pub use self::types::*;
|
||||||
|
|
||||||
@ -189,10 +188,10 @@ impl RedisConnectionPool {
|
|||||||
let mut error_rx = futures::stream::select_all(error_rxs);
|
let mut error_rx = futures::stream::select_all(error_rxs);
|
||||||
loop {
|
loop {
|
||||||
if let Some(Ok(error)) = error_rx.next().await {
|
if let Some(Ok(error)) = error_rx.next().await {
|
||||||
logger::error!(?error, "Redis protocol or connection error");
|
tracing::error!(?error, "Redis protocol or connection error");
|
||||||
if self.pool.state() == fred::types::ClientState::Disconnected {
|
if self.pool.state() == fred::types::ClientState::Disconnected {
|
||||||
if tx.send(()).is_err() {
|
if tx.send(()).is_err() {
|
||||||
logger::error!("The redis shutdown signal sender failed to signal");
|
tracing::error!("The redis shutdown signal sender failed to signal");
|
||||||
}
|
}
|
||||||
self.is_redis_available
|
self.is_redis_available
|
||||||
.store(false, atomic::Ordering::SeqCst);
|
.store(false, atomic::Ordering::SeqCst);
|
||||||
@ -205,7 +204,7 @@ impl RedisConnectionPool {
|
|||||||
pub async fn on_unresponsive(&self) {
|
pub async fn on_unresponsive(&self) {
|
||||||
let _ = self.pool.clients().iter().map(|client| {
|
let _ = self.pool.clients().iter().map(|client| {
|
||||||
client.on_unresponsive(|server| {
|
client.on_unresponsive(|server| {
|
||||||
logger::warn!(redis_server =?server.host, "Redis server is unresponsive");
|
tracing::warn!(redis_server =?server.host, "Redis server is unresponsive");
|
||||||
Ok(())
|
Ok(())
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|||||||
@ -22,7 +22,7 @@ serde_path_to_error = "0.1.16"
|
|||||||
strum = { version = "0.26.2", features = ["derive"] }
|
strum = { version = "0.26.2", features = ["derive"] }
|
||||||
time = { version = "0.3.35", default-features = false, features = ["formatting"] }
|
time = { version = "0.3.35", default-features = false, features = ["formatting"] }
|
||||||
tokio = { version = "1.37.0" }
|
tokio = { version = "1.37.0" }
|
||||||
tracing = { version = "0.1.40" }
|
tracing = { workspace = true }
|
||||||
tracing-actix-web = { version = "0.7.10", features = ["opentelemetry_0_19", "uuid_v7"], optional = true }
|
tracing-actix-web = { version = "0.7.10", features = ["opentelemetry_0_19", "uuid_v7"], optional = true }
|
||||||
tracing-appender = { version = "0.2.3" }
|
tracing-appender = { version = "0.2.3" }
|
||||||
tracing-attributes = "0.1.27"
|
tracing-attributes = "0.1.27"
|
||||||
|
|||||||
Reference in New Issue
Block a user