ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-05-02 09:03:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

backend: Improve request logging.

Browse Source
This commit is contained in:
Orne Brocaar 2023-11-07 11:58:21 +00:00
parent 3b5627f43e
commit 4d822b56ef
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
backend/src/lib.rs
View File

@ -14,7 +14,7 @@ use reqwest::header::{HeaderMap, AUTHORIZATION, CONTENT_TYPE};
use reqwest::{Certificate, Identity}; use reqwest::{Certificate, Identity};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tokio::sync::oneshot::Receiver; use tokio::sync::oneshot::Receiver;
use tracing::{debug, error, info, trace}; use tracing::{debug, error, info, span, trace, Instrument, Level};
use chirpstack_api::stream; use chirpstack_api::stream;
@ -323,12 +323,22 @@ impl Client {
S: ?Sized + serde::ser::Serialize + BasePayloadProvider, S: ?Sized + serde::ser::Serialize + BasePayloadProvider,
D: serde::de::DeserializeOwned + BasePayloadResultProvider, D: serde::de::DeserializeOwned + BasePayloadResultProvider,
{ {
let bp = pl.base_payload().clone();
let mut be_req_log = stream::BackendInterfacesRequest { let mut be_req_log = stream::BackendInterfacesRequest {
time: Some(Utc::now().into()), time: Some(Utc::now().into()),
sender_id: hex::encode(&bp.sender_id),
receiver_id: hex::encode(&bp.receiver_id),
transaction_id: bp.transaction_id,
message_type: format!("{:?}", bp.message_type),
..Default::default() ..Default::default()
}; };
let span = span!(Level::INFO, "request", message_type = ?bp.message_type, receiver_id = %be_req_log.receiver_id, transaction_id = bp.transaction_id);
let res = self let res = self
._request(target_role, pl, ans, async_resp, &mut be_req_log) ._request(target_role, pl, ans, async_resp, &mut be_req_log)
.instrument(span)
.await; .await;
if let Err(e) = &res { if let Err(e) = &res {
@ -367,16 +377,10 @@ impl Client {
self.config.server.clone() self.config.server.clone()
}; };
let bp = pl.base_payload().clone();
be_req_log.sender_id = hex::encode(&bp.sender_id);
be_req_log.receiver_id = hex::encode(&bp.receiver_id);
be_req_log.transaction_id = bp.transaction_id;
be_req_log.message_type = format!("{:?}", bp.message_type);
let body = serde_json::to_string(&pl)?; let body = serde_json::to_string(&pl)?;
be_req_log.request_body = body.clone(); be_req_log.request_body = body.clone();
info!(receiver_id = %hex::encode(&bp.receiver_id), transaction_id = bp.transaction_id, message_type = ?bp.message_type, server = %server, async_interface = %async_resp.is_some(), "Making request"); info!(server = %server, async_interface = %async_resp.is_some(), "Making request");
let res = self let res = self
.client .client
@ -393,10 +397,11 @@ impl Client {
tokio::select! { tokio::select! {
rx_ans = rx => { rx_ans = rx => {
info!("Async response received");
String::from_utf8(rx_ans?)? String::from_utf8(rx_ans?)?
} }
_ = sleep => { _ = sleep => {
error!(receiver_id = %hex::encode(&bp.receiver_id), transaction_id = bp.transaction_id, message_type = ?bp.message_type, "Async request timeout"); error!("Async response timeout");
return Err(anyhow!("Async timeout")); return Err(anyhow!("Async timeout"));
} }
} }
@ -410,7 +415,7 @@ impl Client {
be_req_log.result_code = format!("{:?}", base.result.result_code); be_req_log.result_code = format!("{:?}", base.result.result_code);
if base.result.result_code != ResultCode::Success { if base.result.result_code != ResultCode::Success {
error!(result_code = ?base.result.result_code, description = %base.result.description, receiver_id = %hex::encode(&bp.receiver_id), transaction_id = bp.transaction_id, message_type = ?bp.message_type, "Response error"); error!(result_code = ?base.result.result_code, description = %base.result.description, "Response error");
return Err(anyhow!( return Err(anyhow!(
"Response error, code: {:?}, description: {:?}", "Response error, code: {:?}, description: {:?}",
base.result.result_code, base.result.result_code,