fix(router_env): fix opentelemetry traces for router_env (#201)

Co-authored-by: Nishant Joshi <nishant.joshi@juspay.in>

crates/router/src/compatibility/stripe/customers.rs

@@ -2,7 +2,7 @@ pub mod types;
 
 use actix_web::{delete, get, post, web, HttpRequest, HttpResponse};
 use error_stack::report;
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 
 use crate::{
     compatibility::{stripe::errors, wrap},

crates/router/src/compatibility/stripe/payment_intents.rs

@@ -3,7 +3,7 @@ pub mod types;
 use actix_web::{get, post, web, HttpRequest, HttpResponse};
 use api_models::payments as payment_types;
 use error_stack::report;
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 
 use crate::{
     compatibility::{stripe::errors, wrap},

crates/router/src/compatibility/stripe/refunds.rs

@@ -1,7 +1,7 @@
 pub mod types;
 
 use actix_web::{get, post, web, HttpRequest, HttpResponse};
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 
 use crate::{
     compatibility::{stripe::errors, wrap},

crates/router/src/compatibility/stripe/setup_intents.rs

@@ -3,7 +3,7 @@ pub mod types;
 use actix_web::{get, post, web, HttpRequest, HttpResponse};
 use api_models::payments as payment_types;
 use error_stack::report;
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 
 use crate::{
     compatibility::{stripe::errors, wrap},

crates/router/src/compatibility/wrap.rs

@@ -2,7 +2,7 @@ use std::future::Future;
 
 use actix_web::{HttpRequest, HttpResponse, Responder};
 use error_stack::report;
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 use serde::Serialize;
 
 use crate::{

crates/router/src/connector/adyen.rs

@@ -4,7 +4,7 @@ use std::fmt::Debug;
 
 use bytes::Bytes;
 use error_stack::{IntoReport, ResultExt};
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 
 use self::transformers as adyen;
 use crate::{

crates/router/src/connector/stripe.rs

@@ -4,7 +4,7 @@ use std::{collections::HashMap, fmt::Debug};
 
 use bytes::Bytes;
 use error_stack::{IntoReport, ResultExt};
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 
 use self::transformers as stripe;
 use crate::{

crates/router/src/core/customers.rs

@@ -1,6 +1,6 @@
 use common_utils::ext_traits::ValueExt;
 use error_stack::ResultExt;
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 
 use crate::{
     core::{

crates/router/src/core/mandate.rs

@@ -1,5 +1,5 @@
 use error_stack::{report, ResultExt};
-use router_env::{logger, tracing, tracing::instrument};
+use router_env::{instrument, logger, tracing};
 use storage_models::enums as storage_enums;
 
 use super::payments::helpers;

crates/router/src/core/payment_methods/cards.rs

@@ -2,7 +2,7 @@ use std::collections;
 
 use common_utils::{consts, generate_id};
 use error_stack::{report, ResultExt};
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 
 use crate::{
     configs::settings,

crates/router/src/core/payments.rs

@@ -8,7 +8,7 @@ use std::{fmt::Debug, marker::PhantomData, time::Instant};
 use common_utils::ext_traits::AsyncExt;
 use error_stack::{IntoReport, ResultExt};
 use futures::future::join_all;
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 use time;
 
 pub use self::operations::{

crates/router/src/core/refunds.rs

@@ -1,7 +1,7 @@
 pub mod validator;
 
 use error_stack::{report, IntoReport, ResultExt};
-use router_env::tracing::{self, instrument};
+use router_env::{instrument, tracing};
 use uuid::Uuid;
 
 use crate::{

crates/router/src/core/refunds/validator.rs

@@ -1,5 +1,5 @@
 use error_stack::report;
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 use time::PrimitiveDateTime;
 
 use crate::{

crates/router/src/core/utils.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 
 use error_stack::ResultExt;
-use router_env::tracing::{self, instrument};
+use router_env::{instrument, tracing};
 
 use super::payments::{helpers, PaymentAddress};
 use crate::{

crates/router/src/core/webhooks.rs

@@ -3,7 +3,7 @@ pub mod utils;
 
 use error_stack::{IntoReport, ResultExt};
 use masking::ExposeInterface;
-use router_env::tracing::{self, instrument};
+use router_env::{instrument, tracing};
 
 use crate::{
     consts,

crates/router/src/routes/admin.rs

@@ -1,8 +1,5 @@
 use actix_web::{web, HttpRequest, HttpResponse};
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 use super::app::AppState;
 use crate::{core::admin::*, services::api, types::api::admin};

crates/router/src/routes/customers.rs

@@ -1,8 +1,5 @@
 use actix_web::{web, HttpRequest, HttpResponse, Responder};
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 use super::app::AppState;
 use crate::{

crates/router/src/routes/ephemeral_key.rs

@@ -1,8 +1,5 @@
 use actix_web::{web, HttpRequest, HttpResponse};
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 use super::AppState;
 use crate::{core::payments::helpers, services::api, types::api::customers};

crates/router/src/routes/health.rs

@@ -1,7 +1,4 @@
-use router_env::{
-    logger,
-    tracing::{self, instrument},
-};
+use router_env::{instrument, logger, tracing};
 
 use crate::routes::metrics;
 

crates/router/src/routes/mandates.rs

@@ -1,8 +1,5 @@
 use actix_web::{web, HttpRequest, HttpResponse};
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 use super::app::AppState;
 use crate::{core::mandate, services::api, types::api::mandates};

crates/router/src/routes/payment_methods.rs

@@ -1,8 +1,5 @@
 use actix_web::{web, HttpRequest, HttpResponse};
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 use super::app::AppState;
 use crate::{

crates/router/src/routes/payments.rs

@@ -2,10 +2,7 @@ use std::borrow::Cow;
 
 use actix_web::{web, Responder};
 use error_stack::report;
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 use crate::{
     self as app,

crates/router/src/routes/payouts.rs

@@ -2,10 +2,7 @@ use actix_web::{
     body::{BoxBody, MessageBody},
     HttpResponse, Responder,
 };
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 #[instrument(skip_all, fields(flow = ?Flow::PayoutsCreate))]
 // #[post("/create")]

crates/router/src/routes/refunds.rs

@@ -1,8 +1,5 @@
 use actix_web::{web, HttpRequest, HttpResponse};
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 use super::app::AppState;
 use crate::{core::refunds::*, services::api, types::api::refunds};

crates/router/src/routes/webhooks.rs

@@ -1,8 +1,5 @@
 use actix_web::{web, HttpRequest, Responder};
-use router_env::{
-    tracing::{self, instrument},
-    Flow,
-};
+use router_env::{instrument, tracing, Flow};
 
 use super::app::AppState;
 use crate::{core::webhooks, services::api};

crates/router/src/scheduler/consumer.rs

@@ -8,7 +8,7 @@ use std::{
 use error_stack::ResultExt;
 use futures::future;
 use redis_interface::{RedisConnectionPool, RedisEntryId};
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 use time::PrimitiveDateTime;
 use uuid::Uuid;
 

crates/router/src/scheduler/producer.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use error_stack::{report, ResultExt};
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 use time::Duration;
 
 use super::metrics;

crates/router/src/services/api.rs

@@ -7,10 +7,7 @@ use actix_web::{body, HttpRequest, HttpResponse, Responder};
 use bytes::Bytes;
 use error_stack::{report, IntoReport, Report, ResultExt};
 use masking::ExposeOptionInterface;
-use router_env::{
-    tracing::{self, instrument},
-    Tag,
-};
+use router_env::{instrument, tracing, Tag};
 use serde::Serialize;
 
 use self::request::{ContentType, HeaderExt, RequestBuilderExt};

crates/router/src/services/api/request.rs

@@ -2,7 +2,7 @@ use std::{collections, str::FromStr};
 
 use error_stack::{IntoReport, ResultExt};
 use masking::Secret;
-use router_env::{tracing, tracing::instrument};
+use router_env::{instrument, tracing};
 use serde::{Deserialize, Serialize};
 
 use crate::{

crates/router/src/types/storage/payment_intent.rs

@@ -1,7 +1,7 @@
 use async_bb8_diesel::AsyncRunQueryDsl;
 use diesel::{associations::HasTable, ExpressionMethods, QueryDsl};
 use error_stack::{IntoReport, ResultExt};
-use router_env::tracing::{self, instrument};
+use router_env::{instrument, tracing};
 pub use storage_models::{
     errors,
     payment_intent::{