Skip to content

Use database identity not owner identity for metrics #2868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshua-spacetime merged 1 commit into from
Jun 16, 2025
Merged

Use database identity not owner identity for metrics #2868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions crates/core/src/subscription/module_subscription_actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,8 @@ impl ModuleSubscriptions {
)
};

let subscription_metrics = SubscriptionMetrics::new(&self.owner_identity, &WorkloadType::Unsubscribe);
let database_identity = self.relational_db.database_identity();
let subscription_metrics = SubscriptionMetrics::new(&database_identity, &WorkloadType::Unsubscribe);

// Always lock the db before the subscription lock to avoid deadlocks.
let tx = scopeguard::guard(self.relational_db.begin_tx(Workload::Unsubscribe), |tx| {
Expand Down Expand Up @@ -659,7 +660,8 @@ impl ModuleSubscriptions {

let num_queries = request.query_strings.len();

let subscription_metrics = SubscriptionMetrics::new(&self.owner_identity, &WorkloadType::Subscribe);
let database_identity = self.relational_db.database_identity();
let subscription_metrics = SubscriptionMetrics::new(&database_identity, &WorkloadType::Subscribe);

// How many queries make up this subscription?
subscription_metrics.num_queries_subscribed.inc_by(num_queries as _);
Expand Down Expand Up @@ -756,7 +758,8 @@ impl ModuleSubscriptions {
_assert: Option<AssertTxFn>,
) -> Result<ExecutionMetrics, DBError> {
let num_queries = subscription.query_strings.len();
let subscription_metrics = SubscriptionMetrics::new(&self.owner_identity, &WorkloadType::Subscribe);
let database_identity = self.relational_db.database_identity();
let subscription_metrics = SubscriptionMetrics::new(&database_identity, &WorkloadType::Subscribe);

// How many queries make up this subscription?
subscription_metrics.num_queries_subscribed.inc_by(num_queries as _);
Expand Down Expand Up @@ -850,7 +853,8 @@ impl ModuleSubscriptions {
mut event: ModuleEvent,
tx: MutTx,
) -> Result<Result<(Arc<ModuleEvent>, ExecutionMetrics), WriteConflict>, DBError> {
let subscription_metrics = SubscriptionMetrics::new(&self.owner_identity, &WorkloadType::Update);
let database_identity = self.relational_db.database_identity();
let subscription_metrics = SubscriptionMetrics::new(&database_identity, &WorkloadType::Update);

// Take a read lock on `subscriptions` before committing tx
// else it can result in subscriber receiving duplicate updates.
Expand Down
Loading