ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-06-14 05:28:07 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix join-accept log span.

Browse Source 
This shows the actual downlink_id of the join-accept downlink, which can
be correlated with the other log messages (e.g. tx_ack).
This commit is contained in:
Orne Brocaar
2023-11-07 11:15:51 +00:00
parent 500fd0f099
commit 3b5627f43e
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
chirpstack/src/downlink/join.rs
View File

@ -39,9 +39,17 @@ impl JoinAccept<'_> {
device_session: &internal::DeviceSession, device_session: &internal::DeviceSession,
join_accept: &PhyPayload, join_accept: &PhyPayload,
) -> Result<()> { ) -> Result<()> {
let span = span!(Level::TRACE, "join_accept", downlink_id = %ufs.uplink_set_id); let downlink_id: u32 = rand::thread_rng().gen();
let span = span!(Level::INFO, "join_accept", downlink_id = downlink_id);
let fut = JoinAccept::_handle(ufs, tenant, device, device_session, join_accept); let fut = JoinAccept::_handle(
downlink_id,
ufs,
tenant,
device,
device_session,
join_accept,
);
fut.instrument(span).await fut.instrument(span).await
} }
@ -53,9 +61,15 @@ impl JoinAccept<'_> {
device_session: &internal::DeviceSession, device_session: &internal::DeviceSession,
join_accept: &PhyPayload, join_accept: &PhyPayload,
) -> Result<()> { ) -> Result<()> {
let span = span!(Level::TRACE, "join_accept_relayed", downlink_id = %ufs.uplink_set_id); let downlink_id: u32 = rand::thread_rng().gen();
let span = span!(
Level::INFO,
"join_accept_relayed",
downlink_id = downlink_id
);
let fut = JoinAccept::_handle_relayed( let fut = JoinAccept::_handle_relayed(
downlink_id,
relay_ctx, relay_ctx,
ufs, ufs,
tenant, tenant,
@ -67,6 +81,7 @@ impl JoinAccept<'_> {
} }
async fn _handle( async fn _handle(
downlink_id: u32,
ufs: &UplinkFrameSet, ufs: &UplinkFrameSet,
tenant: &tenant::Tenant, tenant: &tenant::Tenant,
device: &device::Device, device: &device::Device,
@ -84,7 +99,7 @@ impl JoinAccept<'_> {
region_conf: region::get(&ufs.region_config_id)?, region_conf: region::get(&ufs.region_config_id)?,
downlink_frame: chirpstack_api::gw::DownlinkFrame { downlink_frame: chirpstack_api::gw::DownlinkFrame {
downlink_id: rand::thread_rng().gen(), downlink_id,
..Default::default() ..Default::default()
}, },
device_gateway_rx_info: None, device_gateway_rx_info: None,
@ -102,6 +117,7 @@ impl JoinAccept<'_> {
} }
async fn _handle_relayed( async fn _handle_relayed(
downlink_id: u32,
relay_ctx: &RelayContext, relay_ctx: &RelayContext,
ufs: &UplinkFrameSet, ufs: &UplinkFrameSet,
tenant: &tenant::Tenant, tenant: &tenant::Tenant,
@ -120,7 +136,7 @@ impl JoinAccept<'_> {
region_conf: region::get(&ufs.region_config_id)?, region_conf: region::get(&ufs.region_config_id)?,
downlink_frame: chirpstack_api::gw::DownlinkFrame { downlink_frame: chirpstack_api::gw::DownlinkFrame {
downlink_id: rand::thread_rng().gen(), downlink_id,
..Default::default() ..Default::default()
}, },
device_gateway_rx_info: None, device_gateway_rx_info: None,