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
Cleanup `metabase/utils/analytics` (#72981)
Romeo Van Snick3b2fa353a279
diff --git a/.claude/skills/analytics-events/SKILL.md b/.claude/skills/analytics-events/SKILL.mdindex add4f99448f..4d8da9cf290 100644--- a/.claude/skills/analytics-events/SKILL.md+++ b/.claude/skills/analytics-events/SKILL.md@@ -15,7 +15,7 @@ Analytics events in Metabase use Snowplow with typed event schemas. All events m**Key Files:**- `frontend/src/metabase-types/analytics/event.ts` - Event type definitions- `frontend/src/metabase-types/analytics/schema.ts` - Schema registry-- `frontend/src/metabase/utils/analytics.ts` - Core tracking functions+- `frontend/src/metabase/analytics/` - Core tracking functions (import from `metabase/analytics`)- Feature-specific `analytics.ts` files - Tracking function wrappers## Quick Checklist@@ -91,7 +91,7 @@ export type DataStudioEvent =In your feature's `analytics.ts` file (e.g., `enterprise/frontend/src/metabase-enterprise/data-studio/analytics.ts`):```typescript-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackDataStudioTablePickerFiltersApplied = () => {trackSimpleEvent({@@ -471,7 +471,7 @@ Event type definitions (all in one place):frontend/src/metabase-types/analytics/event.tsCore tracking utilities:-frontend/src/metabase/utils/analytics.ts+frontend/src/metabase/analytics/ (import from `metabase/analytics`)```## Real-World Examplesdiff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/analytics.ts b/enterprise/frontend/src/metabase-enterprise/clean_up/analytics.tsindex 7ca37fe6fc5..4e7e6d0b75b 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/analytics.ts+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";export const trackStaleItemsArchived = ({collection_id,diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.tsindex 370604b92d0..c7e11cadc0b 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/tables/analytics.ts@@ -1,5 +1,5 @@+import { trackSimpleEvent } from "metabase/analytics";import type { MetadataEditEventDetail } from "metabase/metadata/pages/shared/analytics";-import { trackSimpleEvent } from "metabase/utils/analytics";export function trackMetadataChange(detail: MetadataEditEventDetail) {trackSimpleEvent({diff --git a/enterprise/frontend/src/metabase-enterprise/google_drive/analytics.ts b/enterprise/frontend/src/metabase-enterprise/google_drive/analytics.tsindex 6bf79e0e5df..c080c88edb2 100644--- a/enterprise/frontend/src/metabase-enterprise/google_drive/analytics.ts+++ b/enterprise/frontend/src/metabase-enterprise/google_drive/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export function trackSheetImportClick() {trackSimpleEvent({diff --git a/enterprise/frontend/src/metabase-enterprise/remote_sync/analytics.ts b/enterprise/frontend/src/metabase-enterprise/remote_sync/analytics.tsindex 21af6f1e155..6e0c572f6e0 100644--- a/enterprise/frontend/src/metabase-enterprise/remote_sync/analytics.ts+++ b/enterprise/frontend/src/metabase-enterprise/remote_sync/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackBranchSwitched = ({triggeredFrom,diff --git a/enterprise/frontend/src/metabase-enterprise/security_center/analytics.ts b/enterprise/frontend/src/metabase-enterprise/security_center/analytics.tsindex e9eba191f91..4579137ac40 100644--- a/enterprise/frontend/src/metabase-enterprise/security_center/analytics.ts+++ b/enterprise/frontend/src/metabase-enterprise/security_center/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackSecurityCenterPageViewed = () => {trackSimpleEvent({diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/analytics.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/analytics.tsindex 2c56c133ccc..7238d3bf2d4 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/admin/analytics.ts+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/admin/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackTableEditingSettingsToggled = (enabled: boolean,diff --git a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/analytics.ts b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/analytics.tsindex bcbf4aa89d5..fc6bbe4d0fe 100644--- a/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/analytics.ts+++ b/enterprise/frontend/src/metabase-enterprise/table-editing/table-edit/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackDataRecordModified = ({event_detail,diff --git a/frontend/lint/eslint-plugin-metabase/rules/no-analytics-import-outside-analytics-files.js b/frontend/lint/eslint-plugin-metabase/rules/no-analytics-import-outside-analytics-files.jsindex 02fc15f29af..dda1b7c0b41 100644--- a/frontend/lint/eslint-plugin-metabase/rules/no-analytics-import-outside-analytics-files.js+++ b/frontend/lint/eslint-plugin-metabase/rules/no-analytics-import-outside-analytics-files.js@@ -1,51 +1,52 @@/**- * @fileoverview Rule to ensure imports from metabase/utils/analytics only occur in files named "analytics.ts/tsx/js/jsx"+ * @fileoverview Rule that restricts `trackSchemaEvent` and `trackSimpleEvent`+ * imports from `metabase/analytics` to files named `analytics.{ts,tsx,js,jsx}`.+ *+ * Every Snowplow event must be wrapped in a feature-local `analytics.ts` so+ * tracking stays auditable and each feature owns the shape of its events.+ * Other exports from the barrel (`createSnowplowTracker`, `trackPageView`) are+ * infrastructure and may be imported anywhere.*/-//-------------------------------------------------------------------------------// Rule Definition-//------------------------------------------------------------------------------+const BARREL = "metabase/analytics";+const FORBIDDEN_SPECIFIERS = new Set(["trackSchemaEvent", "trackSimpleEvent"]);-const ERROR_MESSAGE =- 'Imports from "metabase/utils/analytics" are only allowed in files named "analytics", Please create a type-safe wrapper for the analytics functions in an analytics.ts file, and call that function from your component or module.';+const errorMessage = (name) =>+ `importing \`${name}\` from "${BARREL}" is only allowed in files named "analytics". Please create a type-safe wrapper in an analytics.ts file and call that wrapper from your component or module.`;module.exports = {meta: {type: "problem",docs: {- description:- "Ensure imports from metabase/utils/analytics only occur in analytics files",+ description: `Restrict ${[...FORBIDDEN_SPECIFIERS].join(" and ")} imports from "${BARREL}" to analytics.ts files.`,category: "Best Practices",recommended: true,},schema: [],- messages: {- noAnalyticsImportOutsideAnalyticsFile: ERROR_MESSAGE,- },},create(context) {const filename = context.getFilename();-- // Get the base filename without pathconst baseFilename = filename.split("/").pop() || "";-- // Check if the file is an analytics fileconst isAnalyticsFile = /^analytics\.(ts|tsx|js|jsx)$/.test(baseFilename);+ if (isAnalyticsFile) {+ return {};+ }+return {ImportDeclaration(node) {- const sourceValue = node.source.value;+ if (node.source.value !== BARREL) {+ return;+ }- // Check if importing from metabase/utils/analytics- if (- typeof sourceValue === "string" &&- sourceValue === "metabase/utils/analytics"- ) {- // If not in an analytics file, report an error- if (!isAnalyticsFile) {+ for (const specifier of node.specifiers) {+ if (+ specifier.type === "ImportSpecifier" &&+ FORBIDDEN_SPECIFIERS.has(specifier.imported.name)+ ) {context.report({- node,- message: ERROR_MESSAGE,+ node: specifier,+ message: errorMessage(specifier.imported.name),});}}diff --git a/frontend/lint/module-boundaries.mjs b/frontend/lint/module-boundaries.mjsindex 6ad9111ce97..cb9e100c0a1 100644--- a/frontend/lint/module-boundaries.mjs+++ b/frontend/lint/module-boundaries.mjs@@ -25,6 +25,7 @@ const elements = [mode: "full",}),createElement({ type: "lib", name: "utils" }),+ createElement({ type: "lib", name: "analytics", enforceOutgoing: true }),createElement({ type: "lib", name: "css", enforceOutgoing: true }),createElement({type: "lib",diff --git a/frontend/lint/tests/no-analytics-import-outside-analytics-files.unit.spec.js b/frontend/lint/tests/no-analytics-import-outside-analytics-files.unit.spec.jsindex 55a75d3ee11..21bb9661045 100644--- a/frontend/lint/tests/no-analytics-import-outside-analytics-files.unit.spec.js+++ b/frontend/lint/tests/no-analytics-import-outside-analytics-files.unit.spec.js@@ -10,27 +10,40 @@ const ruleTester = new RuleTester({},});+const errorMessage = /is only allowed in files named "analytics"/;+const VALID_CASES = [+ // Non-restricted specifiers may be imported from the barrel anywhere.+ {+ code: `import { createSnowplowTracker } from "metabase/analytics";`,+ filename: "/path/to/app.js",+ },{- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,+ code: `import { trackPageView } from "metabase/analytics";`,+ filename: "/path/to/routes.jsx",+ },+ // Restricted specifiers are fine in analytics.* files.+ {+ code: `import { trackSchemaEvent } from "metabase/analytics";`,filename: "/path/to/analytics.ts",},{- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,+ code: `import { trackSimpleEvent } from "metabase/analytics";`,filename: "/path/to/analytics.tsx",},{- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,- filename: "/path/to/analytics.js",+ code: `import { trackSchemaEvent, trackSimpleEvent } from "metabase/analytics";`,+ filename: "frontend/src/metabase/dashboard/analytics.ts",},{- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,- filename: "/path/to/analytics.jsx",+ code: `import { trackSchemaEvent } from "metabase/analytics";`,+ filename: "/path/to/analytics.js",},{- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,- filename: "frontend/src/metabase/dashboard/analytics.ts",+ code: `import { trackSchemaEvent } from "metabase/analytics";`,+ filename: "/path/to/analytics.jsx",},+ // Imports of other modules are unaffected.{code: `import { someOtherFunction } from "metabase/utils/other";`,filename: "/path/to/Component.tsx",@@ -41,64 +54,56 @@ const VALID_CASES = [},];-const errorMessage = /are only allowed in files named "analytics"/;-const INVALID_CASES = [{- name: "Detect import in non-analytics .tsx file",- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,+ name: "trackSchemaEvent in component",+ code: `import { trackSchemaEvent } from "metabase/analytics";`,filename: "/path/to/Component.tsx",- error: errorMessage,+ errors: [{ message: errorMessage }],},{- name: "Detect import in non-analytics .ts file",- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,- filename: "/path/to/utils.ts",- error: errorMessage,+ name: "trackSimpleEvent in component",+ code: `import { trackSimpleEvent } from "metabase/analytics";`,+ filename: "/path/to/Component.tsx",+ errors: [{ message: errorMessage }],},{- name: "Detect type import in non-analytics .ts file",- code: `import type { SchemaType } from "metabase/utils/analytics";`,+ name: "trackSchemaEvent in utils.ts",+ code: `import { trackSchemaEvent } from "metabase/analytics";`,filename: "/path/to/utils.ts",- error: errorMessage,+ errors: [{ message: errorMessage }],},{- name: "Detect import in non-analytics .js file",- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,+ name: "trackSchemaEvent in helper.js",+ code: `import { trackSchemaEvent } from "metabase/analytics";`,filename: "/path/to/helper.js",- error: errorMessage,+ errors: [{ message: errorMessage }],},{- name: "Detect import in non-analytics .jsx file",- code: `import { trackSchemaEvent } from "metabase/utils/analytics";`,+ name: "trackSchemaEvent in Component.jsx",+ code: `import { trackSchemaEvent } from "metabase/analytics";`,filename: "/path/to/Component.jsx",- error: errorMessage,+ errors: [{ message: errorMessage }],},{- name: "Detect multiple imports from analytics",- code: `import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";`,+ name: "multiple restricted specifiers flagged individually",+ code: `import { trackSchemaEvent, trackSimpleEvent } from "metabase/analytics";`,filename: "/path/to/DashCard.tsx",- error: errorMessage,+ errors: [{ message: errorMessage }, { message: errorMessage }],},{- name: "Detect default import from analytics",- code: `import analytics from "metabase/utils/analytics";`,+ name: "allowed + restricted mixed — only restricted flagged",+ code: `import { createSnowplowTracker, trackSchemaEvent } from "metabase/analytics";`,filename: "/path/to/Component.tsx",- error: errorMessage,+ errors: [{ message: errorMessage }],},];ruleTester.run("no-analytics-import-outside-analytics-files", rule, {valid: VALID_CASES,- invalid: INVALID_CASES.map((invalidCase) => {- return {- code: invalidCase.code,- filename: invalidCase.filename,- errors: [- {- message: invalidCase.error,- },- ],- };- }),+ invalid: INVALID_CASES.map(({ code, filename, errors }) => ({+ code,+ filename,+ errors,+ })),});diff --git a/frontend/src/metabase/admin/databases/containers/analytics.ts b/frontend/src/metabase/admin/databases/containers/analytics.tsindex 6dcf3268c42..556660ef715 100644--- a/frontend/src/metabase/admin/databases/containers/analytics.ts+++ b/frontend/src/metabase/admin/databases/containers/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackHelpButtonClick = () => {trackSimpleEvent({diff --git a/frontend/src/metabase/admin/settings/analytics.ts b/frontend/src/metabase/admin/settings/analytics.tsindex 403665c8cc6..6540b82c1a3 100644--- a/frontend/src/metabase/admin/settings/analytics.ts+++ b/frontend/src/metabase/admin/settings/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";export const trackTrackingPermissionChanged = (isEnabled: boolean) => {trackSchemaEvent("settings", {diff --git a/frontend/src/metabase/admin/settings/components/Email/analytics.ts b/frontend/src/metabase/admin/settings/components/Email/analytics.tsindex 3f02ceafff7..30e6906d37f 100644--- a/frontend/src/metabase/admin/settings/components/Email/analytics.ts+++ b/frontend/src/metabase/admin/settings/components/Email/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";type SMTPSetupEventDetail = "self-hosted" | "cloud";diff --git a/frontend/src/metabase/analytics.ts b/frontend/src/metabase/analytics.tsdeleted file mode 100644index 2c1161e7a5d..00000000000--- a/frontend/src/metabase/analytics.ts+++ /dev/null@@ -1 +0,0 @@-export { createTracker, trackPageView } from "metabase/utils/analytics";diff --git a/frontend/src/metabase/utils/analytics.ts b/frontend/src/metabase/analytics/event.tssimilarity index 97%rename from frontend/src/metabase/utils/analytics.tsrename to frontend/src/metabase/analytics/event.tsindex 30e230f960f..439f8aefd24 100644--- a/frontend/src/metabase/utils/analytics.ts+++ b/frontend/src/metabase/analytics/event.ts@@ -5,8 +5,6 @@ import Settings from "metabase/utils/settings";import type { SchemaEventMap, SchemaType } from "metabase-types/analytics";import type { SimpleEventSchema } from "metabase-types/analytics/event";-export * from "./analytics-untyped";-type SchemaVersion = `${number}-${number}-${number}`;const VERSIONS: Record<SchemaType, SchemaVersion> = {diff --git a/frontend/src/metabase/analytics/index.ts b/frontend/src/metabase/analytics/index.tsnew file mode 100644index 00000000000..dbdccbd59ee--- /dev/null+++ b/frontend/src/metabase/analytics/index.ts@@ -0,0 +1,3 @@+export { createSnowplowTracker } from "./snowplow";+export { trackPageView } from "./page-view";+export { trackSchemaEvent, trackSimpleEvent } from "./event";diff --git a/frontend/src/metabase/analytics/page-view.ts b/frontend/src/metabase/analytics/page-view.tsnew file mode 100644index 00000000000..bc0a50d8ef2--- /dev/null+++ b/frontend/src/metabase/analytics/page-view.ts@@ -0,0 +1,20 @@+import * as Snowplow from "@snowplow/browser-tracker";++import Settings from "metabase/utils/settings";++export const trackPageView = (url: string): void => {+ if (!url || !Settings.trackingEnabled() || !Settings.snowplowEnabled()) {+ return;+ }++ Snowplow.setReferrerUrl("#");+ Snowplow.setCustomUrl(getSanitizedUrl(url));+ Snowplow.trackPageView();+};++const getSanitizedUrl = (url: string): string => {+ const urlWithoutSlug = url.replace(/(\/\d+)-[^/]+$/, (_match, path) => path);+ const urlWithoutHost = new URL(urlWithoutSlug, Settings.snowplowUrl() ?? "");++ return urlWithoutHost.href;+};diff --git a/frontend/src/metabase/utils/analytics-untyped.ts b/frontend/src/metabase/analytics/snowplow.tssimilarity index 50%rename from frontend/src/metabase/utils/analytics-untyped.tsrename to frontend/src/metabase/analytics/snowplow.tsindex 8e3f6b19826..56782add5b5 100644--- a/frontend/src/metabase/utils/analytics-untyped.ts+++ b/frontend/src/metabase/analytics/snowplow.ts@@ -1,30 +1,30 @@-import type { EnhancedStore } from "@reduxjs/toolkit";import * as Snowplow from "@snowplow/browser-tracker";-import type { State } from "metabase/redux/store";-import { getUserId } from "metabase/selectors/user";import Settings from "metabase/utils/settings";-export const trackPageView = (url: string): void => {- if (!url || !Settings.trackingEnabled()) {- return;- }+type GetUserId = () => number | undefined;- if (Settings.snowplowEnabled()) {- trackSnowplowPageView(getSanitizedUrl(url));+export const createSnowplowTracker = (getUserId: GetUserId): void => {+ if (!Settings.snowplowEnabled()) {+ return;}-};-export const createTracker = (store: EnhancedStore<State>): void => {- if (Settings.snowplowEnabled()) {- createSnowplowTracker(store);- }+ Snowplow.newTracker("sp", Settings.snowplowUrl() ?? "", {+ appId: "metabase",+ platform: "web",+ eventMethod: "post",+ discoverRootDomain: true,+ contexts: { webPage: true },+ anonymousTracking: { withServerAnonymisation: true },+ stateStorageStrategy: "none",+ plugins: [createSnowplowPlugin(getUserId)],+ });};-const createSnowplowPlugin = (store: EnhancedStore<State>) => {+const createSnowplowPlugin = (getUserId: GetUserId) => {return {beforeTrack: () => {- const userId = getUserId(store.getState());+ const userId = getUserId();if (userId) {Snowplow.setUserId(String(userId));}@@ -51,29 +51,3 @@ const createSnowplowPlugin = (store: EnhancedStore<State>) => {},};};--const createSnowplowTracker = (store: EnhancedStore<State>): void => {- Snowplow.newTracker("sp", Settings.snowplowUrl() ?? "", {- appId: "metabase",- platform: "web",- eventMethod: "post",- discoverRootDomain: true,- contexts: { webPage: true },- anonymousTracking: { withServerAnonymisation: true },- stateStorageStrategy: "none",- plugins: [createSnowplowPlugin(store)],- });-};--const trackSnowplowPageView = (url: string): void => {- Snowplow.setReferrerUrl("#");- Snowplow.setCustomUrl(url);- Snowplow.trackPageView();-};--const getSanitizedUrl = (url: string): string => {- const urlWithoutSlug = url.replace(/(\/\d+)-[^/]+$/, (match, path) => path);- const urlWithoutHost = new URL(urlWithoutSlug, Settings.snowplowUrl() ?? "");-- return urlWithoutHost.href;-};diff --git a/frontend/src/metabase/api/analytics.ts b/frontend/src/metabase/api/analytics.tsindex 2552e31907b..b0c84604e4f 100644--- a/frontend/src/metabase/api/analytics.ts+++ b/frontend/src/metabase/api/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";import { openSaveDialog } from "metabase/utils/dom";import { hashSearchTerm, shouldReportSearchTerm } from "metabase/utils/search";import type { SearchRequest, SearchResponse } from "metabase-types/api";diff --git a/frontend/src/metabase/app.js b/frontend/src/metabase/app.jsindex d89c0c8398e..7713db0c692 100644--- a/frontend/src/metabase/app.js+++ b/frontend/src/metabase/app.js@@ -31,12 +31,14 @@ import { syncHistoryWithStore } from "react-router-redux";import { initializePlugins } from "ee-plugins";import { AppThemeProvider } from "metabase/AppThemeProvider";+import { createSnowplowTracker } from "metabase/analytics";import { ModifiedBackend } from "metabase/common/components/dnd/ModifiedBackend";import registerDashboardVisualizations from "metabase/dashboard/visualizations/register";import { initializeInteractiveEmbedding } from "metabase/embedding/interactive-embedding";import { MetabotProvider } from "metabase/metabot/context";import { PLUGIN_APP_INIT_FUNCTIONS } from "metabase/plugins";import { refreshSiteSettings } from "metabase/redux/settings";+import { getUserId } from "metabase/selectors/user";import { GlobalStyles } from "metabase/styled-components/containers/GlobalStyles";import { EmotionCacheProvider } from "metabase/ui/components/theme/EmotionCacheProvider";import api from "metabase/utils/api";@@ -46,7 +48,6 @@ import { MetabaseReduxProvider } from "metabase/utils/redux/custom-context";import MetabaseSettings from "metabase/utils/settings";import registerVisualizations from "metabase/visualizations/register";-import { createTracker } from "./analytics";import { HistoryProvider } from "./history";import { RouterProvider } from "./router";import { getStore } from "./store";@@ -68,7 +69,7 @@ function _init(reducers, getRoutes, callback) {const routes = getRoutes(store);const syncedHistory = syncHistoryWithStore(browserHistory, store);- createTracker(store);+ createSnowplowTracker(() => getUserId(store.getState()));// Initialize distributed tracing if enabled via MB_TRACING_ENABLED.// Uses bootstrap data so it's available before the first API call.diff --git a/frontend/src/metabase/archive/analytics.ts b/frontend/src/metabase/archive/analytics.tsindex 05708163ac9..43c7484b865 100644--- a/frontend/src/metabase/archive/analytics.ts+++ b/frontend/src/metabase/archive/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";type MoveToTrashEventDetail =| "question"diff --git a/frontend/src/metabase/browse/databases/analytics.ts b/frontend/src/metabase/browse/databases/analytics.tsindex e49d5d5a6df..21232586a81 100644--- a/frontend/src/metabase/browse/databases/analytics.ts+++ b/frontend/src/metabase/browse/databases/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackAddDatabaseDBList = () => {trackSimpleEvent({diff --git a/frontend/src/metabase/browse/metrics/analytics.ts b/frontend/src/metabase/browse/metrics/analytics.tsindex ac98d2980a2..bd93145ebc6 100644--- a/frontend/src/metabase/browse/metrics/analytics.ts+++ b/frontend/src/metabase/browse/metrics/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackNewMetricInitiated = () =>trackSimpleEvent({diff --git a/frontend/src/metabase/browse/models/analytics.ts b/frontend/src/metabase/browse/models/analytics.tsindex 6edbbe09cac..881d78c96c4 100644--- a/frontend/src/metabase/browse/models/analytics.ts+++ b/frontend/src/metabase/browse/models/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";+import { trackSchemaEvent, trackSimpleEvent } from "metabase/analytics";import type { CardId } from "metabase-types/api";export const trackModelClick = (modelId: CardId) =>diff --git a/frontend/src/metabase/browse/tables/analytics.ts b/frontend/src/metabase/browse/tables/analytics.tsindex ceab3b72cd2..8858303410f 100644--- a/frontend/src/metabase/browse/tables/analytics.ts+++ b/frontend/src/metabase/browse/tables/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";+import { trackSchemaEvent, trackSimpleEvent } from "metabase/analytics";import type { ConcreteTableId } from "metabase-types/api";export const trackTableClick = (tableId: ConcreteTableId) =>diff --git a/frontend/src/metabase/collections/analytics.ts b/frontend/src/metabase/collections/analytics.tsindex 141ca22258f..4dca245f2be 100644--- a/frontend/src/metabase/collections/analytics.ts+++ b/frontend/src/metabase/collections/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { CollectionItem } from "metabase-types/api/collection";export const trackDataReferenceClicked = () => {diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/analytics.ts b/frontend/src/metabase/collections/components/CollectionEmptyState/analytics.tsindex 9f5706018d3..08dd62f65c6 100644--- a/frontend/src/metabase/collections/components/CollectionEmptyState/analytics.ts+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackCollectionNewButtonClicked = () =>trackSimpleEvent({diff --git a/frontend/src/metabase/collections/components/CollectionHeader/analytics.ts b/frontend/src/metabase/collections/components/CollectionHeader/analytics.tsindex b551326cc5f..a2133bd6024 100644--- a/frontend/src/metabase/collections/components/CollectionHeader/analytics.ts+++ b/frontend/src/metabase/collections/components/CollectionHeader/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackNewCollectionFromHeaderInitiated = () =>trackSimpleEvent({diff --git a/frontend/src/metabase/common/components/ErrorPages/analytics.ts b/frontend/src/metabase/common/components/ErrorPages/analytics.tsindex ee7ee2a5d76..cb02d32c39a 100644--- a/frontend/src/metabase/common/components/ErrorPages/analytics.ts+++ b/frontend/src/metabase/common/components/ErrorPages/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackErrorDiagnosticModalOpened = (triggeredFrom: "profile-menu" | "command-palette",diff --git a/frontend/src/metabase/common/components/NewItemMenu/analytics.ts b/frontend/src/metabase/common/components/NewItemMenu/analytics.tsindex 42d10dfa0e4..6aa787cbca0 100644--- a/frontend/src/metabase/common/components/NewItemMenu/analytics.ts+++ b/frontend/src/metabase/common/components/NewItemMenu/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackNewMenuItemClicked = (item: "question" | "native-query" | "dashboard",diff --git a/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts b/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.tsindex 881e677762f..8af54729bbc 100644--- a/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts+++ b/frontend/src/metabase/common/components/RevisionHistoryTimeline/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackVersionRevertClicked = (entity: "card" | "dashboard" | "document" | "transform",diff --git a/frontend/src/metabase/common/components/upsells/components/analytics.ts b/frontend/src/metabase/common/components/upsells/components/analytics.tsindex 67cd969edd1..091d234b2a3 100644--- a/frontend/src/metabase/common/components/upsells/components/analytics.ts+++ b/frontend/src/metabase/common/components/upsells/components/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";type UpsellEventProps = {location: string;diff --git a/frontend/src/metabase/dashboard/analytics.ts b/frontend/src/metabase/dashboard/analytics.tsindex 6a992f83f31..efc7d7180db 100644--- a/frontend/src/metabase/dashboard/analytics.ts+++ b/frontend/src/metabase/dashboard/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";+import { trackSchemaEvent, trackSimpleEvent } from "metabase/analytics";import type {DashboardId,DashboardWidth,diff --git a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/analytics.ts b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/analytics.tsindex b305b7331c2..9d2889c58c5 100644--- a/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/analytics.ts+++ b/frontend/src/metabase/dashboard/components/DashCard/DashCardActionsPanel/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackVisualizeAnotherWayClicked = () =>trackSimpleEvent({diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/analytics.ts b/frontend/src/metabase/dashboard/components/QuestionPicker/analytics.tsindex 48851720a5a..89c53e3b594 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/analytics.ts+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackVisualizeAnotherWayClicked = () =>trackSimpleEvent({diff --git a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/analytics.ts b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/analytics.tsindex b2f6752de2c..df2feeb2734 100644--- a/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/analytics.ts+++ b/frontend/src/metabase/dashboard/containers/AutomaticDashboardApp/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { RelatedDashboardXRays } from "metabase-types/api";export const trackSuggestedXRayClicked = (diff --git a/frontend/src/metabase/data-studio/analytics.ts b/frontend/src/metabase/data-studio/analytics.tsindex d801a06633c..68e5eb2ec1e 100644--- a/frontend/src/metabase/data-studio/analytics.ts+++ b/frontend/src/metabase/data-studio/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { CollectionId, ConcreteTableId } from "metabase-types/api";export const trackDataStudioLibraryCreated = (id: CollectionId) => {diff --git a/frontend/src/metabase/data-studio/data-model/analytics.ts b/frontend/src/metabase/data-studio/data-model/analytics.tsindex 370604b92d0..c7e11cadc0b 100644--- a/frontend/src/metabase/data-studio/data-model/analytics.ts+++ b/frontend/src/metabase/data-studio/data-model/analytics.ts@@ -1,5 +1,5 @@+import { trackSimpleEvent } from "metabase/analytics";import type { MetadataEditEventDetail } from "metabase/metadata/pages/shared/analytics";-import { trackSimpleEvent } from "metabase/utils/analytics";export function trackMetadataChange(detail: MetadataEditEventDetail) {trackSimpleEvent({diff --git a/frontend/src/metabase/databases/components/DatabaseConnectionUri/analytics.ts b/frontend/src/metabase/databases/components/DatabaseConnectionUri/analytics.tsindex a52636b784e..ca655b9e62e 100644--- a/frontend/src/metabase/databases/components/DatabaseConnectionUri/analytics.ts+++ b/frontend/src/metabase/databases/components/DatabaseConnectionUri/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { FormLocation } from "../../types";diff --git a/frontend/src/metabase/documents/analytics.ts b/frontend/src/metabase/documents/analytics.tsindex 97593cc0026..6329940ccf5 100644--- a/frontend/src/metabase/documents/analytics.ts+++ b/frontend/src/metabase/documents/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { Document } from "metabase-types/api";export const trackDocumentCreated = (document: Document) => {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.tsindex ef9a060ad78..47952748f54 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk-setup/analytics.ts@@ -1,5 +1,6 @@import _ from "underscore";+import { trackSimpleEvent } from "metabase/analytics";import type {SdkIframeEmbedSettingKey,SdkIframeEmbedSettings,@@ -9,7 +10,6 @@ import { getAuthTypeForSettings } from "metabase/embedding/embedding-iframe-sdk-import { countEmbeddingParameterOptions } from "metabase/embedding/lib/count-embedding-parameter-options";import type { SdkIframeEmbedSetupModalInitialState } from "metabase/plugins";import type { EmbeddingParameters } from "metabase/public/lib/types";-import { trackSimpleEvent } from "metabase/utils/analytics";import type { Card, Dashboard } from "metabase-types/api";import type {diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsxindex 5a7d30be008..301fda6baef 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/components/SdkIframeEmbedRoute.tsx@@ -19,12 +19,13 @@ import type { MetabaseAuthConfig } from "embedding-sdk-bundle/types/auth-config"import type { SdkDashboardEntityPublicProps } from "embedding-sdk-bundle/types/dashboard";import type { SdkQuestionEntityPublicProps } from "embedding-sdk-bundle/types/question";import { applyThemePreset } from "embedding-sdk-shared/lib/apply-theme-preset";+import { createSnowplowTracker } from "metabase/analytics";import { EmbeddingFooter } from "metabase/embedding/components/EmbeddingFooter/EmbeddingFooter";import { EMBEDDING_SDK_IFRAME_EMBEDDING_CONFIG } from "metabase/embedding-sdk/config";import { PLUGIN_EMBEDDING_IFRAME_SDK } from "metabase/plugins";import { getSetting } from "metabase/selectors/settings";+import { getUserId } from "metabase/selectors/user";import { Stack } from "metabase/ui";-import { createTracker } from "metabase/utils/analytics-untyped";import { useSelector } from "metabase/utils/redux";import { useParamRerenderKey } from "../hooks/use-param-rerender-key";@@ -47,7 +48,7 @@ const onSettingsChanged = (settings: SdkIframeEmbedSettings) => {};const store = getSdkStore();-createTracker(store);+createSnowplowTracker(() => getUserId(store.getState()));export const SdkIframeEmbedRoute = () => {const { embedSettings } = useSdkIframeEmbedEventBus({diff --git a/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/analytics.ts b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/analytics.tsindex 18335087cef..9d3d71dfdf2 100644--- a/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/analytics.ts+++ b/frontend/src/metabase/embedding/embedding-iframe-sdk/hooks/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";import type { EmbeddedAnalyticsJsEventSchema } from "metabase-types/analytics/embedded-analytics-js";export const trackEmbeddedAnalyticsJs = (diff --git a/frontend/src/metabase/home/components/EmbedHomepage/analytics.ts b/frontend/src/metabase/home/components/EmbedHomepage/analytics.tsindex f1605a6772b..546305d911a 100644--- a/frontend/src/metabase/home/components/EmbedHomepage/analytics.ts+++ b/frontend/src/metabase/home/components/EmbedHomepage/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";import type { EmbeddingHomepageDismissReason } from "metabase-types/api";const SCHEMA_NAME = "embedding_homepage";diff --git a/frontend/src/metabase/home/components/HomeXrayCard/analytics.ts b/frontend/src/metabase/home/components/HomeXrayCard/analytics.tsindex d70237da255..0870576312f 100644--- a/frontend/src/metabase/home/components/HomeXrayCard/analytics.ts+++ b/frontend/src/metabase/home/components/HomeXrayCard/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackHomeXRayClicked = () => {trackSimpleEvent({diff --git a/frontend/src/metabase/home/components/Onboarding/analytics.ts b/frontend/src/metabase/home/components/Onboarding/analytics.tsindex e06d1d2f36c..34ca9d3a1c0 100644--- a/frontend/src/metabase/home/components/Onboarding/analytics.ts+++ b/frontend/src/metabase/home/components/Onboarding/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { ChecklistItemCTA, ChecklistItemValue } from "./types";diff --git a/frontend/src/metabase/metabot/analytics.ts b/frontend/src/metabase/metabot/analytics.tsindex 7d922c14244..27e97446ef7 100644--- a/frontend/src/metabase/metabot/analytics.ts+++ b/frontend/src/metabase/metabot/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackMetabotChatOpened = (origin: "header" | "command_palette" | "keyboard_shortcut" | "native_editor",diff --git a/frontend/src/metabase/metadata/pages/shared/analytics.ts b/frontend/src/metabase/metadata/pages/shared/analytics.tsindex 09cceb02b8f..efefb545c7e 100644--- a/frontend/src/metabase/metadata/pages/shared/analytics.ts+++ b/frontend/src/metabase/metadata/pages/shared/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export type MetadataEditEventDetail =| "type_casting"diff --git a/frontend/src/metabase/metrics-viewer/analytics.ts b/frontend/src/metabase/metrics-viewer/analytics.tsindex 81953f1d3f3..b8ef4655dbe 100644--- a/frontend/src/metabase/metrics-viewer/analytics.ts+++ b/frontend/src/metabase/metrics-viewer/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackMetricsViewerMetricAdded = (targetId: number | null,diff --git a/frontend/src/metabase/nav/components/NewItemButton/analytics.ts b/frontend/src/metabase/nav/components/NewItemButton/analytics.tsindex 81d890b6364..91f25e6887c 100644--- a/frontend/src/metabase/nav/components/NewItemButton/analytics.ts+++ b/frontend/src/metabase/nav/components/NewItemButton/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackAppNewButtonClicked = () =>trackSimpleEvent({diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/analytics.ts b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/analytics.tsindex ccb924b3eed..af2ea91afb0 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/analytics.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { Engine } from "metabase-types/api";export const trackAddDataEvent = (event: "csv_tab_clicked" | "sheets_tab_clicked" | "database_tab_clicked",diff --git a/frontend/src/metabase/nav/containers/MainNavbar/analytics.ts b/frontend/src/metabase/nav/containers/MainNavbar/analytics.tsindex 5c3c1f0477e..bef9f89703a 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/analytics.ts+++ b/frontend/src/metabase/nav/containers/MainNavbar/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackOnboardingChecklistOpened = () => {trackSimpleEvent({diff --git a/frontend/src/metabase/palette/hooks/analytics.ts b/frontend/src/metabase/palette/hooks/analytics.tsindex 8b968544307..7cb4508f5e5 100644--- a/frontend/src/metabase/palette/hooks/analytics.ts+++ b/frontend/src/metabase/palette/hooks/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { KeyboardShortcutId } from "../shortcuts";diff --git a/frontend/src/metabase/public/lib/analytics.ts b/frontend/src/metabase/public/lib/analytics.tsindex 60089a1b5a6..c99eaf94875 100644--- a/frontend/src/metabase/public/lib/analytics.ts+++ b/frontend/src/metabase/public/lib/analytics.ts@@ -1,5 +1,5 @@+import { trackSchemaEvent } from "metabase/analytics";import type { ExportFormat } from "metabase/common/types/export";-import { trackSchemaEvent } from "metabase/utils/analytics";import type {DisplayTheme,diff --git a/frontend/src/metabase/query_builder/analytics.js b/frontend/src/metabase/query_builder/analytics.jsindex f3d95afb548..6020fc02e38 100644--- a/frontend/src/metabase/query_builder/analytics.js+++ b/frontend/src/metabase/query_builder/analytics.js@@ -1,4 +1,4 @@-import { trackSchemaEvent, trackSimpleEvent } from "metabase/utils/analytics";+import { trackSchemaEvent, trackSimpleEvent } from "metabase/analytics";export const trackNewQuestionSaved = (draftQuestion,diff --git a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/analytics.ts b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/analytics.tsindex 4839f94b61f..94cda74b64c 100644--- a/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/analytics.ts+++ b/frontend/src/metabase/query_builder/components/view/QuestionTimelineWidget/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackEventsClicked = () =>trackSimpleEvent({diff --git a/frontend/src/metabase/querying/analytics.ts b/frontend/src/metabase/querying/analytics.tsindex 92a8e9097a0..dfb06d26691 100644--- a/frontend/src/metabase/querying/analytics.ts+++ b/frontend/src/metabase/querying/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";import * as Lib from "metabase-lib";import type Question from "metabase-lib/v1/Question";diff --git a/frontend/src/metabase/redux/analytics.ts b/frontend/src/metabase/redux/analytics.tsindex 61f6f5afd49..8760238ea19 100644--- a/frontend/src/metabase/redux/analytics.ts+++ b/frontend/src/metabase/redux/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";import type { ResourceAccessedVia, ResourceType } from "./downloads";diff --git a/frontend/src/metabase/reference/analytics.ts b/frontend/src/metabase/reference/analytics.tsindex 540e8952b1a..b267d3720ae 100644--- a/frontend/src/metabase/reference/analytics.ts+++ b/frontend/src/metabase/reference/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackReferenceXRayClicked = (source: "table" | "field" | "segment",diff --git a/frontend/src/metabase/search/analytics.ts b/frontend/src/metabase/search/analytics.tsindex c935dcd2ceb..524a942c13a 100644--- a/frontend/src/metabase/search/analytics.ts+++ b/frontend/src/metabase/search/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";import { hashSearchTerm, shouldReportSearchTerm } from "metabase/utils/search";import type { SearchRequest } from "metabase-types/api";diff --git a/frontend/src/metabase/setup/analytics.ts b/frontend/src/metabase/setup/analytics.tsindex 55e1462d15c..80eb82617fc 100644--- a/frontend/src/metabase/setup/analytics.ts+++ b/frontend/src/metabase/setup/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";import type { SetupVersion } from "metabase-types/analytics/setup";import type { UsageReason } from "metabase-types/api";diff --git a/frontend/src/metabase/setup/components/CompletedStep/analytics.ts b/frontend/src/metabase/setup/components/CompletedStep/analytics.tsindex 1409698347e..5f6f6f56d89 100644--- a/frontend/src/metabase/setup/components/CompletedStep/analytics.ts+++ b/frontend/src/metabase/setup/components/CompletedStep/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";export const trackNewsletterToggleClicked = (optedIn: boolean) =>trackSimpleEvent({diff --git a/frontend/src/metabase/transforms/analytics.ts b/frontend/src/metabase/transforms/analytics.tsindex ae421c2f0b8..9137cf7386a 100644--- a/frontend/src/metabase/transforms/analytics.ts+++ b/frontend/src/metabase/transforms/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type {InspectorCardId,InspectorLensId,diff --git a/frontend/src/metabase/visualizations/analytics.ts b/frontend/src/metabase/visualizations/analytics.tsindex 512349c381e..1afe49c374c 100644--- a/frontend/src/metabase/visualizations/analytics.ts+++ b/frontend/src/metabase/visualizations/analytics.ts@@ -1,6 +1,6 @@import { match } from "ts-pattern";-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";import type { RegularClickAction } from "./types";diff --git a/frontend/src/metabase/visualizations/lib/settings/analytics.ts b/frontend/src/metabase/visualizations/lib/settings/analytics.tsindex d47f7acf1d7..b2e0364962d 100644--- a/frontend/src/metabase/visualizations/lib/settings/analytics.ts+++ b/frontend/src/metabase/visualizations/lib/settings/analytics.ts@@ -1,4 +1,4 @@-import { trackSchemaEvent } from "metabase/utils/analytics";+import { trackSchemaEvent } from "metabase/analytics";import type { DashboardId } from "metabase-types/api";export const trackCardSetToHideWhenNoResults = (dashboardId: DashboardId) => {diff --git a/frontend/src/metabase/visualizer/components/analytics.ts b/frontend/src/metabase/visualizer/components/analytics.tsindex cd09ca01504..5e9741469f3 100644--- a/frontend/src/metabase/visualizer/components/analytics.ts+++ b/frontend/src/metabase/visualizer/components/analytics.ts@@ -1,4 +1,4 @@-import { trackSimpleEvent } from "metabase/utils/analytics";+import { trackSimpleEvent } from "metabase/analytics";type VisualizerDataChangedDetail =| "visualizer_viz_type_changed"diff --git a/frontend/test/__support__/mocks.js b/frontend/test/__support__/mocks.jsindex d72e10399df..b6eec019099 100644--- a/frontend/test/__support__/mocks.js+++ b/frontend/test/__support__/mocks.js@@ -26,7 +26,7 @@ global.window.ResizeObserver = class ResizeObserver {disconnect() {}};-jest.mock("metabase/utils/analytics");+jest.mock("metabase/analytics");jest.mock("@uiw/react-codemirror", () => {const { forwardRef } = jest.requireActual("react");