fix more node unit tests

Lms24 · Lms24 · commit 0c9e7464c2ec · 2022-04-13T10:42:32.000+02:00
diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
@@ -28,7 +28,7 @@ import {
   uuid4,
 } from '@sentry/utils';
 
-import { initAPIDetails } from './api';
+import { APIDetails, initAPIDetails } from './api';
 import { IS_DEBUG_BUILD } from './flags';
 import { IntegrationIndex, setupIntegrations } from './integration';
 import { createEventEnvelope, createSessionEnvelope } from './request';
@@ -106,6 +106,13 @@ export abstract class BaseClient<O extends Options> implements Client<O> {
     // TODO(v7): remove old transport
     this._transport = transport;
     this._newTransport = newTransport;
+
+    // TODO(v7): refactor this to keep metadata/api outside of transport. This hack is used to
+    //           satisfy tests until we move to NewTransport where we have to revisit this.
+    (this._transport as unknown as { _api: Partial<APIDetails> })._api = {
+      ...((this._transport as unknown as { _api: Partial<APIDetails> })._api || {}),
+      metadata: options._metadata || {},
+    };
   }
 
   /**
diff --git a/packages/node-integration-tests/suites/sessions/errored-session-aggregate/test.ts b/packages/node-integration-tests/suites/sessions/errored-session-aggregate/test.ts
@@ -10,8 +10,11 @@ test('should aggregate successful, crashed and erroneous sessions', async () =>
     getEnvelopeRequest(`${url}/error_handled`),
     getEnvelopeRequest(`${url}/error_unhandled`),
   ]);
+  console.log(envelope);
 
   expect(envelope).toHaveLength(3);
+  console.log(envelope[0]);
+
   expect(envelope[0]).toMatchObject({
     sent_at: expect.any(String),
     sdk: {
diff --git a/packages/node/test/handlers.test.ts b/packages/node/test/handlers.test.ts
@@ -18,6 +18,7 @@ import {
   tracingHandler,
 } from '../src/handlers';
 import * as SDK from '../src/sdk';
+import { setupNodeTransport } from '../src/transports';
 
 describe('parseRequest', () => {
   let mockReq: { [key: string]: any };
@@ -223,7 +224,8 @@ describe('requestHandler', () => {
   });
 
   it('autoSessionTracking is enabled, sets requestSession status to ok, when handling a request', () => {
-    client = new NodeClient({ autoSessionTracking: true, release: '1.2' });
+    const options = { autoSessionTracking: true, release: '1.2' };
+    client = new NodeClient(options, setupNodeTransport(options).transport);
     const hub = new Hub(client);
 
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
@@ -235,7 +237,8 @@ describe('requestHandler', () => {
   });
 
   it('autoSessionTracking is disabled, does not set requestSession, when handling a request', () => {
-    client = new NodeClient({ autoSessionTracking: false, release: '1.2' });
+    const options = { autoSessionTracking: false, release: '1.2' };
+    client = new NodeClient(options, setupNodeTransport(options).transport);
     const hub = new Hub(client);
 
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
@@ -247,7 +250,8 @@ describe('requestHandler', () => {
   });
 
   it('autoSessionTracking is enabled, calls _captureRequestSession, on response finish', done => {
-    client = new NodeClient({ autoSessionTracking: true, release: '1.2' });
+    const options = { autoSessionTracking: true, release: '1.2' };
+    client = new NodeClient(options, setupNodeTransport(options).transport);
     const hub = new Hub(client);
 
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
@@ -267,7 +271,8 @@ describe('requestHandler', () => {
   });
 
   it('autoSessionTracking is disabled, does not call _captureRequestSession, on response finish', done => {
-    client = new NodeClient({ autoSessionTracking: false, release: '1.2' });
+    const options = { autoSessionTracking: false, release: '1.2' };
+    client = new NodeClient(options, setupNodeTransport(options).transport);
     const hub = new Hub(client);
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
 
@@ -367,7 +372,8 @@ describe('tracingHandler', () => {
 
   it('extracts request data for sampling context', () => {
     const tracesSampler = jest.fn();
-    const hub = new Hub(new NodeClient({ tracesSampler }));
+    const options = { tracesSampler };
+    const hub = new Hub(new NodeClient(options, setupNodeTransport(options).transport));
     // we need to mock both of these because the tracing handler relies on `@sentry/core` while the sampler relies on
     // `@sentry/hub`, and mocking breaks the link between the two
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
@@ -389,7 +395,8 @@ describe('tracingHandler', () => {
   });
 
   it('puts its transaction on the scope', () => {
-    const hub = new Hub(new NodeClient({ tracesSampleRate: 1.0 }));
+    const options = { tracesSampleRate: 1.0 };
+    const hub = new Hub(new NodeClient(options, setupNodeTransport(options).transport));
     // we need to mock both of these because the tracing handler relies on `@sentry/core` while the sampler relies on
     // `@sentry/hub`, and mocking breaks the link between the two
     jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
@@ -720,7 +727,8 @@ describe('errorHandler()', () => {
     jest.restoreAllMocks();
   });
   it('when autoSessionTracking is disabled, does not set requestSession status on Crash', () => {
-    client = new NodeClient({ autoSessionTracking: false, release: '3.3' });
+    const options = { autoSessionTracking: false, release: '3.3' };
+    client = new NodeClient(options, setupNodeTransport(options).transport);
     // It is required to initialise SessionFlusher to capture Session Aggregates (it is usually initialised
     // by the`requestHandler`)
     client.initSessionFlusher();
@@ -739,7 +747,8 @@ describe('errorHandler()', () => {
   });
 
   it('autoSessionTracking is enabled + requestHandler is not used -> does not set requestSession status on Crash', () => {
-    client = new NodeClient({ autoSessionTracking: false, release: '3.3' });
+    const options = { autoSessionTracking: false, release: '3.3' };
+    client = new NodeClient(options, setupNodeTransport(options).transport);
 
     const scope = sentryCore.getCurrentHub().getScope();
     const hub = new Hub(client);
@@ -755,7 +764,8 @@ describe('errorHandler()', () => {
   });
 
   it('when autoSessionTracking is enabled, should set requestSession status to Crashed when an unhandled error occurs within the bounds of a request', () => {
-    client = new NodeClient({ autoSessionTracking: true, release: '1.1' });
+    const options = { autoSessionTracking: true, release: '1.1' };
+    client = new NodeClient(options, setupNodeTransport(options).transport);
     // It is required to initialise SessionFlusher to capture Session Aggregates (it is usually initialised
     // by the`requestHandler`)
     client.initSessionFlusher();
@@ -773,7 +783,8 @@ describe('errorHandler()', () => {
   });
 
   it('when autoSessionTracking is enabled, should not set requestSession status on Crash when it occurs outside the bounds of a request', () => {
-    client = new NodeClient({ autoSessionTracking: true, release: '2.2' });
+    const options = { autoSessionTracking: true, release: '2.2' };
+    client = new NodeClient(options, setupNodeTransport(options).transport);
     // It is required to initialise SessionFlusher to capture Session Aggregates (it is usually initialised
     // by the`requestHandler`)
     client.initSessionFlusher();
diff --git a/packages/node/test/index.test.ts b/packages/node/test/index.test.ts
@@ -366,10 +366,8 @@ describe('SentryNode initialization', () => {
     it('should set SDK data when Sentry.init() is called', () => {
       init({ dsn });
 
-      // TODO(v7): Is this replacement ok?
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      // const sdkData = (getCurrentHub().getClient() as any).getTransport()._api.metadata?.sdk;
-      const sdkData = (getCurrentHub().getClient() as any).getOptions()._metadata?.sdk;
+      const sdkData = (getCurrentHub().getClient() as any).getTransport()._api.metadata?.sdk;
 
       expect(sdkData.name).toEqual('sentry.javascript.node');
       expect(sdkData.packages[0].name).toEqual('npm:@sentry/node');
@@ -382,9 +380,7 @@ describe('SentryNode initialization', () => {
       const client = new NodeClient(options, setupNodeTransport(options).transport);
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      // TODO(v7): Is this alright?
-      // const sdkData = (client as any).getTransport()._api.metadata?.sdk;
-      const sdkData = (client as any).getOptions()._metadata?.sdk;
+      const sdkData = (client as any).getTransport()._api.metadata?.sdk;
 
       expect(sdkData.name).toEqual('sentry.javascript.node');
       expect(sdkData.packages[0].name).toEqual('npm:@sentry/node');
diff --git a/packages/node/test/integrations/http.test.ts b/packages/node/test/integrations/http.test.ts
@@ -11,18 +11,18 @@ import * as nock from 'nock';
 import { Breadcrumb } from '../../src';
 import { NodeClient } from '../../src/client';
 import { Http as HttpIntegration } from '../../src/integrations/http';
+import { setupNodeTransport } from '../../src/transports';
 
 const NODE_VERSION = parseSemver(process.versions.node);
 
 describe('tracing', () => {
   function createTransactionOnScope() {
-    const hub = new Hub(
-      new NodeClient({
-        dsn: 'https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012',
-        tracesSampleRate: 1.0,
-        integrations: [new HttpIntegration({ tracing: true })],
-      }),
-    );
+    const options = {
+      dsn: 'https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012',
+      tracesSampleRate: 1.0,
+      integrations: [new HttpIntegration({ tracing: true })],
+    };
+    const hub = new Hub(new NodeClient(options, setupNodeTransport(options).transport));
     addExtensionMethods();
 
     // we need to mock both of these because the tracing handler relies on `@sentry/core` while the sampler relies on
@@ -97,18 +97,17 @@ describe('default protocols', () => {
     const p = new Promise<Breadcrumb>(r => {
       resolve = r;
     });
-    hub.bindClient(
-      new NodeClient({
-        dsn: 'https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012',
-        integrations: [new HttpIntegration({ breadcrumbs: true })],
-        beforeBreadcrumb: (b: Breadcrumb) => {
-          if ((b.data?.url as string).includes(key)) {
-            resolve(b);
-          }
-          return b;
-        },
-      }),
-    );
+    const options = {
+      dsn: 'https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012',
+      integrations: [new HttpIntegration({ breadcrumbs: true })],
+      beforeBreadcrumb: (b: Breadcrumb) => {
+        if ((b.data?.url as string).includes(key)) {
+          resolve(b);
+        }
+        return b;
+      },
+    };
+    hub.bindClient(new NodeClient(options, setupNodeTransport(options).transport));
 
     return p;
   }
diff --git a/packages/node/test/integrations/linkederrors.test.ts b/packages/node/test/integrations/linkederrors.test.ts
@@ -4,6 +4,7 @@ import { createStackParser } from '@sentry/utils';
 import { Event, NodeClient } from '../../src';
 import { LinkedErrors } from '../../src/integrations/linkederrors';
 import { nodeStackParser } from '../../src/stack-parser';
+import { setupNodeTransport } from '../../src/transports';
 
 const stackParser = createStackParser(nodeStackParser);
 
@@ -31,7 +32,8 @@ describe('LinkedErrors', () => {
       expect.assertions(2);
       const spy = jest.spyOn(linkedErrors, '_walkErrorTree');
       const one = new Error('originalException');
-      const client = new NodeClient({ stackParser });
+      const options = { stackParser };
+      const client = new NodeClient(options, setupNodeTransport(options).transport);
       let event: Event | undefined;
       return client
         .eventFromException(one)
@@ -54,7 +56,8 @@ describe('LinkedErrors', () => {
           }),
       );
       const one = new Error('originalException');
-      const client = new NodeClient({ stackParser });
+      const options = { stackParser };
+      const client = new NodeClient(options, setupNodeTransport(options).transport);
       return client.eventFromException(one).then(event =>
         linkedErrors
           ._handler(stackParser, event, {
@@ -74,7 +77,8 @@ describe('LinkedErrors', () => {
       one.cause = two;
       two.cause = three;
 
-      const client = new NodeClient({ stackParser });
+      const options = { stackParser };
+      const client = new NodeClient(options, setupNodeTransport(options).transport);
       return client.eventFromException(one).then(event =>
         linkedErrors
           ._handler(stackParser, event, {
@@ -107,7 +111,8 @@ describe('LinkedErrors', () => {
       one.reason = two;
       two.reason = three;
 
-      const client = new NodeClient({ stackParser });
+      const options = { stackParser };
+      const client = new NodeClient(options, setupNodeTransport(options).transport);
       return client.eventFromException(one).then(event =>
         linkedErrors
           ._handler(stackParser, event, {
@@ -140,7 +145,8 @@ describe('LinkedErrors', () => {
       one.cause = two;
       two.cause = three;
 
-      const client = new NodeClient({ stackParser });
+      const options = { stackParser };
+      const client = new NodeClient(options, setupNodeTransport(options).transport);
       return client.eventFromException(one).then(event =>
         linkedErrors
           ._handler(stackParser, event, {
