feat(alerting): Introduce SubscriptionActivity #3535

julienbourdeau · 2025-04-25T10:19:39Z

Context

First big step toward Alerting feature

Description

Follows: #3528

Every time an event is received, we insert a SubscriptionActivity in the db, unique per subscription
Every 5 minutes, we recompute current_usage for all active subscription
- If org has progressive billings, we check the thresholds
- If org is using alerting, we'll check the alert at the same time (later
Stop using lifetime_usage.recalculate_current_usage but the job keeps looking at this column until there are not more jobs to process

Copilot

Pull Request Overview

This PR introduces the SubscriptionActivity feature as a first step toward the new alerting functionality. It adds a new database table and associated models, services, jobs, and tests to support tracking and processing subscription activities.

Adds a migration for usage_monitoring_subscription_activities.
Introduces several services and jobs to record and process subscription activity.
Updates clock scheduling and tests to enqueue subscription activity processing jobs.

Reviewed Changes

Copilot reviewed 33 out of 34 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
spec/clockwork_spec.rb	Added tests verifying the scheduling and interval configuration for subscription activity processing jobs.
db/migrate/20250425110148_create_usage_monitoring_subscription_activities.rb	Migration file creating the subscription activities table with necessary indexes and columns.
clock.rb	New scheduling logic for enqueuing subscription activity processing jobs using ENV configuration.
app/services/usage_monitoring/*.rb	New services that handle tracking and processing of subscription activities.
app/models/subscription.rb & app/models/organization.rb	Updated associations to support subscription activity tracking.
app/jobs/usage_monitoring/.rb & app/jobs/clock/.rb	New jobs to perform subscription activity processing asynchronously.

Files not reviewed (1)

db/structure.sql: Language not supported

spec/clockwork_spec.rb

app/services/usage_monitoring/process_all_subscription_activities_service.rb

app/services/usage_monitoring/process_subscription_activity_service.rb

app/services/usage_monitoring/process_organization_subscription_activities_service.rb

app/services/events/post_process_service.rb

app/services/lifetime_usages/calculate_service.rb

app/services/usage_monitoring/track_subscription_activity_service.rb

app/services/subscriptions/flag_refreshed_service.rb

Copilot

Pull Request Overview

This PR introduces the SubscriptionActivity feature as a first step toward the new Alerting functionality by tracking subscription activity events and processing them periodically. Key changes include adding a migration and model for subscription activities, implementing services and jobs to track and process these activities, and updating tests and scheduling logic accordingly.

Reviewed Changes

Copilot reviewed 34 out of 35 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
spec/clockwork_spec.rb	Adds tests for scheduling and processing subscription activity jobs.
db/migrate/20250428120148_create_usage_monitoring_subscription_activities.rb	Creates the table for subscription activities with unique constraints.
clock.rb	Introduces scheduling for processing subscription activities with configurable interval.
app/services/usage_monitoring/track_subscription_activity_service.rb	Adds a service to log subscription activities via bulk insert.
app/services/usage_monitoring/process_subscription_activity_service.rb	Implements processing of individual subscription activities and associated lifetime usage updates.
app/services/usage_monitoring/process_organization_subscription_activities_service.rb	Processes subscription activities in batches per organization.
app/services/usage_monitoring/process_all_subscription_activities_service.rb	Dispatches jobs for processing all subscription activities across organizations.
app/services/subscriptions/flag_refreshed_service.rb	Replaces lifetime usage flag refresh with subscription activity tracking.
app/services/lifetime_usages/calculate_service.rb	Adjusts recalculation logic to separate invoiced and current usage updates.
app/services/events/post_process_service.rb	Updates event processing to trigger subscription activity tracking.
app/models/usage_monitoring/subscription_activity.rb	Defines the SubscriptionActivity model with associations.
app/models/usage_monitoring.rb, app/models/subscription.rb, app/models/organization.rb	Introduces associations and scopes for subscription activities.
app/jobs/usage_monitoring/* & app/jobs/clock/*	Adds jobs to process subscription activities and updates lifetime usage refresh job.

Files not reviewed (1)

db/structure.sql: Language not supported

Comments suppressed due to low confidence (1)

spec/clockwork_spec.rb:300

[nitpick] The test description might be misleading as it enqueues a subscription activity processing job. Consider renaming it to 'enqueue a process subscription activity job' to better reflect its purpose.

it "enqueue a refresh flagged subscriptions job" do

app/services/usage_monitoring/process_organization_subscription_activities_service.rb

app/models/usage_monitoring/subscription_activity.rb

vincent-pochet

Looks good 👍

app/jobs/usage_monitoring/process_organization_subscription_activities_job.rb

app/services/usage_monitoring/process_organization_subscription_activities_service.rb

app/services/usage_monitoring/process_subscription_activity_service.rb

app/services/usage_monitoring/track_subscription_activity_service.rb

If there is no threshold, we don't insert a line which was going to be be deleted right after. Closer to what existed before We loop over each organization to process activity because alerting is not a premium integration

Co-authored-by: Vincent Pochet <vincent@getlago.com>

## Context First big step toward Alerting feature ## Description Follows: #3528 * Every time an event is received, we insert a SubscriptionActivity in the db, unique per subscription * Every 5 minutes, we recompute `current_usage` for all active subscription * If org has progressive billings, we check the thresholds * If org is using alerting, we'll check the alert at the same time (later * Stop using `lifetime_usage.recalculate_current_usage` but the job keeps looking at this column until there are not more jobs to process --------- Co-authored-by: Vincent Pochet <vincent@getlago.com>

…alerts (#3690) ## Context We're adding Alerting feature, see #3528, #3535, #3554, #3600 ## Description We introducing 2 new types of alerts: * LifetimeUsageAmount: to define alert based on lifetime total usage * BillableMetricUsageUnits: same as BillableMetricUsageAmount but with a number "used units" instead of currency amount. Creating a new alert is essentially creating a new child class of `UsageMonitoring::Alert` and implementing `find_value`. 🙌

julienbourdeau self-assigned this Apr 25, 2025

julienbourdeau force-pushed the feat/subscription-activity branch 2 times, most recently from 1d6cf68 to 59afd2d Compare April 25, 2025 11:57

julienbourdeau requested review from vincent-pochet, Copilot and nudded April 25, 2025 11:57

julienbourdeau marked this pull request as ready for review April 25, 2025 11:57

Copilot AI reviewed Apr 25, 2025

View reviewed changes

spec/clockwork_spec.rb Outdated Show resolved Hide resolved

julienbourdeau force-pushed the feat/subscription-activity branch from 59afd2d to 7c64e14 Compare April 25, 2025 12:02

julienbourdeau mentioned this pull request Apr 25, 2025

feat(alert): Add refresh subscription usage flag and clock #3480

Closed