Skip to content

ref: Use applySdkMetadata everywhere #15305

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 5, 2025
Merged

ref: Use applySdkMetadata everywhere #15305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44bcbdd
ref: Use `applySdkMetadata` everywhere
mydea Feb 5, 2025
6cb8f3a
fix test
mydea Feb 5, 2025
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
23 changes: 8 additions & 15 deletions packages/aws-serverless/src/sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ import { existsSync } from 'fs';
import { hostname } from 'os';
import { basename, resolve } from 'path';
import { types } from 'util';
import type { Integration, Options, Scope, SdkMetadata, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, logger } from '@sentry/core';
import type { Integration, Options, Scope, Span } from '@sentry/core';
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
applySdkMetadata,
logger,
} from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import {
SDK_VERSION,
captureException,
captureMessage,
continueTrace,
Expand Down Expand Up @@ -73,22 +77,11 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
*/
export function init(options: NodeOptions = {}): NodeClient | undefined {
const opts = {
_metadata: {} as SdkMetadata,
defaultIntegrations: getDefaultIntegrations(options),
...options,
};

opts._metadata.sdk = opts._metadata.sdk || {
name: 'sentry.javascript.aws-serverless',
integrations: ['AWSLambda'],
packages: [
{
name: 'npm:@sentry/aws-serverless',
version: SDK_VERSION,
},
],
version: SDK_VERSION,
};
applySdkMetadata(opts, 'aws-serverless');

return initWithoutDefaultIntegrations(opts);
}
Expand Down
1 change: 0 additions & 1 deletion packages/aws-serverless/test/sdk.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,6 @@ describe('AWSLambda', () => {
_metadata: {
sdk: {
name: 'sentry.javascript.aws-serverless',
integrations: ['AWSLambda'],
packages: [
{
name: 'npm:@sentry/aws-serverless',
Expand Down
17 changes: 4 additions & 13 deletions packages/google-cloud-serverless/src/sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { Integration, Options, SdkMetadata } from '@sentry/core';
import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { SDK_VERSION, getDefaultIntegrationsWithoutPerformance, init as initNode } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, init as initNode } from '@sentry/node';

import { googleCloudGrpcIntegration } from './integrations/google-cloud-grpc';
import { googleCloudHttpIntegration } from './integrations/google-cloud-http';
Expand Down Expand Up @@ -28,21 +29,11 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
*/
export function init(options: NodeOptions = {}): NodeClient | undefined {
const opts = {
_metadata: {} as SdkMetadata,
defaultIntegrations: getDefaultIntegrations(options),
...options,
};

opts._metadata.sdk = opts._metadata.sdk || {
name: 'sentry.javascript.google-cloud-serverless',
packages: [
{
name: 'npm:@sentry/google-cloud-serverless',
version: SDK_VERSION,
},
],
version: SDK_VERSION,
};
applySdkMetadata(opts, 'google-cloud-serverless');

return initNode(opts);
}
28 changes: 9 additions & 19 deletions packages/vue/src/sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,19 @@
import { SDK_VERSION, getDefaultIntegrations, init as browserInit } from '@sentry/browser';

import { getDefaultIntegrations, init as browserInit } from '@sentry/browser';
import type { Client } from '@sentry/core';
import { applySdkMetadata } from '@sentry/core';
import { vueIntegration } from './integration';
import type { Options } from './types';

/**
* Inits the Vue SDK
*/
export function init(config: Partial<Omit<Options, 'tracingOptions'>> = {}): Client | undefined {
const options = {
_metadata: {
sdk: {
name: 'sentry.javascript.vue',
packages: [
{
name: 'npm:@sentry/vue',
version: SDK_VERSION,
},
],
version: SDK_VERSION,
},
},
defaultIntegrations: [...getDefaultIntegrations(config), vueIntegration()],
...config,
export function init(options: Partial<Omit<Options, 'tracingOptions'>> = {}): Client | undefined {
const opts = {
defaultIntegrations: [...getDefaultIntegrations(options), vueIntegration()],
...options,
};

return browserInit(options);
applySdkMetadata(opts, 'vue');

return browserInit(opts);
}
Loading