ref(analytics): covert more saved query analytics (#46424)

static/app/utils/analytics/discoverAnalyticsEvents.tsx

@@ -8,6 +8,9 @@ type SaveQueryParams = {
 };
 
 export type SaveQueryEventParameters = {
+  'discover_v2.delete_query_failed': SaveQueryParams & {error: string};
+  'discover_v2.delete_query_request': SaveQueryParams;
+  'discover_v2.delete_query_success': SaveQueryParams;
   'discover_v2.save_existing_query_failed': SaveQueryParams & {error: string};
   'discover_v2.save_existing_query_request': SaveQueryParams;
   'discover_v2.save_existing_query_success': SaveQueryParams;
@@ -15,6 +18,8 @@ export type SaveQueryEventParameters = {
   'discover_v2.save_new_query_request': SaveQueryParams;
   'discover_v2.save_new_query_success': SaveQueryParams;
   'discover_v2.update_query_failed': SaveQueryParams & {error: string};
+  'discover_v2.update_query_name_request': SaveQueryParams;
+  'discover_v2.update_query_name_successs': SaveQueryParams;
   'discover_v2.update_query_request': SaveQueryParams;
   'discover_v2.update_query_success': SaveQueryParams;
 };
@@ -23,6 +28,7 @@ export type DiscoverEventParameters = SaveQueryEventParameters & {
   'discover_v2.add_equation': {};
   'discover_v2.build_new_query': {};
   'discover_v2.change_sort': {sort: string};
+  'discover_v2.create_alert_clicked': {status: string};
   'discover_v2.facet_map.clicked': {tag: string};
   'discover_v2.prebuilt_query_click': {query_name?: string};
   'discover_v2.processed_baseline_toggle.clicked': {toggled: string};
@@ -91,4 +97,12 @@ export const discoverEventMap: Record<DiscoverEventKey, string | null> = {
   'discover_v2.update_query_request': 'Discoverv2: Request to update a saved query',
   'discover_v2.update_query_success': 'Discoverv2: Successfully updated a saved query',
   'discover_v2.quick_context_update_query': 'Discoverv2: Update query from Quick Context',
+  'discover_v2.update_query_name_request':
+    "Discoverv2: Request to update a saved query's name",
+  'discover_v2.update_query_name_successs':
+    "Discoverv2: Successfully updated a saved query's name",
+  'discover_v2.delete_query_success': 'Discoverv2: Successfully deleted a saved query',
+  'discover_v2.delete_query_failed': 'Discoverv2: Failed to delete a saved query',
+  'discover_v2.delete_query_request': 'Discoverv2: Request to delete a saved query',
+  'discover_v2.create_alert_clicked': 'Discoverv2: Create alert clicked',
 };

static/app/views/discover/savedQuery/index.tsx

@@ -23,7 +23,6 @@ import {IconBookmark, IconDelete, IconEllipsis, IconStar} from 'sentry/icons';
 import {t} from 'sentry/locale';
 import {space} from 'sentry/styles/space';
 import {Organization, Project, SavedQuery} from 'sentry/types';
-import {trackAnalyticsEvent} from 'sentry/utils/analytics';
 import trackAdvancedAnalyticsEvent from 'sentry/utils/analytics/trackAdvancedAnalyticsEvent';
 import EventView from 'sentry/utils/discover/eventView';
 import {getDiscoverQueriesUrl} from 'sentry/utils/discover/urls';
@@ -301,12 +300,9 @@ class SavedQueryButtonGroup extends PureComponent<Props, State> {
 
   handleCreateAlertSuccess = () => {
     const {organization} = this.props;
-    trackAnalyticsEvent({
-      eventKey: 'discover_v2.create_alert_clicked',
-      eventName: 'Discoverv2: Create alert clicked',
+    trackAdvancedAnalyticsEvent('discover_v2.create_alert_clicked', {
+      organization,
       status: 'success',
-      organization_id: organization.id,
-      url: window.location.href,
     });
   };
 

static/app/views/discover/savedQuery/utils.tsx

@@ -11,7 +11,6 @@ import {addErrorMessage, addSuccessMessage} from 'sentry/actionCreators/indicato
 import {Client} from 'sentry/api';
 import {t} from 'sentry/locale';
 import {NewQuery, Organization, SavedQuery} from 'sentry/types';
-import {trackAnalyticsEvent} from 'sentry/utils/analytics';
 import {SaveQueryEventParameters} from 'sentry/utils/analytics/discoverAnalyticsEvents';
 import trackAdvancedAnalyticsEvent from 'sentry/utils/analytics/trackAdvancedAnalyticsEvent';
 import EventView from 'sentry/utils/discover/eventView';
@@ -118,11 +117,8 @@ export function handleUpdateQueryName(
   eventView: EventView
 ) {
   const payload = eventView.toNewQuery();
-
-  trackAnalyticsEvent({
-    eventKey: 'discover_v2.update_query_name_request',
-    eventName: "Discoverv2: Request to update a saved query's name",
-    organization_id: parseInt(organization.id, 10),
+  trackAdvancedAnalyticsEvent('discover_v2.update_query_name_request', {
+    organization,
     ...extractAnalyticsQueryFields(payload),
   });
 
@@ -132,20 +128,16 @@ export function handleUpdateQueryName(
     .then(_saved => {
       addSuccessMessage(t('Query name saved'));
 
-      trackAnalyticsEvent({
-        eventKey: 'discover_v2.update_query_name_success',
-        eventName: "Discoverv2: Successfully updated a saved query's name",
-        organization_id: parseInt(organization.id, 10),
+      trackAdvancedAnalyticsEvent('discover_v2.update_query_name_successs', {
+        organization,
         ...extractAnalyticsQueryFields(payload),
       });
     })
     .catch((err: Error) => {
       addErrorMessage(t('Query name not saved'));
 
-      trackAnalyticsEvent({
-        eventKey: 'discover_v2.update_query_failed',
-        eventName: "Discoverv2: Failed to update a saved query's name",
-        organization_id: parseInt(organization.id, 10),
+      trackAdvancedAnalyticsEvent('discover_v2.update_query_failed', {
+        organization,
         ...extractAnalyticsQueryFields(payload),
         error: (err && err.message) || 'Failed to update a query name',
       });
@@ -159,10 +151,8 @@ export function handleDeleteQuery(
   organization: Organization,
   eventView: EventView
 ): Promise<void> {
-  trackAnalyticsEvent({
-    eventKey: 'discover_v2.delete_query_request',
-    eventName: 'Discoverv2: Request to delete a saved query',
-    organization_id: parseInt(organization.id, 10),
+  trackAdvancedAnalyticsEvent('discover_v2.delete_query_request', {
+    organization,
     ...extractAnalyticsQueryFields(eventView.toNewQuery()),
   });
 
@@ -171,21 +161,15 @@ export function handleDeleteQuery(
   promise
     .then(() => {
       addSuccessMessage(t('Query deleted'));
-
-      trackAnalyticsEvent({
-        eventKey: 'discover_v2.delete_query_success',
-        eventName: 'Discoverv2: Successfully deleted a saved query',
-        organization_id: parseInt(organization.id, 10),
+      trackAdvancedAnalyticsEvent('discover_v2.delete_query_success', {
+        organization,
         ...extractAnalyticsQueryFields(eventView.toNewQuery()),
       });
     })
     .catch((err: Error) => {
       addErrorMessage(t('Query not deleted'));
-
-      trackAnalyticsEvent({
-        eventKey: 'discover_v2.delete_query_failed',
-        eventName: 'Discoverv2: Failed to delete a saved query',
-        organization_id: parseInt(organization.id, 10),
+      trackAdvancedAnalyticsEvent('discover_v2.delete_query_failed', {
+        organization,
         ...extractAnalyticsQueryFields(eventView.toNewQuery()),
         error: (err && err.message) || 'Failed to delete query',
       });