From 09ec27a53854245a62ff4457532ad8e8115f6a2b Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Thu, 2 Oct 2025 13:42:22 -0700 Subject: [PATCH] fix(otel): clickhouse logs/span metrics now exclude partials and debug events --- .../schema/008_add_task_events_v1_mvs.sql | 4 +-- .../schema/009_add_task_events_v2_mvs.sql | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 internal-packages/clickhouse/schema/009_add_task_events_v2_mvs.sql diff --git a/internal-packages/clickhouse/schema/008_add_task_events_v1_mvs.sql b/internal-packages/clickhouse/schema/008_add_task_events_v1_mvs.sql index 6a4b9b93e3..63de335b3b 100644 --- a/internal-packages/clickhouse/schema/008_add_task_events_v1_mvs.sql +++ b/internal-packages/clickhouse/schema/008_add_task_events_v1_mvs.sql @@ -49,7 +49,7 @@ GROUP BY organization_id, project_id, environment_id, bucket_start; -- +goose Down -DROP MATERIALIZED VIEW IF EXISTS trigger_dev.mv_task_event_usage_by_minute_v1; -DROP MATERIALIZED VIEW IF EXISTS trigger_dev.mv_task_event_usage_by_hour_v1; +DROP TABLE IF EXISTS trigger_dev.mv_task_event_usage_by_minute_v1; +DROP TABLE IF EXISTS trigger_dev.mv_task_event_usage_by_hour_v1; DROP TABLE IF EXISTS trigger_dev.task_event_usage_by_hour_v1; DROP TABLE IF EXISTS trigger_dev.task_event_usage_by_minute_v1; \ No newline at end of file diff --git a/internal-packages/clickhouse/schema/009_add_task_events_v2_mvs.sql b/internal-packages/clickhouse/schema/009_add_task_events_v2_mvs.sql new file mode 100644 index 0000000000..7ebb640ebd --- /dev/null +++ b/internal-packages/clickhouse/schema/009_add_task_events_v2_mvs.sql @@ -0,0 +1,29 @@ +-- +goose Up +DROP TABLE IF EXISTS trigger_dev.mv_task_event_usage_by_minute_v1; + +CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.mv_task_event_usage_by_minute_v2 +TO trigger_dev.task_event_usage_by_minute_v1 AS +SELECT + organization_id, + project_id, + environment_id, + toStartOfMinute(start_time) AS bucket_start, + count() AS event_count +FROM trigger_dev.task_events_v1 +WHERE kind != 'DEBUG_EVENT' AND kind != 'ANCESTOR_OVERRIDE' AND status != 'PARTIAL' +GROUP BY organization_id, project_id, environment_id, bucket_start; + + +-- +goose Down +DROP TABLE IF EXISTS trigger_dev.mv_task_event_usage_by_minute_v2; + +CREATE MATERIALIZED VIEW IF NOT EXISTS trigger_dev.mv_task_event_usage_by_minute_v1 +TO trigger_dev.task_event_usage_by_minute_v1 AS +SELECT + organization_id, + project_id, + environment_id, + toStartOfMinute(start_time) AS bucket_start, + count() AS event_count +FROM trigger_dev.task_events_v1 +GROUP BY organization_id, project_id, environment_id, bucket_start;