Skip to content

Commit 590e57a

Browse files
0xFirekeeper0xFirekeeper
committed
Revert "log clientid, txnid, queueid, chainid (#98)"
This reverts commit b5b14a5.
1 parent b5b14a5 commit 590e57a

9 files changed

Lines changed: 22 additions & 245 deletions

File tree

‎core/src/chain.rs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,6 @@ impl RpcCredentials {
2525

2626
Ok(header_map)
2727
}
28-
29-
pub fn client_id_for_logs(&self) -> Option<&str> {
30-
match self {
31-
RpcCredentials::Thirdweb(ThirdwebAuth::ClientIdServiceKey(creds)) => {
32-
Some(&creds.client_id)
33-
}
34-
RpcCredentials::Thirdweb(ThirdwebAuth::SecretKey(_)) => None,
35-
}
36-
}
3728
}
3829

3930
pub trait Chain: Send + Sync {

‎executors/src/eip7702_executor/confirm.rs‎

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ use crate::{
2929
},
3030
};
3131

32-
const EIP7702_CONFIRM_QUEUE_ID: &str = "eip7702_confirm";
33-
3432
// --- Job Payload ---
3533
#[derive(Serialize, Deserialize, Debug, Clone)]
3634
#[serde(rename_all = "camelCase")]
@@ -170,7 +168,7 @@ where
170168
type ErrorData = Eip7702ConfirmationError;
171169
type JobData = Eip7702ConfirmationJobData;
172170

