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
2 changes: 1 addition & 1 deletion dev-packages/browser-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@sentry/browser": "11.2.0",
"@sentry/replay": "11.2.0",
"@sentry/opentelemetry": "11.2.0",
"@sentry/conventions": "0.24.0",
"@sentry/conventions": "0.25.0",
"@supabase/supabase-js": "2.109.0",
"axios": "1.20.0",
"babel-loader": "^10.1.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { expect } from '@playwright/test';
import { extractTraceparentData, parseBaggageHeader, SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { extractTraceparentData, parseBaggageHeader } from '@sentry/core';
import { sentryTest } from '../../../../../../utils/fixtures';
import { shouldSkipTracingTest, waitForTracingHeadersOnUrl } from '../../../../../../utils/helpers';
import { getSpanOp, waitForStreamedSpanEnvelope } from '../../../../../../utils/spanUtils';
Expand Down Expand Up @@ -66,7 +67,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
span_id: customTraceSpan.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { expect } from '@playwright/test';
import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE } from '@sentry/browser';
import type { ClientReport } from '@sentry/core';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { sentryTest } from '../../../../../../utils/fixtures';
import {
envelopeRequestParser,
Expand Down Expand Up @@ -103,7 +103,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
expect(customTrace2Span.links).toEqual([
{
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down Expand Up @@ -136,7 +136,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
expect(navigationSpan.links).toEqual([
{
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
import { getSpanOp, waitForStreamedSpan } from '../../../../../utils/spanUtils';
Expand Down Expand Up @@ -27,7 +27,7 @@ sentryTest('manually started custom traces are linked correctly in the chain', a
span_id: pageloadSpan.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand All @@ -52,7 +52,7 @@ sentryTest('manually started custom traces are linked correctly in the chain', a
span_id: customTraceSpan.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
import { getSpanOp, waitForStreamedSpan } from '../../../../../utils/spanUtils';
Expand Down Expand Up @@ -33,7 +33,7 @@ sentryTest("navigation spans link back to previous trace's root span", async ({
span_id: pageloadSpan.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand All @@ -52,7 +52,7 @@ sentryTest("navigation spans link back to previous trace's root span", async ({
span_id: navigation1Span.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
import { getSpanOp, waitForStreamedSpan } from '../../../../../utils/spanUtils';
Expand Down Expand Up @@ -52,7 +52,7 @@ sentryTest(
span_id: pageloadSpan.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
import { getSpanOp, waitForStreamedSpan } from '../../../../../utils/spanUtils';
Expand Down Expand Up @@ -37,7 +37,7 @@ sentryTest(
span_id: pageloadSpan.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
import { getSpanOp, waitForStreamedSpan } from '../../../../../utils/spanUtils';
Expand All @@ -26,7 +26,7 @@ sentryTest('includes a span link to a previously negatively sampled span', async
span_id: expect.stringMatching(/[a-f\d]{16}/),
sampled: false,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
import { getSpanOp, waitForStreamedSpan } from '../../../../../utils/spanUtils';
Expand Down Expand Up @@ -30,7 +30,7 @@ sentryTest('adds link between hard page reloads when opting into sessionStorage'
span_id: pageload1Span.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: {
[SENTRY_LINK_TYPE]: {
type: 'string',
value: 'previous_trace',
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { expect } from '@playwright/test';
import {
extractTraceparentData,
parseBaggageHeader,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE,
} from '@sentry/core';
import { extractTraceparentData, parseBaggageHeader, SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE } from '@sentry/core';
import { sentryTest } from '../../../../../../utils/fixtures';
import {
eventAndTraceHeaderRequestParser,
Expand Down Expand Up @@ -76,7 +72,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
span_id: customTraceContext?.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
},
]);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';

Expand Down Expand Up @@ -31,7 +31,7 @@ sentryTest('manually started custom traces are linked correctly in the chain', a
span_id: pageloadTraceContext?.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
},
]);
Expand All @@ -54,7 +54,7 @@ sentryTest('manually started custom traces are linked correctly in the chain', a
span_id: customTrace1Context?.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
},
]);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';

Expand Down Expand Up @@ -43,7 +43,7 @@ sentryTest("navigation spans link back to previous trace's root span", async ({
span_id: pageloadTraceContext?.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
},
]);
Expand All @@ -58,7 +58,7 @@ sentryTest("navigation spans link back to previous trace's root span", async ({
span_id: navigation1TraceContext?.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
},
]);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';

Expand Down Expand Up @@ -61,7 +61,7 @@ sentryTest(
span_id: pageloadTraceContext?.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
},
]);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';

Expand Down Expand Up @@ -44,7 +44,7 @@ sentryTest(
span_id: pageloadTraceContext?.span_id,
sampled: true,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
},
]);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';

Expand Down Expand Up @@ -28,7 +28,7 @@ sentryTest('includes a span link to a previously negatively sampled span', async
span_id: expect.stringMatching(/[a-f\d]{16}/),
sampled: false,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
},
]);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
import { SENTRY_LINK_TYPE } from '@sentry/conventions/attributes';
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';

Expand Down Expand Up @@ -31,7 +31,7 @@ sentryTest('adds link between hard page reloads when opting into sessionStorage'
trace_id: pageload1TraceContext?.trace_id,
span_id: pageload1TraceContext?.span_id,
sampled: true,
attributes: { [SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace' },
attributes: { [SENTRY_LINK_TYPE]: 'previous_trace' },
},
]);

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/cloudflare-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@cloudflare/workers-types": "^4.20260426.0",
"@cloudflare/workers-types-v5": "npm:@cloudflare/workers-types@5.20260710.1",
"@sentry-internal/test-utils": "11.2.0",
"@sentry/conventions": "0.24.0",
"@sentry/conventions": "0.25.0",
"eslint-plugin-regexp": "^3.1.0",
"prisma": "6.15.0",
"vite": "^8.3.1",
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/node-integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
},
"devDependencies": {
"@opentelemetry/instrumentation-http": "0.220.0",
"@sentry/conventions": "0.24.0",
"@sentry/conventions": "0.25.0",
"@sentry-internal/test-utils": "11.2.0",
"@types/amqplib": "^0.10.5",
"@types/node-cron": "^3.0.11",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"dependencies": {
"@sentry/browser": "11.2.0",
"@sentry/core": "11.2.0",
"@sentry/conventions": "^0.24.0",
"@sentry/conventions": "^0.25.0",
"tslib": "^2.4.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"dependencies": {
"@sentry/browser": "11.2.0",
"@sentry/core": "11.2.0",
"@sentry/conventions": "^0.24.0",
"@sentry/conventions": "^0.25.0",
"@sentry/node": "11.2.0",
"@sentry/server-runtime-injection": "11.2.0",
"@sentry/server-utils": "11.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-serverless/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"access": "public"
},
"dependencies": {
"@sentry/conventions": "^0.24.0",
"@sentry/conventions": "^0.25.0",
"@sentry/core": "11.2.0",
"@sentry/node": "11.2.0",
"@sentry/server-runtime-injection": "11.2.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/browser-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@sentry/core": "11.2.0",
"@sentry/conventions": "^0.24.0",
"@sentry/conventions": "^0.25.0",
"web-vitals": "^6.1.1"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@sentry/browser-utils": "11.2.0",
"@sentry/conventions": "^0.24.0",
"@sentry/conventions": "^0.25.0",
"@sentry/feedback": "11.2.0",
"@sentry/replay": "11.2.0",
"@sentry/replay-canvas": "11.2.0",
Expand Down
5 changes: 2 additions & 3 deletions packages/browser/src/tracing/linkedTraces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ import {
getRootSpan,
SEMANTIC_ATTRIBUTE_SENTRY_PREVIOUS_TRACE_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE,
spanToJSON,
} from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
import { WINDOW } from '../exports';
import { SENTRY_OP } from '@sentry/conventions/attributes';
import { SENTRY_LINK_TYPE, SENTRY_OP } from '@sentry/conventions/attributes';

export interface PreviousTraceInfo {
/**
Expand Down Expand Up @@ -188,7 +187,7 @@ export function addPreviousTraceSpanLink(
span.addLink({
context: previousTraceSpanCtx,
attributes: {
[SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
[SENTRY_LINK_TYPE]: 'previous_trace',
},
});

Expand Down
2 changes: 1 addition & 1 deletion packages/bun/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"dependencies": {
"@sentry/core": "11.2.0",
"@sentry/conventions": "^0.24.0",
"@sentry/conventions": "^0.25.0",
"@sentry/node": "11.2.0",
"@sentry/server-utils": "11.2.0"
},
Expand Down
Loading
Loading