Skip to content

ref(core): Add @sentry/conventions to @sentry/core and align versions #21855

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

Open
Lms24 wants to merge 5 commits into
base: develop
Choose a base branch
from
+28 −24
Open

ref(core): Add @sentry/conventions to @sentry/core and align versions #21855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
053a18d
ref(core): Add `@sentry/conventions` to `@sentry/core` and align vers…
Lms24 Jun 30, 2026
507e715
replace some more hard-coded strings in core
Lms24 Jun 30, 2026
a2ad45e
adjust comment
Lms24 Jun 30, 2026
87e8390
bump to conventions 0.14.0
Lms24 Jun 30, 2026
af6a221
revert build config change
Lms24 Jun 30, 2026
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
2 changes: 1 addition & 1 deletion packages/aws-serverless/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@opentelemetry/instrumentation": "^0.214.0",
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"@sentry/node": "10.63.0",
"@sentry/node-core": "10.63.0",
Expand Down
3 changes: 3 additions & 0 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,8 @@
"sideEffects": false,
"devDependencies": {
"zod": "^3.24.1"
},
"dependencies": {
"@sentry/conventions": "^0.15.1"
}
}
2 changes: 1 addition & 1 deletion packages/core/src/semanticAttributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Use this attribute to represent the source of a span name.
* Must be one of: custom, url, route, view, component, task
* TODO(v11): rename this to sentry.span.source'
* TODO(v11): remove this export
*/
export const SEMANTIC_ATTRIBUTE_SENTRY_SOURCE = 'sentry.source';

Expand Down
5 changes: 3 additions & 2 deletions packages/core/src/tracing/dynamicSamplingContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { SENTRY_SPAN_SOURCE } from '@sentry/conventions/attributes';
import type { Client } from '../client';
import { DEFAULT_ENVIRONMENT } from '../constants';
import { getClient } from '../currentScopes';
Expand Down Expand Up @@ -137,8 +138,8 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly<Partial<
const dsc = getDynamicSamplingContextFromClient(span.spanContext().traceId, client);

// We don't want to have a transaction name in the DSC if the source is "url" because URLs might contain PII
// TODO(v11): Only read `SEMANTIC_ATTRIBUTE_SENTRY_SOURCE` again, once we renamed it to `sentry.span.source`
const source = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] ?? rootSpanAttributes['sentry.span.source'];
// TODO(v11): Only read `SENTRY_SPAN_SOURCE` once we removed `SEMANTIC_ATTRIBUTE_SENTRY_SOURCE`
const source = rootSpanAttributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] ?? rootSpanAttributes[SENTRY_SPAN_SOURCE];

// after JSON conversion, txn.name becomes jsonSpan.description
const name = rootSpanJson.description;
Expand Down
5 changes: 2 additions & 3 deletions packages/core/src/tracing/spans/captureSpan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { getCapturedScopesOnSpan } from '../utils';
import { isStreamedBeforeSendSpanCallback } from './beforeSendSpan';
import { scopeContextsToSpanAttributes } from './scopeContextAttributes';
import { DEFAULT_ENVIRONMENT } from '../../constants';
import { SENTRY_SPAN_SOURCE } from '@sentry/conventions/attributes';

