diff --git a/src/libs/telemetry/activeSpans.ts b/src/libs/telemetry/activeSpans.ts index 29abc444a36b..8ccf60816570 100644 --- a/src/libs/telemetry/activeSpans.ts +++ b/src/libs/telemetry/activeSpans.ts @@ -1,6 +1,5 @@ import type {StartSpanOptions} from '@sentry/core'; import * as Sentry from '@sentry/react-native'; -import Log from '@libs/Log'; import CONST from '@src/CONST'; const activeSpans = new Map>(); @@ -16,12 +15,6 @@ type StartSpanExtraOptions = Partial<{ function startSpan(spanId: string, options: StartSpanOptions, extraOptions: StartSpanExtraOptions = {}) { // End any existing span for this name cancelSpan(spanId); - Log.info(`[Sentry][${spanId}] Starting span`, undefined, { - spanId, - spanOptions: options, - spanExtraOptions: extraOptions, - timestamp: Date.now(), - }); const span = Sentry.startInactiveSpan(options); if (extraOptions.minDuration) { @@ -36,10 +29,8 @@ function endSpan(spanId: string) { const span = activeSpans.get(spanId); if (!span) { - Log.info(`[Sentry][${spanId}] Trying to end span but it does not exist`, undefined, {spanId, timestamp: Date.now()}); return; } - Log.info(`[Sentry][${spanId}] Ending span`, undefined, {spanId, timestamp: Date.now()}); span.setStatus({code: 1}); span.setAttribute(CONST.TELEMETRY.ATTRIBUTE_FINISHED_MANUALLY, true); span.end(); @@ -48,7 +39,6 @@ function endSpan(spanId: string) { function cancelSpan(spanId: string) { const span = activeSpans.get(spanId); - Log.info(`[Sentry][${spanId}] Canceling span`, undefined, {spanId, spanExists: !!span, timestamp: Date.now()}); span?.setAttribute(CONST.TELEMETRY.ATTRIBUTE_CANCELED, true); // In Sentry there are only OK or ERROR status codes. // We treat canceled spans as OK, so we can properly track spans that are not finished at all (their status would be different) diff --git a/src/libs/telemetry/forwardLogsToSentry.ts b/src/libs/telemetry/forwardLogsToSentry.ts index 1e14ec940cd5..7983063ce4c9 100644 --- a/src/libs/telemetry/forwardLogsToSentry.ts +++ b/src/libs/telemetry/forwardLogsToSentry.ts @@ -2,8 +2,6 @@ import * as Sentry from '@sentry/react-native'; type SentryLogLevel = 'debug' | 'info' | 'warn' | 'error'; -const PARAMETERS_WHITELIST = new Set(['timestamp', 'spanExists', 'spanId', 'spanOptions', 'spanExtraOptions']); - /** * Method deciding whether a log packet should be forwarded to Sentry. * @@ -13,9 +11,6 @@ const PARAMETERS_WHITELIST = new Set(['timestamp', 'spanExists', 'spanId', 'span */ // eslint-disable-next-line @typescript-eslint/no-unused-vars function shouldForwardLog(log: {message?: string; parameters?: Record | undefined}) { - if (log.message?.search('[Sentry]') !== -1) { - return true; - } return false; } @@ -32,14 +27,6 @@ function mapLogMessageToSentryLevel(message: string): SentryLogLevel { return 'debug'; } -function filterParameters(parameters: Record | undefined) { - if (!parameters) { - return undefined; - } - - return Object.fromEntries(Object.entries(parameters).filter(([key]) => PARAMETERS_WHITELIST.has(key))); -} - function forwardLogsToSentry(logPacket: string | undefined) { if (!logPacket) { return; @@ -72,7 +59,7 @@ function forwardLogsToSentry(logPacket: string | undefined) { } if (logLine.parameters) { - logMethod(logLine.message, filterParameters(logLine.parameters)); + logMethod(logLine.message, logLine.parameters); } else { logMethod(logLine.message); }