refactor: Uses withReporting to force named functions for tracing (calcom#21219)

Author: zomars

packages/app-store/routing-forms/lib/handleResponse.ts

@@ -5,7 +5,7 @@ import { emailSchema } from "@calcom/lib/emailSchema";
 import logger from "@calcom/lib/logger";
 import { findTeamMembersMatchingAttributeLogic } from "@calcom/lib/raqb/findTeamMembersMatchingAttributeLogic";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import monitorCallbackAsync from "@calcom/lib/sentryWrapper";
+import { withReporting } from "@calcom/lib/sentryWrapper";
 import { prisma } from "@calcom/prisma";
 import type { App_RoutingForms_Form } from "@calcom/prisma/client";
 import { RoutingFormSettings } from "@calcom/prisma/zod-utils";
@@ -32,10 +32,6 @@ export type Form = SerializableForm<
 
 const moduleLogger = logger.getSubLogger({ prefix: ["routing-forms/lib/handleResponse"] });
 
-export const handleResponse = (...args: Parameters<typeof _handleResponse>) => {
-  return monitorCallbackAsync(_handleResponse, ...args);
-};
-
 const _handleResponse = async ({
   response,
   form,
@@ -185,7 +181,7 @@ const _handleResponse = async ({
           })(),
         ]);
 
-      await monitorCallbackAsync(getRoutedMembers);
+      await withReporting(getRoutedMembers, "getRoutedMembers")();
     } else {
       // It currently happens for a Router route. Such a route id isn't present in the form.routes
     }
@@ -202,8 +198,7 @@ const _handleResponse = async ({
         },
       });
 
