Skip to content

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

BOT-1292 Do not convert metering values to string in send-metering-events! (#72377)

applebyd0570b318ddf
diff --git a/src/metabase/premium_features/token_check.clj b/src/metabase/premium_features/token_check.clj
index 33a3c2d58bb..595c4930dc0 100644
--- a/src/metabase/premium_features/token_check.clj
+++ b/src/metabase/premium_features/token_check.clj
@@ -211,13 +211,10 @@
(when-let [token (premium-features.settings/premium-embedding-token)]
(when (mr/validate [:re RemoteCheckedToken] token)
(tracing/with-span :tasks "metering.send-events" {}
- (let [site-uuid (premium-features.settings/site-uuid-for-premium-features-token-checks)
- stats (-> (metering-stats)
- ;; for backwards compatibility, we send values as strings
- (update-vals str))]
+ (let [site-uuid (premium-features.settings/site-uuid-for-premium-features-token-checks)]
(try
(http/post (metering-url token token-check-url)
- {:body (json/encode (merge stats
+ {:body (json/encode (merge (metering-stats)
{:site-uuid site-uuid
:mb-version (:tag config/mb-version-info)}))
:content-type :json
diff --git a/test/metabase/premium_features/token_check_test.clj b/test/metabase/premium_features/token_check_test.clj
index 0fd9cac9561..b8a3d6a323b 100644
--- a/test/metabase/premium_features/token_check_test.clj
+++ b/test/metabase/premium_features/token_check_test.clj
@@ -315,6 +315,31 @@
(is (contains? body "users")
"Request body should include users count"))))))))
+(deftest send-metering-events-preserves-value-types-test
+ (testing "metering values are not converted to strings before sending"
+ (let [fake-usage {"anthropic:claude-sonnet-4-6:tokens" 500
+ "openai:gpt-4:tokens" 300}
+ request-data (atom nil)]
+ (mt/with-random-premium-token! [_token]
+ (with-redefs [token-check/metering-stats (constantly {:users 10
+ :external-users 2
+ :internal-users 8
+ :domains 1
+ :metabot-usage fake-usage
+ :metabot-tokens 800})
+ http/post (fn [_url opts]
+ (reset! request-data opts)
+ {:status 200 :body "{}"})]
+ (token-check/send-metering-events!)
+ (let [body (json/decode (:body @request-data) keyword)]
+ (is (= 10 (:users body))
+ "numeric values should remain numeric after JSON round-trip")
+ (is (map? (:metabot-usage body))
+ "map values should remain maps after JSON round-trip")
+ (is (= fake-usage
+ (update-keys (:metabot-usage body) name))
+ "nested map values should round-trip intact")))))))
+
(deftest send-metering-events-error-handling-test
(testing "send-metering-events! handles errors gracefully"
(mt/with-random-premium-token! [_token]