mirrors/background-jobs
1
0
Fork 0
mirror of https://git.asonix.dog/asonix/background-jobs.git synced 2024-11-21 19:40:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

actix: Improve tracing

Browse source
This commit is contained in:
asonix 2022-12-13 23:07:03 -06:00
parent 1a835863d4
commit ee91b27933
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
jobs-actix/Cargo.toml
View file

@ -12,7 +12,6 @@ edition = "2021"
[dependencies]
actix-rt = "2.5.1"
anyhow = "1.0"
async-mutex = "1.0.1"
async-trait = "0.1.24"
background-jobs-core = { version = "0.14.0", path = "../jobs-core", features = [
"with-actix",

3
jobs-actix/src/every.rs
View file

@ -1,7 +1,6 @@
use crate::{Job, QueueHandle};
use actix_rt::time::{interval_at, Instant};
use std::time::Duration;
use tracing::error;
/// A type used to schedule recurring jobs.
///
@ -20,7 +19,7 @@ where
let job = job.clone();
if spawner.queue::<J>(job).await.is_err() {
error!("Failed to queue job: {}", J::NAME);
tracing::error!("Failed to queue job: {}", J::NAME);
}
}
}

3
jobs-actix/src/server.rs
View file

@ -2,7 +2,6 @@ use crate::storage::{ActixStorage, StorageWrapper};
use anyhow::Error;
use background_jobs_core::{JobInfo, NewJobInfo, ReturnJobInfo, Storage};
use std::sync::Arc;
use tracing::trace;
use uuid::Uuid;
/// The server Actor
@ -34,7 +33,7 @@ impl Server {
worker_id: Uuid,
worker_queue: &str,
) -> Result<JobInfo, Error> {
trace!("Worker {} requested job", worker_id);
tracing::trace!("Worker {} requested job", worker_id);
self.storage.request_job(worker_queue, worker_id).await
}

21
jobs-actix/src/worker.rs
View file

@ -34,16 +34,16 @@ impl<State: Clone + 'static, Extras: 'static> Drop for LocalWorkerStarter<State,
}
}
struct LogOnDrop<F>(F)
struct RunOnDrop<F>(F)
where
F: Fn() -> Span;
F: Fn();
impl<F> Drop for LogOnDrop<F>
impl<F> Drop for RunOnDrop<F>
where
F: Fn() -> Span,
F: Fn(),
{
fn drop(&mut self) {
(self.0)().in_scope(|| tracing::info!("Worker closing"));
(self.0)();
}
}
@ -94,7 +94,9 @@ pub(crate) async fn local_worker<State, Extras>(
let id = Uuid::new_v4();
let log_on_drop = LogOnDrop(|| make_span(id, &queue, "closing"));
let log_on_drop = RunOnDrop(|| {
make_span(id, &queue, "closing").in_scope(|| tracing::warn!("Worker closing"));
});
loop {
let request_span = make_span(id, &queue, "request");
@ -119,9 +121,11 @@ pub(crate) async fn local_worker<State, Extras>(
};
drop(request_span);
let process_span = make_span(id, &queue, "process");
let job_id = job.id();
let return_job = time_job(Box::pin(processors.process(job)), job_id)
.instrument(make_span(id, &queue, "process"))
let return_job = process_span
.in_scope(|| time_job(Box::pin(processors.process(job)), job_id))
.instrument(process_span)
.await;
let return_span = make_span(id, &queue, "return");
@ -147,6 +151,7 @@ pub(crate) async fn local_worker<State, Extras>(
fn make_span(id: Uuid, queue: &str, operation: &str) -> Span {
tracing::info_span!(
parent: None,
"Worker",
worker.id = tracing::field::display(id),
worker.queue = tracing::field::display(queue),