Merge branch 'problame/infallible-timeline-activate/2-pushup-tenant-and-timeline-activation' into problame/infallible-timeline-activate/3-funnel-storage-broker-client

This commit is contained in:
Christian Schwarz
2023-05-24 11:57:37 +02:00

View File

@@ -631,7 +631,11 @@ impl Tenant {
}
Ok(())
}
.instrument(tracing::info_span!("attach", tenant_id=%tenant_id)),
.instrument({
let span = tracing::info_span!(parent: None, "attach", tenant_id=%tenant_id);
span.follows_from(Span::current());
span
}),
);
Ok(tenant)
}
@@ -903,7 +907,11 @@ impl Tenant {
info!("initial load for tenant {tenant_id} finished!");
Ok(())
}
.instrument(info_span!("load", tenant_id=%tenant_id)),
.instrument({
let span = tracing::info_span!(parent: None, "load", tenant_id=%tenant_id);
span.follows_from(Span::current());
span
}),
);
info!("spawned load into background");