chore(test): Add tests for skipping of integrations for otel

Author: mydea

packages/node/src/integrations/http.ts

@@ -38,6 +38,11 @@ export class Http implements Integration {
    */
   public name: string = Http.id;
 
+  /**
+   * If the integration was skipped due to internal checks.
+   */
+  public _wasSkipped: boolean = false;
+
   /**
    * @inheritDoc
    */
@@ -65,13 +70,15 @@ export class Http implements Integration {
   ): void {
     // No need to instrument if we don't want to track anything
     if (!this._breadcrumbs && !this._tracing) {
+      this._wasSkipped = true;
       return;
     }
 
     const clientOptions = setupOnceGetCurrentHub().getClient<NodeClient>()?.getOptions();
 
     // Do not auto-instrument for other instrumenter
     if (clientOptions && clientOptions.instrumenter !== 'sentry') {
+      this._wasSkipped = true;
       return;
     }
 

packages/node/test/integrations/http.test.ts

@@ -188,6 +188,26 @@ describe('tracing', () => {
     expect(transaction.metadata.propagations).toBe(2);
   });
 
+  it("doesn't attach when using otel instrumenter", () => {
+    const options = getDefaultNodeClientOptions({
+      dsn: 'https://dogsarebadatkeepingsecrets@squirrelchasers.ingest.sentry.io/12312012',
+      tracesSampleRate: 1.0,
+      integrations: [new HttpIntegration({ tracing: true })],
+      release: '1.0.0',
+      environment: 'production',
+      instrumenter: 'otel',
+    });
+    const hub = new Hub(new NodeClient(options));
+
+    const integration = new HttpIntegration() as HttpIntegration & { _wasSkipped: boolean };
+    integration.setupOnce(
+      () => {},
+      () => hub,
+    );
+
+    expect(integration._wasSkipped).toBe(true);
+  });
+
   describe('tracePropagationTargets option', () => {
     beforeEach(() => {
       // hacky way of restoring monkey patched functions

packages/tracing/src/integrations/node/apollo.ts

@@ -24,6 +24,11 @@ export class Apollo implements Integration {
    */
   public name: string = Apollo.id;
 
+  /**
+   * If the integration was skipped due to internal checks.
+   */
+  public _wasSkipped: boolean = false;
+
   /**
    * @inheritDoc
    */
@@ -38,11 +43,13 @@ export class Apollo implements Integration {
 
     if (!pkg) {
       __DEBUG_BUILD__ && logger.error('Apollo Integration was unable to require apollo-server-core package.');
+      this._wasSkipped = true;
       return;
     }
 
     if (shouldDisableAutoInstrumentation(getCurrentHub)) {
       __DEBUG_BUILD__ && logger.log('Apollo Integration is skipped because of instrumenter configuration.');
+      this._wasSkipped = true;
       return;
     }
 

packages/tracing/src/integrations/node/express.ts

@@ -90,6 +90,11 @@ export class Express implements Integration {
    */
   public name: string = Express.id;
 
+  /**
+   * If the integration was skipped due to internal checks.
+   */
+  public _wasSkipped: boolean = false;
+
   /**
    * Express App instance
    */
@@ -110,11 +115,13 @@ export class Express implements Integration {
   public setupOnce(_: unknown, getCurrentHub: () => Hub): void {
     if (!this._router) {
       __DEBUG_BUILD__ && logger.error('ExpressIntegration is missing an Express instance');
+      this._wasSkipped = true;
       return;
     }
 
     if (shouldDisableAutoInstrumentation(getCurrentHub)) {
       __DEBUG_BUILD__ && logger.log('Express Integration is skipped because of instrumenter configuration.');
+      this._wasSkipped = true;
       return;
     }
 

packages/tracing/src/integrations/node/graphql.ts

@@ -16,6 +16,11 @@ export class GraphQL implements Integration {
    */
   public name: string = GraphQL.id;
 
+  /**
+   * If the integration was skipped due to internal checks.
+   */
+  public _wasSkipped: boolean = false;
+
   /**
    * @inheritDoc
    */
@@ -26,11 +31,13 @@ export class GraphQL implements Integration {
 
     if (!pkg) {
       __DEBUG_BUILD__ && logger.error('GraphQL Integration was unable to require graphql/execution package.');
+      this._wasSkipped = true;
       return;
     }
 
     if (shouldDisableAutoInstrumentation(getCurrentHub)) {
       __DEBUG_BUILD__ && logger.log('GraphQL Integration is skipped because of instrumenter configuration.');
+      this._wasSkipped = true;
       return;
     }
 

packages/tracing/src/integrations/node/mongo.ts

@@ -102,6 +102,11 @@ export class Mongo implements Integration {
    */
   public name: string = Mongo.id;
 
+  /**
+   * If the integration was skipped due to internal checks.
+   */
+  public _wasSkipped: boolean = false;
+
   private _operations: Operation[];
   private _describeOperations?: boolean | Operation[];
   private _useMongoose: boolean;
@@ -124,11 +129,13 @@ export class Mongo implements Integration {
 
     if (!pkg) {
       __DEBUG_BUILD__ && logger.error(`Mongo Integration was unable to require \`${moduleName}\` package.`);
+      this._wasSkipped = true;
       return;
     }
 
     if (shouldDisableAutoInstrumentation(getCurrentHub)) {
       __DEBUG_BUILD__ && logger.log('Mongo Integration is skipped because of instrumenter configuration.');
+      this._wasSkipped = true;
       return;
     }
 

packages/tracing/src/integrations/node/mysql.ts

@@ -20,6 +20,11 @@ export class Mysql implements Integration {
    */
   public name: string = Mysql.id;
 
+  /**
+   * If the integration was skipped due to internal checks.
+   */
+  public _wasSkipped: boolean = false;
+
   /**
    * @inheritDoc
    */
@@ -28,11 +33,13 @@ export class Mysql implements Integration {
 
     if (!pkg) {
       __DEBUG_BUILD__ && logger.error('Mysql Integration was unable to require `mysql` package.');
+      this._wasSkipped = true;
       return;
     }
 
     if (shouldDisableAutoInstrumentation(getCurrentHub)) {
       __DEBUG_BUILD__ && logger.log('Mysql Integration is skipped because of instrumenter configuration.');
+      this._wasSkipped = true;
       return;
     }
 

packages/tracing/src/integrations/node/postgres.ts

@@ -26,6 +26,11 @@ export class Postgres implements Integration {
    */
   public name: string = Postgres.id;
 
+  /**
+   * If the integration was skipped due to internal checks.
+   */
+  public _wasSkipped: boolean = false;
+
   private _usePgNative: boolean;
 
   public constructor(options: PgOptions = {}) {
@@ -40,11 +45,13 @@ export class Postgres implements Integration {
 
     if (!pkg) {
       __DEBUG_BUILD__ && logger.error('Postgres Integration was unable to require `pg` package.');
+      this._wasSkipped = true;
       return;
     }
 
     if (shouldDisableAutoInstrumentation(getCurrentHub)) {
       __DEBUG_BUILD__ && logger.log('Postgres Integration is skipped because of instrumenter configuration.');
+      this._wasSkipped = true;
       return;
     }
 

packages/tracing/src/integrations/node/prisma.ts

@@ -54,6 +54,11 @@ export class Prisma implements Integration {
    */
   public name: string = Prisma.id;
 
+  /**
+   * If the integration was skipped due to internal checks.
+   */
+  public _wasSkipped: boolean = false;
+
   /**
    * Prisma ORM Client Instance
    */
@@ -79,11 +84,13 @@ export class Prisma implements Integration {
   public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
     if (!this._client) {
       __DEBUG_BUILD__ && logger.error('PrismaIntegration is missing a Prisma Client Instance');
+      this._wasSkipped = true;
       return;
     }
 
     if (shouldDisableAutoInstrumentation(getCurrentHub)) {
       __DEBUG_BUILD__ && logger.log('Prisma Integration is skipped because of instrumenter configuration.');
+      this._wasSkipped = true;
       return;
     }
 

packages/tracing/test/integrations/apollo.test.ts

@@ -3,6 +3,7 @@ import { Hub, Scope } from '@sentry/core';
 
 import { Apollo } from '../../src/integrations/node/apollo';
 import { Span } from '../../src/span';
+import { getTestClient } from '../testutils';
 
 type ApolloResolverGroup = {
   [key: string]: () => any;
@@ -100,4 +101,17 @@ describe('setupOnce', () => {
     });
     expect(childSpan.finish).toBeCalled();
   });
+
+  it("doesn't attach when using otel instrumenter", () => {
+    const client = getTestClient({ instrumenter: 'otel' });
+    const hub = new Hub(client);
+
+    const integration = new Apollo() as Apollo & { _wasSkipped: boolean };
+    integration.setupOnce(
+      () => {},
+      () => hub,
+    );
+
+    expect(integration._wasSkipped).toBe(true);
+  });
 });

packages/tracing/test/integrations/graphql.test.ts

@@ -3,6 +3,7 @@ import { Hub, Scope } from '@sentry/core';
 
 import { GraphQL } from '../../src/integrations/node/graphql';
 import { Span } from '../../src/span';
+import { getTestClient } from '../testutils';
 
 const GQLExecute = {
   execute() {
@@ -53,4 +54,17 @@ describe('setupOnce', () => {
     expect(childSpan.finish).toBeCalled();
     expect(scope.setSpan).toHaveBeenCalledTimes(2);
   });
+
+  it("doesn't attach when using otel instrumenter", () => {
+    const client = getTestClient({ instrumenter: 'otel' });
+    const hub = new Hub(client);
+
+    const integration = new GraphQL() as GraphQL & { _wasSkipped: boolean };
+    integration.setupOnce(
+      () => {},
+      () => hub,
+    );
+
+    expect(integration._wasSkipped).toBe(true);
+  });
 });

packages/tracing/test/integrations/node/mongo.test.ts

@@ -3,6 +3,7 @@ import { Hub, Scope } from '@sentry/core';
 
 import { Mongo } from '../../../src/integrations/node/mongo';
 import { Span } from '../../../src/span';
+import { getTestClient } from '../../testutils';
 
 class Collection {
   public collectionName: string = 'mockedCollectionName';
@@ -111,4 +112,17 @@ describe('patchOperation()', () => {
     });
     expect(childSpan.finish).toBeCalled();
   });
+
+  it("doesn't attach when using otel instrumenter", () => {
+    const client = getTestClient({ instrumenter: 'otel' });
+    const hub = new Hub(client);
+
+    const integration = new Mongo() as Mongo & { _wasSkipped: boolean };
+    integration.setupOnce(
+      () => {},
+      () => hub,
+    );
+
+    expect(integration._wasSkipped).toBe(true);
+  });
 });

packages/tracing/test/integrations/node/postgres.test.ts

@@ -3,6 +3,7 @@ import { Hub, Scope } from '@sentry/core';
 
 import { Postgres } from '../../../src/integrations/node/postgres';
 import { Span } from '../../../src/span';
+import { getTestClient } from '../../testutils';
 
 class PgClient {
   // https://node-postgres.com/api/client#clientquery
@@ -94,4 +95,17 @@ describe('setupOnce', () => {
       expect(childSpan.finish).toBeCalled();
     });
   });
+
+  it("doesn't attach when using otel instrumenter", () => {
+    const client = getTestClient({ instrumenter: 'otel' });
+    const hub = new Hub(client);
+
+    const integration = new Postgres() as Postgres & { _wasSkipped: boolean };
+    integration.setupOnce(
+      () => {},
+      () => hub,
+    );
+
+    expect(integration._wasSkipped).toBe(true);
+  });
 });

packages/tracing/test/integrations/node/prisma.test.ts

@@ -3,6 +3,7 @@ import { Hub, Scope } from '@sentry/core';
 
 import { Prisma } from '../../../src/integrations/node/prisma';
 import { Span } from '../../../src/span';
+import { getTestClient } from '../../testutils';
 
 type PrismaMiddleware = (params: unknown, next: (params?: unknown) => Promise<unknown>) => Promise<unknown>;
 
@@ -58,4 +59,17 @@ describe('setupOnce', function () {
       done();
     });
   });
+
+  it("doesn't attach when using otel instrumenter", () => {
+    const client = getTestClient({ instrumenter: 'otel' });
+    const hub = new Hub(client);
+
+    const integration = new Prisma() as Prisma & { _wasSkipped: boolean };
+    integration.setupOnce(
+      () => {},
+      () => hub,
+    );
+
+    expect(integration._wasSkipped).toBe(true);
+  });
 });

packages/tracing/test/testutils.ts

@@ -1,5 +1,5 @@
 import { createTransport } from '@sentry/browser';
-import { ClientOptions } from '@sentry/types';
+import { Client, ClientOptions } from '@sentry/types';
 import { GLOBAL_OBJ, resolvedSyncPromise } from '@sentry/utils';
 import { JSDOM } from 'jsdom';
 
@@ -66,3 +66,19 @@ export function getDefaultBrowserClientOptions(options: Partial<ClientOptions> =
     ...options,
   };
 }
+
+export function getTestClient(options: Partial<ClientOptions>): Client {
+  class TestClient {
+    _options: Partial<ClientOptions>;
+
+    constructor(options: Partial<ClientOptions>) {
+      this._options = options;
+    }
+
+    getOptions(): Partial<ClientOptions> {
+      return this._options;
+    }
+  }
+
+  return new TestClient(options) as unknown as Client;
+}