From a795c8d55613cb3f0df10546360db9dc113934b3 Mon Sep 17 00:00:00 2001 From: --systemdf Date: Fri, 11 Jul 2025 13:45:26 -0700 Subject: [PATCH 1/4] remove unneeded tracing --- .../src/auction/repository/add_auction.rs | 3 --- .../src/auction/repository/add_bid.rs | 1 - .../auction/repository/conclude_auction.rs | 2 -- .../get_or_create_in_memory_bid_lock.rs | 1 - .../repository/remove_in_memory_auction.rs | 2 -- .../src/auction/repository/submit_auction.rs | 4 --- .../repository/update_in_memory_auction.rs | 2 -- .../src/auction/service/auction_manager.rs | 15 ----------- .../src/auction/service/cancel_bid.rs | 2 -- .../src/auction/service/conclude_auction.rs | 8 ------ auction-server/src/auction/service/get_bid.rs | 1 - .../src/auction/service/get_bids.rs | 1 - .../src/auction/service/handle_auction.rs | 26 +++---------------- .../src/auction/service/optimize_bids.rs | 1 - .../src/auction/service/submit_quote.rs | 1 - .../src/auction/service/update_bid_status.rs | 4 --- .../src/auction/service/verification.rs | 2 -- .../src/opportunity/service/get_quote.rs | 1 - 18 files changed, 3 insertions(+), 74 deletions(-) diff --git a/auction-server/src/auction/repository/add_auction.rs b/auction-server/src/auction/repository/add_auction.rs index d8e4c07e4..3a9922c96 100644 --- a/auction-server/src/auction/repository/add_auction.rs +++ b/auction-server/src/auction/repository/add_auction.rs @@ -4,7 +4,6 @@ use { }; impl Repository { - #[tracing::instrument(skip_all)] async fn add_in_memory_auction(&self, auction: entities::Auction) { self.in_memory_store .auctions @@ -14,12 +13,10 @@ impl Repository { } // NOTE: Do not call this function directly. Instead call `add_auction` from `Service`. - #[tracing::instrument(skip_all, name = "add_auction_repo", fields(auction_id))] pub async fn add_auction( &self, auction: entities::Auction, ) -> anyhow::Result { - tracing::Span::current().record("auction_id", auction.id.to_string()); self.db.add_auction(&auction).await?; self.remove_in_memory_pending_bids(auction.bids.as_slice()) diff --git a/auction-server/src/auction/repository/add_bid.rs b/auction-server/src/auction/repository/add_bid.rs index e2a5c31d5..a58e2db97 100644 --- a/auction-server/src/auction/repository/add_bid.rs +++ b/auction-server/src/auction/repository/add_bid.rs @@ -12,7 +12,6 @@ use { }; impl Repository { - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] pub async fn add_bid( &self, bid_create: entities::BidCreate, diff --git a/auction-server/src/auction/repository/conclude_auction.rs b/auction-server/src/auction/repository/conclude_auction.rs index 62adee7da..a4a9a55cb 100644 --- a/auction-server/src/auction/repository/conclude_auction.rs +++ b/auction-server/src/auction/repository/conclude_auction.rs @@ -6,9 +6,7 @@ use { }; impl Repository { - #[tracing::instrument(skip_all, name = "conclude_auction_repo", fields(auction_id))] pub async fn conclude_auction(&self, auction_id: entities::AuctionId) -> anyhow::Result<()> { - tracing::Span::current().record("auction_id", auction_id.to_string()); self.db.conclude_auction(auction_id).await?; self.remove_in_memory_auction(auction_id).await; Ok(()) diff --git a/auction-server/src/auction/repository/get_or_create_in_memory_bid_lock.rs b/auction-server/src/auction/repository/get_or_create_in_memory_bid_lock.rs index ad02a72bc..fc2aba698 100644 --- a/auction-server/src/auction/repository/get_or_create_in_memory_bid_lock.rs +++ b/auction-server/src/auction/repository/get_or_create_in_memory_bid_lock.rs @@ -4,7 +4,6 @@ use { }; impl Repository { - #[tracing::instrument(skip_all)] pub async fn get_or_create_in_memory_bid_lock( &self, key: entities::BidId, diff --git a/auction-server/src/auction/repository/remove_in_memory_auction.rs b/auction-server/src/auction/repository/remove_in_memory_auction.rs index 9787cab64..553675bda 100644 --- a/auction-server/src/auction/repository/remove_in_memory_auction.rs +++ b/auction-server/src/auction/repository/remove_in_memory_auction.rs @@ -4,9 +4,7 @@ use { }; impl Repository { - #[tracing::instrument(skip_all, fields(auction_id))] pub async fn remove_in_memory_auction(&self, auction_id: entities::AuctionId) { - tracing::Span::current().record("auction_id", auction_id.to_string()); self.in_memory_store .auctions .write() diff --git a/auction-server/src/auction/repository/submit_auction.rs b/auction-server/src/auction/repository/submit_auction.rs index 623932f94..ccb438d32 100644 --- a/auction-server/src/auction/repository/submit_auction.rs +++ b/auction-server/src/auction/repository/submit_auction.rs @@ -5,16 +5,12 @@ use { }; impl Repository { - #[tracing::instrument(skip_all, name = "submit_auction_repo", fields(auction_id, tx_hash))] pub async fn submit_auction( &self, auction: entities::Auction, transaction_hash: Signature, winner_bid_ids: Vec, ) -> anyhow::Result { - tracing::Span::current().record("auction_id", auction.id.to_string()); - tracing::Span::current().record("tx_hash", format!("{:?}", transaction_hash)); - if let Some(mut updated_auction) = self.db.submit_auction(&auction, &transaction_hash).await? { diff --git a/auction-server/src/auction/repository/update_in_memory_auction.rs b/auction-server/src/auction/repository/update_in_memory_auction.rs index dbc64a631..2946df593 100644 --- a/auction-server/src/auction/repository/update_in_memory_auction.rs +++ b/auction-server/src/auction/repository/update_in_memory_auction.rs @@ -4,9 +4,7 @@ use { }; impl Repository { - #[tracing::instrument(skip_all, fields(auction_id))] pub async fn update_in_memory_auction(&self, auction: entities::Auction) { - tracing::Span::current().record("auction_id", auction.id.to_string()); let mut write_guard = self.in_memory_store.auctions.write().await; match write_guard.get_mut(&auction.id) { Some(a) => { diff --git a/auction-server/src/auction/service/auction_manager.rs b/auction-server/src/auction/service/auction_manager.rs index e9d65817a..61c33344c 100644 --- a/auction-server/src/auction/service/auction_manager.rs +++ b/auction-server/src/auction/service/auction_manager.rs @@ -167,13 +167,7 @@ impl AuctionManager for Service { Ok(TriggerStreamSvm::new(interval(TRIGGER_DURATION_SVM))) } - #[tracing::instrument(skip_all, fields(auction_id, bid_ids))] async fn get_winner_bids(&self, auction: &entities::Auction) -> Result> { - tracing::Span::current().record("auction_id", auction.id.to_string()); - tracing::Span::current().record( - "bid_ids", - tracing::field::display(entities::BidContainerTracing(&auction.bids)), - ); let mut bids = auction.bids.clone(); bids.sort_by(|a, b| b.amount.cmp(&a.amount)); return Ok(self @@ -188,7 +182,6 @@ impl AuctionManager for Service { /// Submit all the svm bids as separate transactions concurrently /// Returns Ok if at least one of the transactions is successful /// Returns Err if all transactions are failed - #[tracing::instrument(skip_all, fields(tx_hash))] async fn submit_bids( &self, _permission_key: PermissionKeySvm, @@ -211,18 +204,11 @@ impl AuctionManager for Service { .expect("results should not be empty because bids is not empty")) } - #[tracing::instrument(skip_all, fields(bid_ids, tx_hash, auction_id, bid_statuses))] async fn get_bid_results( &self, bids: Vec, bid_status_auction: entities::BidStatusAuction, ) -> Result>> { - tracing::Span::current().record( - "bid_ids", - tracing::field::display(entities::BidContainerTracing(&bids)), - ); - tracing::Span::current().record("tx_hash", bid_status_auction.tx_hash.to_string()); - tracing::Span::current().record("auction_id", bid_status_auction.id.to_string()); if bids.is_empty() { return Ok(vec![]); } @@ -258,7 +244,6 @@ impl AuctionManager for Service { vec![None; bids.len()] }; - tracing::Span::current().record("bid_statuses", format!("{:?}", statuses)); // TODO: find a better place to put this // Remove the pending transactions from the simulator join_all( diff --git a/auction-server/src/auction/service/cancel_bid.rs b/auction-server/src/auction/service/cancel_bid.rs index 8f2a94781..a71b80431 100644 --- a/auction-server/src/auction/service/cancel_bid.rs +++ b/auction-server/src/auction/service/cancel_bid.rs @@ -17,7 +17,6 @@ pub struct CancelBidInput { } impl Service { - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] async fn cancel_bid_for_lock( &self, input: CancelBidInput, @@ -71,7 +70,6 @@ impl Service { } } - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE), fields(bid_id = %input.bid_id))] pub async fn cancel_bid(&self, input: CancelBidInput) -> Result<(), RestError> { // Lock the bid to prevent submission let bid_lock = self diff --git a/auction-server/src/auction/service/conclude_auction.rs b/auction-server/src/auction/service/conclude_auction.rs index 9185fe62f..7d6af3f7a 100644 --- a/auction-server/src/auction/service/conclude_auction.rs +++ b/auction-server/src/auction/service/conclude_auction.rs @@ -21,17 +21,10 @@ pub struct ConcludeAuctionWithStatusesInput { } impl Service { - #[tracing::instrument(skip_all, fields(auction_id, bid_ids, bid_statuses))] pub async fn conclude_auction_with_statuses( &self, input: ConcludeAuctionWithStatusesInput, ) -> anyhow::Result<()> { - tracing::Span::current().record( - "bid_ids", - tracing::field::display(entities::BidContainerTracing(&input.auction.bids)), - ); - tracing::Span::current().record("auction_id", input.auction.id.to_string()); - tracing::Span::current().record("bid_statuses", format!("{:?}", input.bid_statuses)); join_all(input.bid_statuses.into_iter().map(|(status, bid)| { self.update_bid_status(UpdateBidStatusInput { bid: bid.clone(), @@ -70,7 +63,6 @@ impl Service { } /// Concludes an auction by getting the auction transaction status from the chain. - #[tracing::instrument(skip_all)] async fn conclude_auction(&self, input: ConcludeAuctionInput) -> anyhow::Result<()> { let auction = input.auction; tracing::info!(chain_id = self.config.chain_id, auction_id = ?auction.id, permission_key = auction.permission_key.to_string(), "Concluding auction"); diff --git a/auction-server/src/auction/service/get_bid.rs b/auction-server/src/auction/service/get_bid.rs index a5fd5d591..371ebdf99 100644 --- a/auction-server/src/auction/service/get_bid.rs +++ b/auction-server/src/auction/service/get_bid.rs @@ -11,7 +11,6 @@ pub struct GetBidInput { } impl Service { - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] pub async fn get_bid(&self, input: GetBidInput) -> Result { self.repo.get_bid(input.bid_id).await } diff --git a/auction-server/src/auction/service/get_bids.rs b/auction-server/src/auction/service/get_bids.rs index bfb74ee61..1336796e3 100644 --- a/auction-server/src/auction/service/get_bids.rs +++ b/auction-server/src/auction/service/get_bids.rs @@ -14,7 +14,6 @@ pub struct GetBidsInput { } impl Service { - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] pub async fn get_bids(&self, input: GetBidsInput) -> Result, RestError> { self.repo.get_bids(input.profile.id, input.from_time).await } diff --git a/auction-server/src/auction/service/handle_auction.rs b/auction-server/src/auction/service/handle_auction.rs index 608e9fd27..246063936 100644 --- a/auction-server/src/auction/service/handle_auction.rs +++ b/auction-server/src/auction/service/handle_auction.rs @@ -27,18 +27,11 @@ pub struct HandleAuctionInput { } impl Service { - #[tracing::instrument(skip_all, fields(auction_id, bid_ids, winner_bid_ids), err(level = tracing::Level::TRACE))] - async fn submit_auction<'a>( + async fn submit_auction( &self, auction: entities::Auction, - _auction_mutex_guard: MutexGuard<'a, ()>, + _auction_mutex_guard: MutexGuard<'_, ()>, ) -> anyhow::Result<()> { - tracing::Span::current().record("auction_id", auction.id.to_string()); - tracing::Span::current().record( - "bid_ids", - tracing::field::display(entities::BidContainerTracing(&auction.bids)), - ); - let permission_key = auction.permission_key.clone(); if !auction.is_ready(Service::AUCTION_MINIMUM_LIFETIME) { tracing::info!( @@ -49,10 +42,6 @@ impl Service { } let winner_bids = self.get_winner_bids(&auction).await?; - tracing::Span::current().record( - "winner_bid_ids", - tracing::field::display(entities::BidContainerTracing(&winner_bids)), - ); if winner_bids.is_empty() { join_all(auction.bids.into_iter().map(|bid| { self.update_bid_status(UpdateBidStatusInput { @@ -110,7 +99,6 @@ impl Service { Ok(()) } - #[tracing::instrument(skip_all, fields(bid_ids, auction_id))] async fn submit_auction_for_lock( &self, permission_key: &PermissionKeySvm, @@ -124,16 +112,8 @@ impl Service { .get_in_memory_pending_bids_by_permission_key(permission_key) .await; - tracing::Span::current().record( - "bid_ids", - tracing::field::display(entities::BidContainerTracing(&bids)), - ); - match entities::Auction::try_new(bids, bid_collection_time) { - Some(auction) => { - tracing::Span::current().record("auction_id", auction.id.to_string()); - self.submit_auction(auction, acquired_lock).await - } + Some(auction) => self.submit_auction(auction, acquired_lock).await, None => Ok(()), } } diff --git a/auction-server/src/auction/service/optimize_bids.rs b/auction-server/src/auction/service/optimize_bids.rs index 2403e357f..4088fcc68 100644 --- a/auction-server/src/auction/service/optimize_bids.rs +++ b/auction-server/src/auction/service/optimize_bids.rs @@ -9,7 +9,6 @@ impl Service { /// considering the current state of the chain and the pending transactions. /// Right now, for simplicity, the method assume the bids are sorted, and tries to submit them in order /// and only return the ones that are successfully submitted. - #[tracing::instrument(skip_all)] pub async fn optimize_bids(&self, bids_sorted: &[Bid]) -> RpcResult> { let simulator = &self.config.chain_config.simulator; simulator.optimize_bids(bids_sorted).await diff --git a/auction-server/src/auction/service/submit_quote.rs b/auction-server/src/auction/service/submit_quote.rs index aae8dc353..16575039b 100644 --- a/auction-server/src/auction/service/submit_quote.rs +++ b/auction-server/src/auction/service/submit_quote.rs @@ -83,7 +83,6 @@ impl Service { Ok(bid.chain_data.transaction) } - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] async fn submit_auction_bid_for_lock( &self, signed_bid: entities::Bid, diff --git a/auction-server/src/auction/service/update_bid_status.rs b/auction-server/src/auction/service/update_bid_status.rs index bab1d9858..db149eadd 100644 --- a/auction-server/src/auction/service/update_bid_status.rs +++ b/auction-server/src/auction/service/update_bid_status.rs @@ -64,14 +64,10 @@ impl Service { }) } - #[tracing::instrument(skip_all, fields(bid_id, status), err(level = tracing::Level::TRACE))] pub async fn update_bid_status( &self, mut input: UpdateBidStatusInput, ) -> Result { - tracing::Span::current().record("bid_id", input.bid.id.to_string()); - tracing::Span::current().record("status", format!("{:?}", input.new_status)); - let (is_updated, conclusion_time_new) = self .repo .update_bid_status(input.bid.clone(), input.new_status.clone()) diff --git a/auction-server/src/auction/service/verification.rs b/auction-server/src/auction/service/verification.rs index 3698d0aab..6891757cc 100644 --- a/auction-server/src/auction/service/verification.rs +++ b/auction-server/src/auction/service/verification.rs @@ -1138,7 +1138,6 @@ impl Service { Ok(()) } - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] async fn verify_signatures( &self, bid: &entities::BidCreate, @@ -1236,7 +1235,6 @@ impl Service { } } - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] pub async fn simulate_bid(&self, bid: &entities::BidCreate) -> Result<(), RestError> { const RETRY_LIMIT: usize = 5; const RETRY_DELAY: Duration = Duration::from_millis(100); diff --git a/auction-server/src/opportunity/service/get_quote.rs b/auction-server/src/opportunity/service/get_quote.rs index bc4b1e031..b62dc06ab 100644 --- a/auction-server/src/opportunity/service/get_quote.rs +++ b/auction-server/src/opportunity/service/get_quote.rs @@ -181,7 +181,6 @@ fn get_fee_token( } impl Service { - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] async fn get_opportunity_create_for_quote( &self, quote_create: entities::QuoteCreate, From f050624b89c9c1b258c97b6466d72f0d25162ef2 Mon Sep 17 00:00:00 2001 From: --systemdf Date: Fri, 11 Jul 2025 13:46:13 -0700 Subject: [PATCH 2/4] bump version --- Cargo.lock | 2 +- auction-server/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 55dd5e23d..f1daba43c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -653,7 +653,7 @@ dependencies = [ [[package]] name = "auction-server" -version = "0.34.0" +version = "0.34.1" dependencies = [ "anchor-lang", "anchor-lang-idl", diff --git a/auction-server/Cargo.toml b/auction-server/Cargo.toml index 14de2f52d..80424f8ce 100644 --- a/auction-server/Cargo.toml +++ b/auction-server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "auction-server" -version = "0.34.0" +version = "0.34.1" edition = "2021" license-file = "license.txt" From 6d2de932d460b679fa11210814eed6256299addd Mon Sep 17 00:00:00 2001 From: --systemdf Date: Fri, 11 Jul 2025 13:51:19 -0700 Subject: [PATCH 3/4] get rid of add_bid_analytics tracing --- auction-server/src/auction/repository/add_bid_analytics.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/auction-server/src/auction/repository/add_bid_analytics.rs b/auction-server/src/auction/repository/add_bid_analytics.rs index 128482f4a..53d75e2af 100644 --- a/auction-server/src/auction/repository/add_bid_analytics.rs +++ b/auction-server/src/auction/repository/add_bid_analytics.rs @@ -28,7 +28,6 @@ use { }; impl Repository { - #[tracing::instrument(skip_all, err(level = tracing::Level::TRACE))] pub async fn add_bid_analytics( &self, bid: entities::Bid, From d1bc12a010ef7e3e84fede459a79e8549478b658 Mon Sep 17 00:00:00 2001 From: --systemdf Date: Fri, 11 Jul 2025 14:05:56 -0700 Subject: [PATCH 4/4] get rid of db analytics tracing --- auction-server/src/auction/repository/models.rs | 1 - auction-server/src/opportunity/repository/models.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/auction-server/src/auction/repository/models.rs b/auction-server/src/auction/repository/models.rs index 4231f2bd4..8e7ef6136 100644 --- a/auction-server/src/auction/repository/models.rs +++ b/auction-server/src/auction/repository/models.rs @@ -941,7 +941,6 @@ impl AnalyticsDatabase for AnalyticsDatabaseInserter { category = "db_analytics_queries", result = "success", name = "add_bid", - tracing_enabled ), skip_all )] diff --git a/auction-server/src/opportunity/repository/models.rs b/auction-server/src/opportunity/repository/models.rs index efee79645..750d26ae9 100644 --- a/auction-server/src/opportunity/repository/models.rs +++ b/auction-server/src/opportunity/repository/models.rs @@ -275,7 +275,6 @@ impl AnalyticsDatabase for AnalyticsDatabaseInserter { category = "db_analytics_queries", result = "success", name = "add_opportunity", - tracing_enabled ), skip_all )]