Remove node attachment loading special case

Author: timfish

packages/core/src/baseclient.ts

@@ -630,7 +630,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
           this._updateSessionFromEvent(session, processedEvent);
         }
 
-        this.sendEvent(processedEvent, this._attachmentsFromScope(scope));
+        this.sendEvent(processedEvent, scope?.getAttachments() || []);
         return processedEvent;
       })
       .then(null, reason => {
@@ -667,21 +667,6 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
     );
   }
 
-  /**
-   * Loads attachments from scope
-   */
-  protected _attachmentsFromScope(scope: Scope | undefined): Attachment[] {
-    return (
-      scope?.getAttachments()?.reduce((acc, attachment) => {
-        if ('data' in attachment) {
-          acc.push(attachment);
-        }
-
-        return acc;
-      }, [] as Attachment[]) || []
-    );
-  }
-
   /**
    * @inheritdoc
    */

packages/hub/src/scope.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-lines */
 import {
-  AttachmentOptions,
+  Attachment,
   Breadcrumb,
   CaptureContext,
   Context,
@@ -87,7 +87,7 @@ export class Scope implements ScopeInterface {
   protected _requestSession?: RequestSession;
 
   /** Attachments */
-  protected _attachments: AttachmentOptions[] = [];
+  protected _attachments: Attachment[] = [];
 
   /**
    * A place to stash data which is needed at some point in the SDK's event processing pipeline but which shouldn't get
@@ -407,15 +407,15 @@ export class Scope implements ScopeInterface {
   /**
    * @inheritDoc
    */
-  public addAttachment(attachment: AttachmentOptions): this {
+  public addAttachment(attachment: Attachment): this {
     this._attachments.push(attachment);
     return this;
   }
 
   /**
    * @inheritDoc
    */
-  public getAttachments(): AttachmentOptions[] {
+  public getAttachments(): Attachment[] {
     return this._attachments;
   }
 

packages/node/src/client.ts

@@ -1,8 +1,7 @@
 import { BaseClient, Scope, SDK_VERSION } from '@sentry/core';
 import { SessionFlusher } from '@sentry/hub';
-import { Attachment, Event, EventHint, Severity, SeverityLevel } from '@sentry/types';
-import { basename, logger, resolvedSyncPromise } from '@sentry/utils';
-import { existsSync, readFileSync } from 'fs';
+import { Event, EventHint, Severity, SeverityLevel } from '@sentry/types';
+import { logger, resolvedSyncPromise } from '@sentry/utils';
 import { TextEncoder } from 'util';
 
 import { eventFromMessage, eventFromUnknownInput } from './eventbuilder';
@@ -158,35 +157,4 @@ export class NodeClient extends BaseClient<NodeClientOptions> {
       this._sessionFlusher.incrementSessionStatusCount();
     }
   }
-
-  /**
-   * @inheritDoc
-   */
-  protected _attachmentsFromScope(scope: Scope | undefined): Attachment[] {
-    return (
-      scope?.getAttachments()?.map(attachment => {
-        if ('path' in attachment && !('data' in attachment)) {
-          if (existsSync(attachment.path)) {
-            return {
-              filename: attachment.filename || basename(attachment.path),
-              data: readFileSync(attachment.path),
-              contentType: attachment.contentType,
-              attachmentType: attachment.attachmentType,
-            };
-          } else {
-            const msg = `Missing attachment - file not found: ${attachment.path}`;
-            logger.warn(msg);
-
-            return {
-              filename: attachment.filename || basename(attachment.path),
-              data: msg,
-              contentType: 'text/plain',
-            };
-          }
-        }
-
-        return attachment;
-      }) || []
-    );
-  }
 }

packages/types/src/attachment.ts

@@ -1,15 +1,6 @@
-export type AttachmentOptions = Attachment | AttachmentFromPath;
-
 export interface Attachment {
   data: string | Uint8Array;
   filename: string;
   contentType?: string;
   attachmentType?: string;
 }
-
-interface AttachmentFromPath {
-  path: string;
-  filename?: string;
-  contentType?: string;
-  attachmentType?: string;
-}

packages/types/src/index.ts

@@ -1,4 +1,4 @@
-export type { Attachment, AttachmentOptions } from './attachment';
+export type { Attachment } from './attachment';
 export type { Breadcrumb, BreadcrumbHint } from './breadcrumb';
 export type { Client } from './client';
 export type { ClientReport, Outcome, EventDropReason } from './clientreport';

packages/types/src/scope.ts

@@ -1,4 +1,4 @@
-import { AttachmentOptions } from './attachment';
+import { Attachment } from './attachment';
 import { Breadcrumb } from './breadcrumb';
 import { Context, Contexts } from './context';
 import { EventProcessor } from './eventprocessor';
@@ -164,12 +164,12 @@ export interface Scope {
    * Adds an attachment to the scope
    * @param attachment Attachment options
    */
-  addAttachment(attachment: AttachmentOptions): this;
+  addAttachment(attachment: Attachment): this;
 
   /**
    * Returns an array of attachments on the scope
    */
-  getAttachments(): AttachmentOptions[];
+  getAttachments(): Attachment[];
 
   /**
    * Clears attachments from the scope