From cd8c4ddf0e7ebcefc641aaf175af568cbc1de9f4 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 5 Nov 2026 18:32:32 +0000 Subject: [PATCH] count workspace webhook deliveries and configured webhooks (#12253) * feat: count workspace webhook deliveries and configured webhooks Co-Authored-By: Claude Opus 5.5 * docs: list workspace_webhook in the feature telemetry registry count Co-Authored-By: Claude Opus 5.5 * chore: update ee-repo-ref to a0bbb5a697611ed40e5ae9d5a8f8928dfd457f14 This commit updates the EE repository reference after PR #959 was merged in windmill-ee-private. Previous ee-repo-ref: cd0792fdda9d1753fe282ce05bdca286690ba827 New ee-repo-ref: a0bbb5a697611ed40e5ae9d5a8f8928dfd457f14 Automated by sync-ee-ref workflow. --------- Co-authored-by: Claude Opus 5.5 Co-authored-by: windmill-internal-app[bot] --- ...b3b48623d805dc73538c0704b58171bdec9ed.json | 26 +++++++++++++++++++ backend/ee-repo-ref.txt | 2 +- backend/windmill-common/src/webhook.rs | 1 + docs/feature-telemetry.md | 4 +-- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 backend/.sqlx/query-ebb44484d03619ca777a06764b4b3b48623d805dc73538c0704b58171bdec9ed.json diff --git a/backend/.sqlx/query-ebb44484d03619ca777a06764b4b3b48623d805dc73538c0704b58171bdec9ed.json b/backend/.sqlx/query-ebb44484d03619ca777a06764b4b3b48623d805dc73538c0704b58171bdec9ed.json new file mode 100644 index 0000000000..8e14a31978 --- /dev/null +++ b/backend/.sqlx/query-ebb44484d03619ca777a06764b4b3b48623d805dc73538c0704b58171bdec9ed.json @@ -0,0 +1,26 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT\n COUNT(*) FILTER (WHERE webhook_events IS NULL)::BIGINT AS \"all!\",\n COUNT(*) FILTER (WHERE webhook_events IS NOT NULL)::BIGINT AS \"filtered!\"\n FROM workspace_settings WHERE webhook IS NOT NULL AND webhook <> ''", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "all!", + "type_info": "Int8" + }, + { + "ordinal": 1, + "name": "filtered!", + "type_info": "Int8" + } + ], + "parameters": { + "Left": [] + }, + "nullable": [ + null, + null + ] + }, + "hash": "ebb44484d03619ca777a06764b4b3b48623d805dc73538c0704b58171bdec9ed" +} diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index f2a645c01e..e126d0ce94 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -8990719c0e4a6e4632d812e32b37ca5c2b341a44 +a0bbb5a697611ed40e5ae9d5a8f8928dfd457f14 diff --git a/backend/windmill-common/src/webhook.rs b/backend/windmill-common/src/webhook.rs index b4f6157d23..5d0d77ad54 100644 --- a/backend/windmill-common/src/webhook.rs +++ b/backend/windmill-common/src/webhook.rs @@ -248,6 +248,7 @@ impl WebhookShared { let timer = if METRICS_ENABLED.load(std::sync::atomic::Ordering::Relaxed) { Some(WEBHOOK_REQUEST_COUNT.start_timer()) } else { None }; tracing::info!("Sending webhook message to {}", url); let _ = client.post(url).json(&message).send().await; + crate::feature_usage::log_feature_usage("workspace_webhook", "sent", message.event_type()); #[cfg(feature = "prometheus")] timer.map(|x| x.stop_and_record()); } diff --git a/docs/feature-telemetry.md b/docs/feature-telemetry.md index e55350a300..0589d79b16 100644 --- a/docs/feature-telemetry.md +++ b/docs/feature-telemetry.md @@ -4,13 +4,13 @@ anonymous usage-stats payload. It answers "does anyone use this, and which variant do they pick" without any identifying data leaving the instance. -It currently carries 99 registered actions across thirty-nine features (`access_view`, `ai_session`, `ai_chat`, +It currently carries 100 registered actions across forty features (`access_view`, `ai_session`, `ai_chat`, `ai_fix`, `ai_agent`, `ai_decision`, `ai_agent_eval`, `app_sandbox`, `datatable`, `db_manager`, `flow_editor`, `flow_run`, `flow_step`, `home`, `header_nav`, `run_form`, `sharing`, `debugger`, `trigger`, `command_script`, `mcp`, `mcp_workspace`, `mcp_external_client`, `hub_script`, `usage_meter`, `sso_groups_claim`, `cloud_trial_offer`, `job_token_scopes`, `worker_draining`, `worker_group`, `worker_resource_stats`, `dev_workspace_isolation`, `slack_agent`, `variable_expiration`, -`external_secret_ref`, `anthropic_federation`, `deployment_request`, `fork_roles`, `git_sync_review`). Nearly all of the +`external_secret_ref`, `anthropic_federation`, `deployment_request`, `fork_roles`, `git_sync_review`, `workspace_webhook`). Nearly all of the product is uninstrumented, so new user-facing work is the opportunity to change that. ## When to instrument