-      await monitorCallbackAsync(
-        onFormSubmission,
+      await onFormSubmission(
         { ...serializableFormWithFields, userWithEmails },
         dbFormResponse.response as FormResponse,
         dbFormResponse.id,
@@ -247,3 +242,5 @@ const _handleResponse = async ({
     throw e;
   }
 };
+
+export const handleResponse = withReporting(_handleResponse, "handleResponse");

packages/app-store/routing-forms/trpc/utils.ts

@@ -6,6 +6,7 @@ import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import logger from "@calcom/lib/logger";
+import { withReporting } from "@calcom/lib/sentryWrapper";
 import { WebhookTriggerEvents } from "@calcom/prisma/client";
 import type { Ensure } from "@calcom/types/utils";
 
@@ -84,7 +85,7 @@ export function getFieldResponse({
  * Not called in preview mode or dry run mode
  * It takes care of sending webhooks and emails for form submissions
  */
-export async function onFormSubmission(
+async function _onFormSubmission(
   form: Ensure<
     SerializableForm<App_RoutingForms_Form> & { user: Pick<User, "id" | "email">; userWithEmails?: string[] },
     "fields"
@@ -206,6 +207,7 @@ export async function onFormSubmission(
     }
   }
 }
+export const onFormSubmission = withReporting(_onFormSubmission, "onFormSubmission");
 
 export const sendResponseEmail = async (
   form: Pick<App_RoutingForms_Form, "id" | "name" | "fields">,

packages/emails/email-manager.ts

@@ -8,6 +8,7 @@ import { getEventName } from "@calcom/lib/event";
 import { formatCalEvent } from "@calcom/lib/formatCalendarEvent";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
+import { withReporting } from "@calcom/lib/sentryWrapper";
 import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import type { CalendarEvent, Person } from "@calcom/types/Calendar";
 
@@ -98,7 +99,7 @@ const eventTypeDisableHostEmail = (metadata?: EventTypeMetadata) => {
   return !!metadata?.disableStandardEmails?.all?.host;
 };
 
-export const sendScheduledEmailsAndSMS = async (
+const _sendScheduledEmailsAndSMS = async (
   calEvent: CalendarEvent,
   eventNameObject?: EventNameObjectType,
   hostEmailDisabled?: boolean,
@@ -145,6 +146,11 @@ export const sendScheduledEmailsAndSMS = async (
   await successfullyScheduledSms.sendSMSToAttendees();
 };
 
+export const sendScheduledEmailsAndSMS = withReporting(
+  _sendScheduledEmailsAndSMS,
+  "sendScheduledEmailsAndSMS"
+);
+
 // for rescheduled round robin booking that assigned new members
 export const sendRoundRobinScheduledEmailsAndSMS = async ({
   calEvent,
@@ -245,7 +251,7 @@ export const sendRoundRobinCancelledEmailsAndSMS = async (
   await Promise.all(emailsAndSMSToSend);
 };
 
-export const sendRescheduledEmailsAndSMS = async (
+const _sendRescheduledEmailsAndSMS = async (
   calEvent: CalendarEvent,
   eventTypeMetadata?: EventTypeMetadata
 ) => {
@@ -276,6 +282,10 @@ export const sendRescheduledEmailsAndSMS = async (
   const successfullyReScheduledSms = new EventSuccessfullyReScheduledSMS(calEvent);
   await successfullyReScheduledSms.sendSMSToAttendees();
 };
+export const sendRescheduledEmailsAndSMS = withReporting(
+  _sendRescheduledEmailsAndSMS,
+  "sendRescheduledEmailsAndSMS"
+);
 
 export const sendRescheduledSeatEmailAndSMS = async (
   calEvent: CalendarEvent,
@@ -370,10 +380,7 @@ export const sendCancelledSeatEmailsAndSMS = async (
   await cancelledSeatSMS.sendSMSToAttendee(cancelledAttendee);
 };
 
-export const sendOrganizerRequestEmail = async (
-  calEvent: CalendarEvent,
-  eventTypeMetadata?: EventTypeMetadata
-) => {
+const _sendOrganizerRequestEmail = async (calEvent: CalendarEvent, eventTypeMetadata?: EventTypeMetadata) => {
   if (eventTypeDisableHostEmail(eventTypeMetadata)) return;
   const calendarEvent = formatCalEvent(calEvent);
 
@@ -390,7 +397,12 @@ export const sendOrganizerRequestEmail = async (
   await Promise.all(emailsToSend);
 };
 
-export const sendAttendeeRequestEmailAndSMS = async (
+export const sendOrganizerRequestEmail = withReporting(
+  _sendOrganizerRequestEmail,
+  "sendOrganizerRequestEmail"
+);
+
+const _sendAttendeeRequestEmailAndSMS = async (
   calEvent: CalendarEvent,
   attendee: Person,
   eventTypeMetadata?: EventTypeMetadata
@@ -403,6 +415,11 @@ export const sendAttendeeRequestEmailAndSMS = async (
   await eventRequestSms.sendSMSToAttendee(attendee);
 };
 
+export const sendAttendeeRequestEmailAndSMS = withReporting(
+  _sendAttendeeRequestEmailAndSMS,
+  "sendAttendeeRequestEmailAndSMS"
+);
+
 export const sendDeclinedEmailsAndSMS = async (
   calEvent: CalendarEvent,
   eventTypeMetadata?: EventTypeMetadata

packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/refreshCredentials.ts

@@ -2,6 +2,7 @@ import async from "async";
 
 import { isDelegationCredential } from "@calcom/lib/delegationCredential/clientAndServer";
 import { buildAllCredentials } from "@calcom/lib/delegationCredential/server";
+import { withReporting } from "@calcom/lib/sentryWrapper";
 import type { CredentialForCalendarService } from "@calcom/types/Credential";
 
 import { refreshCredential } from "./refreshCredential";
@@ -11,9 +12,10 @@ import { refreshCredential } from "./refreshCredential";
  *
  * @param credentials
  */
-export async function refreshCredentials(
+// Define the function with underscore prefix
+const _refreshCredentials = async (
   credentials: Array<CredentialForCalendarService>
-): Promise<Array<CredentialForCalendarService>> {
+): Promise<Array<CredentialForCalendarService>> => {
   const nonDelegationCredentials = credentials.filter(
     (cred) => !isDelegationCredential({ credentialId: cred.id })
   );
@@ -22,4 +24,6 @@ export async function refreshCredentials(
   );
   const refreshedDbCredentials = await async.mapLimit(nonDelegationCredentials, 5, refreshCredential);
   return buildAllCredentials({ delegationCredentials, existingCredentials: refreshedDbCredentials });
-}
+};
+
+export const refreshCredentials = withReporting(_refreshCredentials, "refreshCredentials");