Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix the anonymous stats ping failing on dev instances (#82952)

Andrei Simionescub87df9ee9d95
diff --git a/src/metabase/analytics/db.clj b/src/metabase/analytics/db.clj
index aaf2848d258..66265c9322f 100644
--- a/src/metabase/analytics/db.clj
+++ b/src/metabase/analytics/db.clj
@@ -302,11 +302,6 @@
[since :- ms/TemporalInstant]
(t2/count :model/QueryExecution :started_at [:>= since]))
-(mu/defn new-scim-user-count-since
- "The number of active SCIM-provisioned Users who joined at or after `since`."
- [since :- ms/TemporalInstant]
- (t2/count :model/User :sso_source :scim :is_active true :date_joined [:>= since]))
-
(mu/defn database-engines-among
"The set of engines of the Databases whose engine is one of `engine-names`."
[engine-names :- [:sequential :string]]
diff --git a/src/metabase/analytics/stats.clj b/src/metabase/analytics/stats.clj
index b4d5886122e..e390becb965 100644
--- a/src/metabase/analytics/stats.clj
+++ b/src/metabase/analytics/stats.clj
@@ -590,8 +590,7 @@
:new_users_last_24h (analytics.db/new-active-user-count-since one-day-ago)
:pivot_tables (analytics.db/unarchived-pivot-table-count)
:query_executions_last_24h (analytics.db/query-execution-count-since one-day-ago)
- :entity_id_translations_last_24h total-translation-count
- :scim_users_last_24h (analytics.db/new-scim-user-count-since one-day-ago)}
+ :entity_id_translations_last_24h total-translation-count}
(transform-metrics))))
(def ^:private string-keyed-int-histogram
diff --git a/src/metabase/internal_stats/query_executions.clj b/src/metabase/internal_stats/query_executions.clj
index 681b38f8eda..ecaa4232103 100644
--- a/src/metabase/internal_stats/query_executions.clj
+++ b/src/metabase/internal_stats/query_executions.clj
@@ -6,9 +6,9 @@
(defn query-executions-all-time-and-last-24h
"Calculate query executions for the entire available history and over the last 24 hours from now."
[]
- (let [qe (internal-stats.db/query-execution-statistics-all-time)
+ (let [qe (dissoc (internal-stats.db/query-execution-statistics-all-time) :row_count)
one-day-ago (t/minus (t/offset-date-time) (t/days 1))
- qe-24h (internal-stats.db/query-execution-statistics-since one-day-ago)]
+ qe-24h (dissoc (internal-stats.db/query-execution-statistics-since one-day-ago) :row_count)]
{:query-executions qe
:query-executions-24h qe-24h}))
diff --git a/test/metabase/analytics/stats_test.clj b/test/metabase/analytics/stats_test.clj
index 02f269371fa..e99c833a8ab 100644
--- a/test/metabase/analytics/stats_test.clj
+++ b/test/metabase/analytics/stats_test.clj
@@ -585,6 +585,12 @@
(get query_executions_24h k)))
"There are never more query executions in the 24h version than all-of-time."))))))
+(deftest snowplow-anonymous-usage-stats-test
+ (testing "the stats ping sends every metric it collects"
+ (let [{:strs [metrics]} (#'stats/snowplow-anonymous-usage-stats (legacy-anonymous-usage-stats))]
+ (is (empty? (set/difference (set (map name (keys (#'stats/->snowplow-metric-info))))
+ (set (map #(get % "name") metrics))))))))
+
(deftest snowplow-setting-tests
(testing "snowplow formated settings"
(let [instance-stats (#'stats/instance-settings)