173-
#[tracing::instrument(skip(self, job), fields(transaction_id = job.job.id, chain_id = job.job.data.chain_id, client_id = ?job.job.data.rpc_credentials.client_id_for_logs(), queue_id = EIP7702_CONFIRM_QUEUE_ID, stage = Self::stage_name(), executor = Self::executor_name()))]
171+
#[tracing::instrument(skip(self, job), fields(transaction_id = job.job.id, stage = Self::stage_name(), executor = Self::executor_name()))]
174172
async fn process(
175173
&self,
176174
job: &BorrowedJob<Self::JobData>,
@@ -204,14 +202,7 @@ where
204202
.await
205203
.map_err(|e| {
206204
tracing::error!(
207-
transaction_id = %job_data.transaction_id,
208-
chain_id = job_data.chain_id,
209-
client_id = job_data
210-
.rpc_credentials
211-
.client_id_for_logs()
212-
.unwrap_or("unknown"),
213-
queue_id = EIP7702_CONFIRM_QUEUE_ID,
214-
bundler_transaction_id = %job_data.bundler_transaction_id,
205+
bundler_transaction_id = job_data.bundler_transaction_id,
215206
sender_details = ?job_data.sender_details,
216207
error = ?e,
217208
"Failed to get transaction hash from bundler"
@@ -330,15 +321,7 @@ where
330321
// Send webhook
331322
if let Err(e) = self.queue_success_webhook(job, success_data, tx) {
332323
tracing::error!(
333-
transaction_id = %job.job.data.transaction_id,
334-
chain_id = job.job.data.chain_id,
335-
client_id = job
336-
.job
337-
.data
338-
.rpc_credentials
339-
.client_id_for_logs()
340-
.unwrap_or("unknown"),
341-
queue_id = EIP7702_CONFIRM_QUEUE_ID,
324+
transaction_id = job.job.data.transaction_id,
342325
error = ?e,
343326
"Failed to queue success webhook"
344327
);
@@ -363,15 +346,7 @@ where
363346
if should_queue_webhook {
364347
if let Err(e) = self.queue_nack_webhook(job, nack_data, tx) {
365348
tracing::error!(
366-
transaction_id = %job.job.data.transaction_id,
367-
chain_id = job.job.data.chain_id,
368-
client_id = job
369-
.job
370-
.data
371-
.rpc_credentials
372-
.client_id_for_logs()
373-
.unwrap_or("unknown"),
374-
queue_id = EIP7702_CONFIRM_QUEUE_ID,
349+
transaction_id = job.job.data.transaction_id,
375350
error = ?e,
376351
"Failed to queue nack webhook"
377352
);
@@ -395,30 +370,14 @@ where
395370
.add_remove_command(tx.pipeline(), &job.job.data.transaction_id);
396371

397372
tracing::error!(
398-
transaction_id = %job.job.data.transaction_id,
399-
chain_id = job.job.data.chain_id,
400-
client_id = job
401-
.job
402-
.data
403-
.rpc_credentials
404-
.client_id_for_logs()
405-
.unwrap_or("unknown"),
406-
queue_id = EIP7702_CONFIRM_QUEUE_ID,
373+
transaction_id = job.job.data.transaction_id,
407374
error = ?fail_data.error,
408375
"EIP-7702 confirmation job failed"
409376
);
410377

411378
if let Err(e) = self.queue_fail_webhook(job, fail_data, tx) {
412379
tracing::error!(
413-
transaction_id = %job.job.data.transaction_id,
414-
chain_id = job.job.data.chain_id,
415-
client_id = job
416-
.job
417-
.data
418-
.rpc_credentials
419-
.client_id_for_logs()
420-
.unwrap_or("unknown"),
421-
queue_id = EIP7702_CONFIRM_QUEUE_ID,
380+
transaction_id = job.job.data.transaction_id,
422381
error = ?e,
423382
"Failed to queue fail webhook"
424383
);

‎executors/src/eip7702_executor/send.rs‎

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ use crate::{
3636

3737
use super::confirm::{Eip7702ConfirmationHandler, Eip7702ConfirmationJobData};
3838

39-
const EIP7702_SEND_QUEUE_ID: &str = "eip7702_send";
40-
const EIP7702_CONFIRM_QUEUE_ID: &str = "eip7702_confirm";
41-
4239
// --- Job Payload ---
4340
#[derive(Serialize, Deserialize, Debug, Clone)]
4441
#[serde(rename_all = "camelCase")]
@@ -178,7 +175,7 @@ where
178175
type ErrorData = Eip7702SendError;
179176
type JobData = Eip7702SendJobData;
180177

181-
#[tracing::instrument(skip(self, job), fields(transaction_id = job.job.id, chain_id = job.job.data.chain_id, client_id = ?job.job.data.rpc_credentials.client_id_for_logs(), queue_id = EIP7702_SEND_QUEUE_ID, stage = Self::stage_name(), executor = Self::executor_name()))]
178+
#[tracing::instrument(skip(self, job), fields(transaction_id = job.job.id, stage = Self::stage_name(), executor = Self::executor_name()))]
182179
async fn process(
183180
&self,
184181
job: &BorrowedJob<Self::JobData>,
@@ -389,15 +386,7 @@ where
389386

390387
if let Err(e) = tx.queue_job(confirmation_job) {
391388
tracing::error!(
392-
transaction_id = %job.job.data.transaction_id,
393-
chain_id = job.job.data.chain_id,
394-
client_id = job
395-
.job
396-
.data
397-
.rpc_credentials
398-
.client_id_for_logs()
399-
.unwrap_or("unknown"),
400-
queue_id = EIP7702_CONFIRM_QUEUE_ID,
389+
transaction_id = job.job.data.transaction_id,
401390
error = ?e,
402391
"Failed to enqueue confirmation job"
403392
);
@@ -406,15 +395,7 @@ where
406395
// Send webhook
407396
if let Err(e) = self.queue_success_webhook(job, success_data, tx) {
408397
tracing::error!(
409-
transaction_id = %job.job.data.transaction_id,
410-
chain_id = job.job.data.chain_id,
411-
client_id = job
412-
.job
413-
.data
414-
.rpc_credentials
415-
.client_id_for_logs()
416-
.unwrap_or("unknown"),
417-
queue_id = EIP7702_SEND_QUEUE_ID,
398+
transaction_id = job.job.data.transaction_id,
418399
error = ?e,
419400
"Failed to queue success webhook"
420401
);
@@ -430,15 +411,7 @@ where
430411
// Don't modify transaction registry on NACK - job will be retried
431412
if let Err(e) = self.queue_nack_webhook(job, nack_data, tx) {
432413
tracing::error!(
433-
transaction_id = %job.job.data.transaction_id,
434-
chain_id = job.job.data.chain_id,
435-
client_id = job
436-
.job
437-
.data
438-
.rpc_credentials
439-
.client_id_for_logs()
440-
.unwrap_or("unknown"),
441-
queue_id = EIP7702_SEND_QUEUE_ID,
414+
transaction_id = job.job.data.transaction_id,
442415
error = ?e,
443416
"Failed to queue nack webhook"
444417
);
@@ -456,30 +429,14 @@ where
456429
.add_remove_command(tx.pipeline(), &job.job.data.transaction_id);
457430

458431
tracing::error!(
459-
transaction_id = %job.job.data.transaction_id,
460-
chain_id = job.job.data.chain_id,
461-
client_id = job
462-
.job
463-
.data
464-
.rpc_credentials
465-
.client_id_for_logs()
466-
.unwrap_or("unknown"),
467-
queue_id = EIP7702_SEND_QUEUE_ID,
432+
transaction_id = job.job.data.transaction_id,
468433
error = ?fail_data.error,
469434
"EIP-7702 send job failed"
470435
);
471436

472437
if let Err(e) = self.queue_fail_webhook(job, fail_data, tx) {
473438
tracing::error!(
474-
transaction_id = %job.job.data.transaction_id,
475-
chain_id = job.job.data.chain_id,
476-
client_id = job
477-
.job
478-
.data
479-
.rpc_credentials
480-
.client_id_for_logs()
481-
.unwrap_or("unknown"),
482-
queue_id = EIP7702_SEND_QUEUE_ID,
439+
transaction_id = job.job.data.transaction_id,
483440
error = ?e,
484441
"Failed to queue fail webhook"
485442
);

‎executors/src/eoa/store/atomic.rs‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ use crate::{
3131

3232
const MAX_RETRIES: u32 = 10;
3333
const RETRY_BASE_DELAY_MS: u64 = 10;
34-
const EOA_QUEUE_ID: &str = "eoa_executor";
3534

3635
pub trait SafeRedisTransaction: Send + Sync {
3736
type ValidationData;
@@ -614,18 +613,7 @@ impl AtomicEoaExecutorStore {
614613
&mut tx_context,
615614
webhook_queue.clone(),
616615
) {
617-
tracing::error!(
618-
transaction_id = %pending_transaction.transaction_id,
619-
chain_id = pending_transaction.user_request.chain_id,
620-
client_id = pending_transaction
621-
.user_request
622-
.rpc_credentials
623-
.client_id_for_logs()
624-
.unwrap_or("unknown"),
625-
queue_id = EOA_QUEUE_ID,
626-
"Failed to queue webhook for fail: {}",
627-
e
628-
);
616+
tracing::error!("Failed to queue webhook for fail: {}", e);
629617
}
630618
}
631619

@@ -707,13 +695,6 @@ impl AtomicEoaExecutorStore {
707695
) {
708696
tracing::error!(
709697
transaction_id = %pending_transaction.transaction_id,
710-
chain_id = pending_transaction.user_request.chain_id,
711-
client_id = pending_transaction
712-
.user_request
713-
.rpc_credentials
714-
.client_id_for_logs()
715-
.unwrap_or("unknown"),
716-
queue_id = EOA_QUEUE_ID,
717698
error = ?e,
718699
"Failed to queue webhook for batch fail"
719700
);

‎executors/src/eoa/store/borrowed.rs‎

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ use crate::eoa::{
1616
use crate::metrics::{EoaMetrics, calculate_duration_seconds, current_timestamp_ms};
1717
use crate::webhook::{WebhookJobHandler, queue_webhook_envelopes};
1818

19-
const EOA_QUEUE_ID: &str = "eoa_executor";
20-
2119
#[derive(Debug, Clone)]
2220
pub enum SubmissionResultType {
2321
Success,
@@ -175,19 +173,7 @@ impl SafeRedisTransaction for ProcessBorrowedTransactions<'_> {
175173
&mut tx_context,
176174
self.webhook_queue.clone(),
177175
) {
178-
tracing::error!(
179-
transaction_id = transaction_id,
180-
chain_id = result.transaction.user_request.chain_id,
181-
client_id = result
182-
.transaction
183-
.user_request
184-
.rpc_credentials
185-
.client_id_for_logs()
186-
.unwrap_or("unknown"),
187-
queue_id = EOA_QUEUE_ID,
188-
"Failed to queue webhook for success: {}",
189-
e
190-
);
176+
tracing::error!("Failed to queue webhook for success: {}", e);
191177
} else {
192178
report.webhook_events_queued += 1;
193179
}
@@ -227,19 +213,7 @@ impl SafeRedisTransaction for ProcessBorrowedTransactions<'_> {
227213
&mut tx_context,
228214
self.webhook_queue.clone(),
229215
) {
230-
tracing::error!(
231-
transaction_id = transaction_id,
232-
chain_id = result.transaction.user_request.chain_id,
233-
client_id = result
234-
.transaction
235-
.user_request
236-
.rpc_credentials
237-
.client_id_for_logs()
238-
.unwrap_or("unknown"),
239-
queue_id = EOA_QUEUE_ID,
240-
"Failed to queue webhook for nack: {}",
241-
e
242-
);
216+
tracing::error!("Failed to queue webhook for nack: {}", e);
243217
} else {
244218
report.webhook_events_queued += 1;
245219
}
@@ -281,19 +255,7 @@ impl SafeRedisTransaction for ProcessBorrowedTransactions<'_> {
281255
&mut tx_context,
282256
self.webhook_queue.clone(),
283257
) {
284-
tracing::error!(
285-
transaction_id = transaction_id,
286-
chain_id = result.transaction.user_request.chain_id,
287-
client_id = result
288-
.transaction
289-
.user_request
290-
.rpc_credentials
291-
.client_id_for_logs()
292-
.unwrap_or("unknown"),
293-
queue_id = EOA_QUEUE_ID,
294-
"Failed to queue webhook for fail: {}",
295-
e
296-
);
258+
tracing::error!("Failed to queue webhook for fail: {}", e);
297259
} else {
298260
report.webhook_events_queued += 1;
299261
}

‎executors/src/eoa/store/submitted.rs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ use crate::{
2222
webhook::{WebhookJobHandler, queue_webhook_envelopes},
2323
};
2424

25-
const EOA_QUEUE_ID: &str = "eoa_executor";
26-
2725
#[derive(Debug, Clone)]
2826
pub struct SubmittedTransaction {
2927
pub data: SubmittedTransactionDehydrated,
@@ -399,14 +397,6 @@ impl SafeRedisTransaction for CleanSubmittedTransactions<'_> {
399397
self.webhook_queue.clone(),
400398
) {
401399
tracing::error!(
402-
transaction_id = %tx.transaction_id,
403-
chain_id = tx.user_request.chain_id,
404-
client_id = tx
405-
.user_request
406-
.rpc_credentials
407-
.client_id_for_logs()
408-
.unwrap_or("unknown"),
409-
queue_id = EOA_QUEUE_ID,
410400
"Failed to queue webhook for confirmed transaction: {}",
411401
e
412402
);
@@ -446,14 +436,6 @@ impl SafeRedisTransaction for CleanSubmittedTransactions<'_> {
446436
self.webhook_queue.clone(),
447437
) {
448438
tracing::error!(
449-
transaction_id = %tx.transaction_id,
450-
chain_id = tx.user_request.chain_id,
451-
client_id = tx
452-
.user_request
453-
.rpc_credentials
454-
.client_id_for_logs()
455-
.unwrap_or("unknown"),
456-
queue_id = EOA_QUEUE_ID,
457439
"Failed to queue webhook for replaced transaction: {}",
458440
e
459441
);

0 commit comments

Comments
 (0)