The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
submit transform metering data to metering endpoint (#67902)
Nicola Momettocc9f7e63ad64
diff --git a/enterprise/backend/src/metabase_enterprise/transforms/core.clj b/enterprise/backend/src/metabase_enterprise/transforms/core.cljindex 68ca09edd10..06c18cd0953 100644--- a/enterprise/backend/src/metabase_enterprise/transforms/core.clj+++ b/enterprise/backend/src/metabase_enterprise/transforms/core.clj@@ -1,10 +1,13 @@(ns metabase-enterprise.transforms.core"API namespace for the `metabase-enterprise.transform` module."(:require+ [java-time.api :as t][metabase-enterprise.transforms.models.transform-run][metabase-enterprise.transforms.settings][metabase-enterprise.transforms.util]- [potemkin :as p]))+ [metabase.premium-features.core :refer [defenterprise]]+ [potemkin :as p]+ [toucan2.core :as t2]))(p/import-vars[metabase-enterprise.transforms.settings@@ -15,3 +18,22 @@query-transform?][metabase-enterprise.transforms.models.transform-runtimeout-run!])++(defenterprise transform-stats+ "Calculate successful transform runs over a window of the previous UTC day 00:00-23:59"+ :feature :none+ []+ (let [yesterday-utc (-> (t/offset-date-time (t/zone-offset "+00"))+ (t/minus (t/days 1)))+ count-runs (fn [source-types]+ (or (:cnt (t2/query-one {:select [[[:count :r.id] :cnt]]+ :from [[:transform_run :r]]+ :join [[:transform :t] [:= :t.id :r.transform_id]]+ :where [:and+ [:= :r.status "succeeded"]+ [:in :t.source_type source-types]+ [:= [:cast :r.end_time :date] [:cast yesterday-utc :date]]]}))+ 0))]+ {:transform-native-runs (count-runs ["native" "mbql"])+ :transform-python-runs (count-runs ["python"])+ :transform-usage-date (str (t/local-date yesterday-utc))}))diff --git a/src/metabase/premium_features/token_check.clj b/src/metabase/premium_features/token_check.cljindex 477b42de05f..6c34f39d83f 100644--- a/src/metabase/premium_features/token_check.clj+++ b/src/metabase/premium_features/token_check.clj@@ -104,6 +104,12 @@:enabled-embedding-sdk false:enabled-embedding-simple false})+(defn- yesterday []+ (-> (t/offset-date-time (t/zone-offset "+00"))+ (t/minus (t/days 1))+ t/local-date+ str))+(defenterprise metabot-stats"Stats for Metabot"metabase-enterprise.metabot-v3.core@@ -111,10 +117,15 @@{:metabot-tokens 0:metabot-queries 0:metabot-users 0- :metabot-usage-date (-> (t/offset-date-time (t/zone-offset "+00"))- (t/minus (t/days 1))- t/local-date- str)})+ :metabot-usage-date (yesterday)})++(defenterprise transform-stats+ "Stats for Transforms"+ metabase-enterprise.transforms.core+ []+ {:transform-native-runs 0+ :transform-python-runs 0+ :transform-usage-date (yesterday)})(defn metering-stats"Collect metering statistics for billing purposes. Used by both token check and metering task. "@@ -128,6 +139,7 @@stats (merge (internal-stats/query-execution-last-utc-day)(embedding-settings embedding-dashboard-count embedding-question-count)(metabot-stats)+ (transform-stats){:users users:embedding-dashboard-count embedding-dashboard-count:embedding-question-count embedding-question-count