export type SerializedStreamedSpanWithSegmentSpan = SerializedStreamedSpan & {
_segmentSpan: Span;
Expand Down Expand Up @@ -85,9 +86,7 @@ export function captureSpan(span: Span, client: Client): SerializedStreamedSpanW
const spanNameSource = processedSpan.attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
if (spanNameSource) {
safeSetSpanJSONAttributes(processedSpan, {
// Purposefully not using a constant defined here like in other attributes:
// This will be the name for SEMANTIC_ATTRIBUTE_SENTRY_SOURCE in v11
'sentry.span.source': spanNameSource,
[SENTRY_SPAN_SOURCE]: spanNameSource,
});
}

Expand Down
9 changes: 5 additions & 4 deletions packages/core/test/lib/tracing/spans/captureSpan.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
import { safeSetSpanJSONAttributes } from '../../../../src/tracing/spans/captureSpan';
import { scopeContextsToSpanAttributes } from '../../../../src/tracing/spans/scopeContextAttributes';
import { getDefaultTestClientOptions, TestClient } from '../../../mocks/client';
import { SENTRY_SPAN_SOURCE } from '@sentry/conventions/attributes';

describe('captureSpan', () => {
it.each([true, false, undefined])(
Expand Down Expand Up @@ -86,7 +87,7 @@ describe('captureSpan', () => {
value: span.spanContext().spanId,
type: 'string',
},
'sentry.span.source': {
[SENTRY_SPAN_SOURCE]: {
value: 'custom',
type: 'string',
},
Expand Down Expand Up @@ -187,7 +188,7 @@ describe('captureSpan', () => {
value: span.spanContext().spanId,
type: 'string',
},
'sentry.span.source': {
[SENTRY_SPAN_SOURCE]: {
value: 'custom',
type: 'string',
},
Expand Down Expand Up @@ -283,7 +284,7 @@ describe('captureSpan', () => {
value: span.spanContext().spanId,
type: 'string',
},
'sentry.span.source': {
[SENTRY_SPAN_SOURCE]: {
value: 'custom',
type: 'string',
},
Expand Down Expand Up @@ -348,7 +349,7 @@ describe('captureSpan', () => {
[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: { type: 'integer', value: 1 },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_NAME]: { value: 'my-span', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SEGMENT_ID]: { value: span.spanContext().spanId, type: 'string' },
'sentry.span.source': { value: 'custom', type: 'string' },
[SENTRY_SPAN_SOURCE]: { value: 'custom', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: { value: 'custom', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: { value: '1.0.0', type: 'string' },
[SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: { value: 'staging', type: 'string' },
Expand Down
2 changes: 1 addition & 1 deletion packages/nestjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@opentelemetry/instrumentation": "^0.214.0",
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"@sentry/node": "10.63.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@rollup/plugin-commonjs": "28.0.1",
"@sentry/browser-utils": "10.63.0",
"@sentry/bundler-plugin-core": "^5.3.0",
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"@sentry/node": "10.63.0",
"@sentry/opentelemetry": "10.63.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/node-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
}
},
"dependencies": {
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"@sentry/opentelemetry": "10.63.0",
"import-in-the-middle": "^3.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@opentelemetry/api": "^1.9.1",
"@opentelemetry/instrumentation": "^0.214.0",
"@opentelemetry/sdk-trace-base": "^2.6.1",
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"@sentry/node-core": "10.63.0",
"@sentry/opentelemetry": "10.63.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@opentelemetry/instrumentation": "^0.214.0",
"@sentry/browser": "10.63.0",
"@sentry/cli": "^2.58.6",
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"@sentry/node": "10.63.0",
"@sentry/react": "10.63.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/remix/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@opentelemetry/instrumentation": "^0.214.0",
"@remix-run/router": "^1.23.3",
"@sentry/cli": "^2.58.6",
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"@sentry/node": "10.63.0",
"@sentry/react": "10.63.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/server-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"@apm-js-collab/code-transformer-bundler-plugins": "^0.5.0",
"@apm-js-collab/code-transformer": "^0.15.0",
"@apm-js-collab/tracing-hooks": "^0.10.1",
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"magic-string": "~0.30.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/tanstackstart-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"dependencies": {
"@opentelemetry/api": "^1.9.1",
"@sentry/browser-utils": "10.63.0",
"@sentry/conventions": "^0.12.0",
"@sentry/conventions": "^0.15.1",
"@sentry/core": "10.63.0",
"@sentry/node": "10.63.0",
"@sentry/react": "10.63.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7482,10 +7482,10 @@
"@sentry/cli-win32-i686" "2.58.6"
"@sentry/cli-win32-x64" "2.58.6"

"@sentry/conventions@^0.12.0":
version "0.12.0"
resolved "https://registry.yarnpkg.com/@sentry/conventions/-/conventions-0.12.0.tgz#e963cf928ac4d1585b1dcc196e767df3ac45ca5c"
integrity sha512-z1JQrl/1SLY+8wpzvork6vl+fpsg/oCCxM7HWWhUnI/R+OGNyoIzieQuggX3uUMY7NBtp8UWCQx6FeFazzOF9g==
"@sentry/conventions@^0.15.1":
version "0.15.1"
resolved "https://registry.yarnpkg.com/@sentry/conventions/-/conventions-0.15.1.tgz#5b8888862d1e444678938f5afdd7842bca42f7cc"
integrity sha512-ZLP8bRdMON3prWE2tJyImuYscCxdcJeIPIhrOs/rgyFm3C1nCh1B6gdvPj3AZ5zW08oSFFCsq7T+tYEW3h8MNA==

"@sentry/node-cpu-profiler@^2.4.2":
version "2.4.2"
Expand Down
Loading