Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(integrations): BaseClient reports integrations added after init #7011

Merged
merged 10 commits into from
Feb 2, 2023
6 changes: 2 additions & 4 deletions packages/core/src/utils/prepareEvent.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { ClientOptions, Event, EventHint } from '@sentry/types';
import { dateTimestampInSeconds, normalize, resolvedSyncPromise, truncate, uuid4 } from '@sentry/utils';

import { installedIntegrations } from '../integration';
import { Scope } from '../scope';

/**
Expand Down Expand Up @@ -34,10 +35,7 @@ export function prepareEvent(
};

applyClientOptions(prepared, options);
applyIntegrationsMetadata(
prepared,
options.integrations.map(i => i.name),
);
applyIntegrationsMetadata(prepared, installedIntegrations);

// If we have scope given to us, use it as the base for further modifications.
// This allows us to prevent unnecessary copying of data if `captureContext` is not provided.
Expand Down
21 changes: 20 additions & 1 deletion packages/core/test/lib/base.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { dsnToString, logger, SentryError, SyncPromise } from '@sentry/utils';
import { Hub, makeSession, Scope } from '../../src';
import * as integrationModule from '../../src/integration';
import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
import { TestIntegration } from '../mocks/integration';
import { AdHockIntegration, TestIntegration } from '../mocks/integration';
import { makeFakeTransport } from '../mocks/transport';

const PUBLIC_DSN = 'https://username@domain/123';
Expand Down Expand Up @@ -1514,6 +1514,25 @@ describe('BaseClient', () => {

expect(setupIntegrationsHelper).toHaveBeenCalledTimes(1);
});

test('send all installed integrations in event sdk metadata', () => {
expect.assertions(1);

const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, integrations: [new TestIntegration()] });
const client = new TestClient(options);
client.setupIntegrations();
client.addIntegration(new AdHockIntegration());

client.captureException(new Error('test exception'));

expect(TestClient.instance!.event).toEqual(
expect.objectContaining({
sdk: expect.objectContaining({
integrations: expect.arrayContaining(['TestIntegration', 'AdHockIntegration']),
}),
}),
);
});
});

describe('flush/close', () => {
Expand Down
10 changes: 10 additions & 0 deletions packages/core/test/mocks/integration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,13 @@ export class AddAttachmentTestIntegration implements Integration {
});
}
}

export class AdHockIntegration implements Integration {
krystofwoldrich marked this conversation as resolved.
Show resolved Hide resolved
public static id: string = 'AdHockIntegration';

public name: string = 'AdHockIntegration';

public setupOnce(): void {
// Noop
}
}