[v7] Random unimportant TODO fixes

Author: kamilogorek

packages/core/src/baseclient.ts

@@ -10,6 +10,7 @@ import {
   Integration,
   TransportRequest,
   Transport,
+  EventType,
 } from '@sentry/types';
 import {
   dateTimestampInSeconds,
@@ -388,7 +389,7 @@ export abstract class BaseClient<O extends Options> implements ClientLike<O> {
     }
 
     // TODO: Make it configurable or move to @sentry/integration-browser-breadcrumbs
-    const eventType = processedEvent.type === 'transaction' ? 'transaction' : 'event';
+    const eventType = processedEvent.type === EventType.Transaction ? 'transaction' : 'event';
     this.getScope().addBreadcrumb(
       {
         category: `sentry.${eventType}`,

packages/eventbuilder-node/src/index.ts

@@ -13,7 +13,11 @@ import {
 import { extractStackFromError, parseError, parseStack, prepareFramesForEvent } from './parsers';
 export { getExceptionFromError } from './parsers';
 
-export function eventFromException(options: Options, exception: unknown, captureContext: CaptureContext): SentryEvent {
+export function eventFromException(
+  options: Options & { serverName?: string },
+  exception: unknown,
+  captureContext: CaptureContext,
+): SentryEvent {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let ex: any = exception;
   const mechanism: Mechanism = {
@@ -46,9 +50,8 @@ export function eventFromException(options: Options, exception: unknown, capture
     event.event_id = captureContext.hint?.event_id;
   }
   event.platform = 'node';
-  // TODO: Fix options type - we dont want to have a circular dependency on @sentry/node here
-  if ((options as { serverName?: string }).serverName) {
-    event.server_name = (options as { serverName?: string }).serverName;
+  if (options.serverName) {
+    event.server_name = options.serverName;
   }
   if (shouldSerializeException) {
     event.extra = event.extra || {};

packages/transport-base/src/transport.ts

@@ -56,7 +56,6 @@ export abstract class BaseTransport {
     return this._asyncBuffer.add(sendRequestTask);
   }
 
-  // TODO: Make requestMaker an abstract method that has to be implemented by the class that extends it?
   public flush(timeout: number = 0): PromiseLike<boolean> {
     return this._asyncBuffer.drain(timeout);
   }

packages/types/src/mechanism.ts

@@ -1,8 +1,7 @@
 export interface Mechanism {
-  type: string;
-  handled: boolean;
-  data?: {
-    [key: string]: string | boolean;
-  };
+  [key: string]: unknown;
+  type?: string;
+  handled?: boolean;
   synthetic?: boolean;
+  data?: Record<string, unknown>;
 }

packages/utils/src/misc.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { SentryEvent, SentryGlobal, WrappedFunction } from '@sentry/types';
+import { Mechanism, SentryEvent, SentryGlobal, WrappedFunction } from '@sentry/types';
 
 import { isNodeEnv } from './node';
 
@@ -182,22 +182,19 @@ export function addExceptionTypeValue(event: SentryEvent, value?: string, type?:
  * @param mechanism Mechanism of the mechanism.
  * @hidden
  */
-export function addExceptionMechanism(
-  event: SentryEvent,
-  mechanism: {
-    [key: string]: any;
-  } = {},
-): void {
-  // TODO: Use real type with `keyof Mechanism` thingy and maybe make it better?
+export function addExceptionMechanism(event: SentryEvent, mechanism: Mechanism): void {
   try {
-    // @ts-ignore Type 'Mechanism | {}' is not assignable to type 'Mechanism | undefined'
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    event.exception!.values![0].mechanism = event.exception!.values![0].mechanism || {};
-    Object.keys(mechanism).forEach(key => {
-      // @ts-ignore Mechanism has no index signature
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      event.exception!.values![0].mechanism[key] = mechanism[key];
-    });
+    const exception = event.exception?.values?.[0];
+
+    if (exception) {
+      exception.mechanism = exception.mechanism || {
+        type: mechanism.type,
+      };
+
+      for (const [key, value] of Object.entries(mechanism)) {
+        exception.mechanism[key] = value;
+      }
+    }
   } catch (_oO) {
     // no-empty
   }