Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/core/src/baseclient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -434,10 +434,10 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
* @param event The event that will be filled with all integrations.
*/
protected _applyIntegrationsMetadata(event: Event): void {
const sdkInfo = event.sdk;
const integrationsArray = Object.keys(this._integrations);
if (sdkInfo && integrationsArray.length > 0) {
sdkInfo.integrations = integrationsArray;
if (integrationsArray.length > 0) {
event.sdk = event.sdk || {};
event.sdk.integrations = [...(event.sdk.integrations || []), ...integrationsArray];
}
}

Expand Down
6 changes: 1 addition & 5 deletions packages/core/src/request.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ function enhanceEventWithSdkInfo(event: Event, sdkInfo?: SdkInfo): Event {
if (!sdkInfo) {
return event;
}

event.sdk = event.sdk || {
name: sdkInfo.name,
version: sdkInfo.version,
};
event.sdk = event.sdk || {};
event.sdk.name = event.sdk.name || sdkInfo.name;
event.sdk.version = event.sdk.version || sdkInfo.version;
event.sdk.integrations = [...(event.sdk.integrations || []), ...(sdkInfo.integrations || [])];
Expand Down
9 changes: 9 additions & 0 deletions packages/core/test/lib/base.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,15 @@ describe('BaseClient', () => {
});
});

test('adds installed integrations to sdk info', () => {
const client = new TestClient({ dsn: PUBLIC_DSN, integrations: [new TestIntegration()] });
client.setupIntegrations();
client.captureEvent({ message: 'message' });
expect(TestBackend.instance!.event!.sdk).toEqual({
integrations: ['TestIntegration'],
});
});

test('normalizes event with default depth of 3', () => {
expect.assertions(1);
const client = new TestClient({ dsn: PUBLIC_DSN });
Expand Down
23 changes: 10 additions & 13 deletions packages/react/src/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@ import { BrowserOptions, init as browserInit, SDK_VERSION } from '@sentry/browse
*/
export function init(options: BrowserOptions): void {
options._metadata = options._metadata || {};
if (options._metadata.sdk === undefined) {
options._metadata.sdk = {
name: 'sentry.javascript.react',
packages: [
{
name: 'npm:@sentry/react',
version: SDK_VERSION,
},
],
version: SDK_VERSION,
};
}

options._metadata.sdk = options._metadata.sdk || {
name: 'sentry.javascript.react',
packages: [
{
name: 'npm:@sentry/react',
version: SDK_VERSION,
},
],
version: SDK_VERSION,
};
browserInit(options);
}
4 changes: 2 additions & 2 deletions packages/types/src/sdkinfo.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Package } from './package';

export interface SdkInfo {
name: string;
version: string;
name?: string;
version?: string;
integrations?: string[];
packages?: Package[];
}