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
Add entity id and entity type to the dependency calculation error (#69001)
daef622a48325e
diff --git a/enterprise/backend/src/metabase_enterprise/dependencies/events.clj b/enterprise/backend/src/metabase_enterprise/dependencies/events.cljindex 819ff9645d5..6a0d981dff7 100644--- a/enterprise/backend/src/metabase_enterprise/dependencies/events.clj+++ b/enterprise/backend/src/metabase_enterprise/dependencies/events.clj@@ -27,11 +27,12 @@becomes a serious enough issue, at which point we will have to redesign version marking andanalysis triggering."{:style/indent 0}- [& body]+ [entity-type entity-id & body]`(try~@body(catch Throwable e#- (log/error e# "Dependency calculation failed")+ (log/error e# "Dependency calculation failed" {:entity-type ~entity-type+ :entity-id ~entity-id})nil)));; ### Cards@@ -46,8 +47,8 @@(when (premium-features/has-feature? :dependencies)(t2/with-transaction [_conn](models.dependency/replace-dependencies! :card (:id object)- (ignore-errors- (deps.calculation/upstream-deps:card object)))+ (ignore-errors :card (:id object)+ (deps.calculation/upstream-deps:card object)))(when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)(t2/update! :model/Card (:id object){:dependency_analysis_version models.dependency/current-dependency-analysis-version})))))@@ -70,8 +71,8 @@(when (premium-features/has-feature? :dependencies)(t2/with-transaction [_conn](models.dependency/replace-dependencies! :snippet (:id object)- (ignore-errors- (deps.calculation/upstream-deps:snippet object)))+ (ignore-errors :snippet (:id object)+ (deps.calculation/upstream-deps:snippet object)))(when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)(t2/update! :model/NativeQuerySnippet (:id object){:dependency_analysis_version models.dependency/current-dependency-analysis-version})))))@@ -119,8 +120,8 @@(when (premium-features/has-feature? :dependencies)(t2/with-transaction [_conn](models.dependency/replace-dependencies! :transform (:id object)- (ignore-errors- (deps.calculation/upstream-deps:transform object)))+ (ignore-errors :transform (:id object)+ (deps.calculation/upstream-deps:transform object)))(when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)(t2/update! :model/Transform (:id object) {:dependency_analysis_version models.dependency/current-dependency-analysis-version}))(drop-outdated-target-dep! object))))@@ -169,8 +170,8 @@:dashboardcard_id [:in (map :id dashcards)]))dashboard (assoc object :dashcards dashcards :series-card-ids series-card-ids)](models.dependency/replace-dependencies! :dashboard dashboard-id- (ignore-errors- (deps.calculation/upstream-deps:dashboard dashboard))))+ (ignore-errors :dashboard dashboard-id+ (deps.calculation/upstream-deps:dashboard dashboard))))(when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)(t2/update! :model/Dashboard (:id object){:dependency_analysis_version models.dependency/current-dependency-analysis-version})))))@@ -193,8 +194,8 @@(when (premium-features/has-feature? :dependencies)(t2/with-transaction [_conn](models.dependency/replace-dependencies! :document (:id object)- (ignore-errors- (deps.calculation/upstream-deps:document object)))+ (ignore-errors :document (:id object)+ (deps.calculation/upstream-deps:document object)))(when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)(t2/update! :model/Document (:id object){:dependency_analysis_version models.dependency/current-dependency-analysis-version})))))@@ -216,8 +217,8 @@[_ {:keys [object]}](when (premium-features/has-feature? :dependencies)(t2/with-transaction [_conn]- (models.dependency/replace-dependencies! :sandbox (:id object) (ignore-errors- (deps.calculation/upstream-deps:sandbox object)))+ (models.dependency/replace-dependencies! :sandbox (:id object) (ignore-errors :sandbox (:id object)+ (deps.calculation/upstream-deps:sandbox object)))(when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)(t2/update! :model/Sandbox (:id object){:dependency_analysis_version models.dependency/current-dependency-analysis-version})))))@@ -240,8 +241,8 @@(when (premium-features/has-feature? :dependencies)(t2/with-transaction [_conn](models.dependency/replace-dependencies! :segment (:id object)- (ignore-errors- (deps.calculation/upstream-deps:segment object)))+ (ignore-errors :segment (:id object)+ (deps.calculation/upstream-deps:segment object)))(when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)(t2/update! :model/Segment (:id object){:dependency_analysis_version models.dependency/current-dependency-analysis-version})))))@@ -263,8 +264,8 @@(when (premium-features/has-feature? :dependencies)(t2/with-transaction [_conn](models.dependency/replace-dependencies! :measure (:id object)- (ignore-errors- (deps.calculation/upstream-deps:measure object)))+ (ignore-errors :measure (:id object)+ (deps.calculation/upstream-deps:measure object)))(when (not= (:dependency_analysis_version object) models.dependency/current-dependency-analysis-version)(t2/update! :model/Measure (:id object){:dependency_analysis_version models.dependency/current-dependency-analysis-version})))))diff --git a/enterprise/backend/test/metabase_enterprise/dependencies/events_test.clj b/enterprise/backend/test/metabase_enterprise/dependencies/events_test.cljindex 8e530d46e7b..8f92eeecf51 100644--- a/enterprise/backend/test/metabase_enterprise/dependencies/events_test.clj+++ b/enterprise/backend/test/metabase_enterprise/dependencies/events_test.clj@@ -1,5 +1,6 @@(ns metabase-enterprise.dependencies.events-test(:require+ [clojure.string :as str][clojure.test :refer [deftest is testing]][metabase-enterprise.dependencies.calculation :as deps.calculation][metabase-enterprise.dependencies.events]@@ -239,7 +240,9 @@(testing "on create event"(events/publish-event! :event/card-create {:object card :user-id api/*current-user-id*})(is (some #(and (= "Dependency calculation failed" (ex-message (:e %)))- (= :error (:level %)))+ (= :error (:level %))+ (str/includes? (:message %) "{:entity-type :card")+ (str/includes? (:message %) (str card-id)))(messages)))(is (= models.dependency/current-dependency-analysis-version(t2/select-one-fn :dependency_analysis_version :model/Card :id card-id)))@@ -247,7 +250,9 @@(testing "on update event"(events/publish-event! :event/card-update {:object card :previous-object card :user-id api/*current-user-id*})(is (some #(and (= "Dependency calculation failed" (ex-message (:e %)))- (= :error (:level %)))+ (= :error (:level %))+ (str/includes? (:message %) "{:entity-type :card")+ (str/includes? (:message %) (str card-id)))(messages)))(is (= models.dependency/current-dependency-analysis-version(t2/select-one-fn :dependency_analysis_version :model/Card :id card-id)))