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
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export { handleCallbackErrors } from './utils/handleCallbackErrors';
export { parameterize } from './utils/parameterize';
export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
export {
convertSpanLinksForEnvelope,
spanToTraceHeader,
spanToJSON,
spanIsSampled,
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentryNonRecordingSpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,24 +69,12 @@ export class SentryNonRecordingSpan implements Span {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentrySpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,24 +109,12 @@ export class SentrySpan implements Span {
}
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/core/src/types-hoist/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import type { SpanAttributeValue, SpanContextData } from './span';

type SpanLinkAttributes = {
/**
* Setting the link type to 'previous_trace' helps the Sentry product linking to the previous trace
*/
'sentry.link.type'?: string | 'previous_trace';
} & Record<string, SpanAttributeValue | undefined>;

export interface SpanLink {
/**
* Contains the SpanContext of the span to link to
*/
context: SpanContextData;
/**
* A key-value pair with primitive values or an array of primitive values
*/
attributes?: SpanLinkAttributes;
}

/**
* Link interface for the event envelope item. It's a flattened representation of `SpanLink`.
* Can include additional fields defined by OTel.
*/
export interface SpanLinkJSON extends Record<string, unknown> {
span_id: string;
trace_id: string;
sampled?: boolean;
attributes?: SpanLinkAttributes;
}
17 changes: 13 additions & 4 deletions packages/core/src/types-hoist/span.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { SpanLink, SpanLinkJSON } from './link';
import type { Measurements } from './measurement';
import type { HrTime } from './opentelemetry';
import type { SpanStatus } from './spanStatus';
Expand DownExpand Up@@ -50,6 +51,7 @@ export interface SpanJSON {
measurements?: Measurements;
is_segment?: boolean;
segment_id?: string;
links?: SpanLinkJSON[];
}

// These are aligned with OpenTelemetry trace flags
Expand DownExpand Up@@ -249,14 +251,21 @@ export interface Span {
addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with a related span. Links can reference spans from the same or different trace
* and are typically used for batch operations, cross-trace scenarios, or scatter/gather patterns.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param link - The link containing the context of the span to link to and optional attributes
*/
addLink(link: unknown): this;
addLink(link: SpanLink): this;
Comment thread
Lms24 marked this conversation as resolved.

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with multiple related spans. See {@link addLink} for more details.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param links - Array of links to associate with this span
*/
addLinks(links: unknown): this;
addLinks(links: SpanLink[]): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/utils/spanUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import type {
SpanTimeInput,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
Expand DownExpand Up@@ -81,6 +82,25 @@ export function spanToTraceHeader(span: Span): string {
return generateSentryTraceHeader(traceId, spanId, sampled);
}

/**
* Converts the span links array to a flattened version to be sent within an envelope.
*
* If the links array is empty, it returns `undefined` so the empty value can be dropped before it's sent.
*/
export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[] | undefined {
if (links && links.length > 0) {
return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
span_id: spanId,
trace_id: traceId,
sampled: traceFlags === TRACE_FLAG_SAMPLED,
attributes,
...restContext,
}));
} else {
return undefined;
}
}

/**
* Convert a span time input into a timestamp in seconds.
*/
Expand Down
112 changes: 112 additions & 0 deletions packages/core/test/lib/utils/spanUtils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,17 @@ import {
SPAN_STATUS_UNSET,
SentrySpan,
TRACEPARENT_REGEXP,
convertSpanLinksForEnvelope,
setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
} from '../../../src';
import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
import {
getRootSpan,
spanIsSampled,
Expand DownExpand Up@@ -156,6 +159,115 @@ describe('spanToTraceContext', () => {
});
});

describe('convertSpanLinksForEnvelope', () => {
it('returns undefined for undefined input', () => {
expect(convertSpanLinksForEnvelope(undefined)).toBeUndefined();
});

it('returns undefined for empty array input', () => {
expect(convertSpanLinksForEnvelope([])).toBeUndefined();
});

it('converts a single span link to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
]);
});

it('converts multiple span links to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
context: {
spanId: 'span2',
traceId: 'trace2',
traceFlags: TRACE_FLAG_NONE,
},
attributes: {
'sentry.link.type': 'another_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
span_id: 'span2',
trace_id: 'trace2',
sampled: false,
attributes: {
'sentry.link.type': 'another_trace',
},
},
]);
});

it('handles span links without attributes', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
},
]);
});
});

describe('spanTimeInputToSeconds', () => {
it('works with undefined', () => {
const now = timestampInSeconds();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export { handleCallbackErrors } from './utils/handleCallbackErrors';
export { parameterize } from './utils/parameterize';
export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
export {
convertSpanLinksForEnvelope,
spanToTraceHeader,
spanToJSON,
spanIsSampled,
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentryNonRecordingSpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,24 +69,12 @@ export class SentryNonRecordingSpan implements Span {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentrySpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,24 +109,12 @@ export class SentrySpan implements Span {
}
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/core/src/types-hoist/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import type { SpanAttributeValue, SpanContextData } from './span';

type SpanLinkAttributes = {
/**
* Setting the link type to 'previous_trace' helps the Sentry product linking to the previous trace
*/
'sentry.link.type'?: string | 'previous_trace';
} & Record<string, SpanAttributeValue | undefined>;

export interface SpanLink {
/**
* Contains the SpanContext of the span to link to
*/
context: SpanContextData;
/**
* A key-value pair with primitive values or an array of primitive values
*/
attributes?: SpanLinkAttributes;
}

/**
* Link interface for the event envelope item. It's a flattened representation of `SpanLink`.
* Can include additional fields defined by OTel.
*/
export interface SpanLinkJSON extends Record<string, unknown> {
span_id: string;
trace_id: string;
sampled?: boolean;
attributes?: SpanLinkAttributes;
}
17 changes: 13 additions & 4 deletions packages/core/src/types-hoist/span.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { SpanLink, SpanLinkJSON } from './link';
import type { Measurements } from './measurement';
import type { HrTime } from './opentelemetry';
import type { SpanStatus } from './spanStatus';
Expand DownExpand Up@@ -50,6 +51,7 @@ export interface SpanJSON {
measurements?: Measurements;
is_segment?: boolean;
segment_id?: string;
links?: SpanLinkJSON[];
}

// These are aligned with OpenTelemetry trace flags
Expand DownExpand Up@@ -249,14 +251,21 @@ export interface Span {
addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with a related span. Links can reference spans from the same or different trace
* and are typically used for batch operations, cross-trace scenarios, or scatter/gather patterns.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param link - The link containing the context of the span to link to and optional attributes
*/
addLink(link: unknown): this;
addLink(link: SpanLink): this;
Comment thread
Lms24 marked this conversation as resolved.

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with multiple related spans. See {@link addLink} for more details.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param links - Array of links to associate with this span
*/
addLinks(links: unknown): this;
addLinks(links: SpanLink[]): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/utils/spanUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import type {
SpanTimeInput,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
Expand DownExpand Up@@ -81,6 +82,25 @@ export function spanToTraceHeader(span: Span): string {
return generateSentryTraceHeader(traceId, spanId, sampled);
}

/**
* Converts the span links array to a flattened version to be sent within an envelope.
*
* If the links array is empty, it returns `undefined` so the empty value can be dropped before it's sent.
*/
export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[] | undefined {
if (links && links.length > 0) {
return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
span_id: spanId,
trace_id: traceId,
sampled: traceFlags === TRACE_FLAG_SAMPLED,
attributes,
...restContext,
}));
} else {
return undefined;
}
}

/**
* Convert a span time input into a timestamp in seconds.
*/
Expand Down
112 changes: 112 additions & 0 deletions packages/core/test/lib/utils/spanUtils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,17 @@ import {
SPAN_STATUS_UNSET,
SentrySpan,
TRACEPARENT_REGEXP,
convertSpanLinksForEnvelope,
setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
} from '../../../src';
import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
import {
getRootSpan,
spanIsSampled,
Expand DownExpand Up@@ -156,6 +159,115 @@ describe('spanToTraceContext', () => {
});
});

describe('convertSpanLinksForEnvelope', () => {
it('returns undefined for undefined input', () => {
expect(convertSpanLinksForEnvelope(undefined)).toBeUndefined();
});

it('returns undefined for empty array input', () => {
expect(convertSpanLinksForEnvelope([])).toBeUndefined();
});

it('converts a single span link to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
]);
});

it('converts multiple span links to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
context: {
spanId: 'span2',
traceId: 'trace2',
traceFlags: TRACE_FLAG_NONE,
},
attributes: {
'sentry.link.type': 'another_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
span_id: 'span2',
trace_id: 'trace2',
sampled: false,
attributes: {
'sentry.link.type': 'another_trace',
},
},
]);
});

it('handles span links without attributes', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
},
]);
});
});

describe('spanTimeInputToSeconds', () => {
it('works with undefined', () => {
const now = timestampInSeconds();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export { handleCallbackErrors } from './utils/handleCallbackErrors';
export { parameterize } from './utils/parameterize';
export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
export {
convertSpanLinksForEnvelope,
spanToTraceHeader,
spanToJSON,
spanIsSampled,
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentryNonRecordingSpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,24 +69,12 @@ export class SentryNonRecordingSpan implements Span {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentrySpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,24 +109,12 @@ export class SentrySpan implements Span {
}
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/core/src/types-hoist/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import type { SpanAttributeValue, SpanContextData } from './span';

type SpanLinkAttributes = {
/**
* Setting the link type to 'previous_trace' helps the Sentry product linking to the previous trace
*/
'sentry.link.type'?: string | 'previous_trace';
} & Record<string, SpanAttributeValue | undefined>;

export interface SpanLink {
/**
* Contains the SpanContext of the span to link to
*/
context: SpanContextData;
/**
* A key-value pair with primitive values or an array of primitive values
*/
attributes?: SpanLinkAttributes;
}

/**
* Link interface for the event envelope item. It's a flattened representation of `SpanLink`.
* Can include additional fields defined by OTel.
*/
export interface SpanLinkJSON extends Record<string, unknown> {
span_id: string;
trace_id: string;
sampled?: boolean;
attributes?: SpanLinkAttributes;
}
17 changes: 13 additions & 4 deletions packages/core/src/types-hoist/span.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { SpanLink, SpanLinkJSON } from './link';
import type { Measurements } from './measurement';
import type { HrTime } from './opentelemetry';
import type { SpanStatus } from './spanStatus';
Expand DownExpand Up@@ -50,6 +51,7 @@ export interface SpanJSON {
measurements?: Measurements;
is_segment?: boolean;
segment_id?: string;
links?: SpanLinkJSON[];
}

// These are aligned with OpenTelemetry trace flags
Expand DownExpand Up@@ -249,14 +251,21 @@ export interface Span {
addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with a related span. Links can reference spans from the same or different trace
* and are typically used for batch operations, cross-trace scenarios, or scatter/gather patterns.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param link - The link containing the context of the span to link to and optional attributes
*/
addLink(link: unknown): this;
addLink(link: SpanLink): this;
Comment thread
Lms24 marked this conversation as resolved.

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with multiple related spans. See {@link addLink} for more details.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param links - Array of links to associate with this span
*/
addLinks(links: unknown): this;
addLinks(links: SpanLink[]): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/utils/spanUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import type {
SpanTimeInput,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
Expand DownExpand Up@@ -81,6 +82,25 @@ export function spanToTraceHeader(span: Span): string {
return generateSentryTraceHeader(traceId, spanId, sampled);
}

/**
* Converts the span links array to a flattened version to be sent within an envelope.
*
* If the links array is empty, it returns `undefined` so the empty value can be dropped before it's sent.
*/
export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[] | undefined {
if (links && links.length > 0) {
return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
span_id: spanId,
trace_id: traceId,
sampled: traceFlags === TRACE_FLAG_SAMPLED,
attributes,
...restContext,
}));
} else {
return undefined;
}
}

/**
* Convert a span time input into a timestamp in seconds.
*/
Expand Down
112 changes: 112 additions & 0 deletions packages/core/test/lib/utils/spanUtils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,17 @@ import {
SPAN_STATUS_UNSET,
SentrySpan,
TRACEPARENT_REGEXP,
convertSpanLinksForEnvelope,
setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
} from '../../../src';
import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
import {
getRootSpan,
spanIsSampled,
Expand DownExpand Up@@ -156,6 +159,115 @@ describe('spanToTraceContext', () => {
});
});

describe('convertSpanLinksForEnvelope', () => {
it('returns undefined for undefined input', () => {
expect(convertSpanLinksForEnvelope(undefined)).toBeUndefined();
});

it('returns undefined for empty array input', () => {
expect(convertSpanLinksForEnvelope([])).toBeUndefined();
});

it('converts a single span link to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
]);
});

it('converts multiple span links to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
context: {
spanId: 'span2',
traceId: 'trace2',
traceFlags: TRACE_FLAG_NONE,
},
attributes: {
'sentry.link.type': 'another_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
span_id: 'span2',
trace_id: 'trace2',
sampled: false,
attributes: {
'sentry.link.type': 'another_trace',
},
},
]);
});

it('handles span links without attributes', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
},
]);
});
});

describe('spanTimeInputToSeconds', () => {
it('works with undefined', () => {
const now = timestampInSeconds();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export { handleCallbackErrors } from './utils/handleCallbackErrors';
export { parameterize } from './utils/parameterize';
export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
export {
convertSpanLinksForEnvelope,
spanToTraceHeader,
spanToJSON,
spanIsSampled,
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentryNonRecordingSpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,24 +69,12 @@ export class SentryNonRecordingSpan implements Span {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentrySpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,24 +109,12 @@ export class SentrySpan implements Span {
}
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/core/src/types-hoist/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import type { SpanAttributeValue, SpanContextData } from './span';

type SpanLinkAttributes = {
/**
* Setting the link type to 'previous_trace' helps the Sentry product linking to the previous trace
*/
'sentry.link.type'?: string | 'previous_trace';
} & Record<string, SpanAttributeValue | undefined>;

export interface SpanLink {
/**
* Contains the SpanContext of the span to link to
*/
context: SpanContextData;
/**
* A key-value pair with primitive values or an array of primitive values
*/
attributes?: SpanLinkAttributes;
}

/**
* Link interface for the event envelope item. It's a flattened representation of `SpanLink`.
* Can include additional fields defined by OTel.
*/
export interface SpanLinkJSON extends Record<string, unknown> {
span_id: string;
trace_id: string;
sampled?: boolean;
attributes?: SpanLinkAttributes;
}
17 changes: 13 additions & 4 deletions packages/core/src/types-hoist/span.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { SpanLink, SpanLinkJSON } from './link';
import type { Measurements } from './measurement';
import type { HrTime } from './opentelemetry';
import type { SpanStatus } from './spanStatus';
Expand DownExpand Up@@ -50,6 +51,7 @@ export interface SpanJSON {
measurements?: Measurements;
is_segment?: boolean;
segment_id?: string;
links?: SpanLinkJSON[];
}

// These are aligned with OpenTelemetry trace flags
Expand DownExpand Up@@ -249,14 +251,21 @@ export interface Span {
addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with a related span. Links can reference spans from the same or different trace
* and are typically used for batch operations, cross-trace scenarios, or scatter/gather patterns.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param link - The link containing the context of the span to link to and optional attributes
*/
addLink(link: unknown): this;
addLink(link: SpanLink): this;
Comment thread
Lms24 marked this conversation as resolved.

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with multiple related spans. See {@link addLink} for more details.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param links - Array of links to associate with this span
*/
addLinks(links: unknown): this;
addLinks(links: SpanLink[]): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/utils/spanUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import type {
SpanTimeInput,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
Expand DownExpand Up@@ -81,6 +82,25 @@ export function spanToTraceHeader(span: Span): string {
return generateSentryTraceHeader(traceId, spanId, sampled);
}

/**
* Converts the span links array to a flattened version to be sent within an envelope.
*
* If the links array is empty, it returns `undefined` so the empty value can be dropped before it's sent.
*/
export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[] | undefined {
if (links && links.length > 0) {
return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
span_id: spanId,
trace_id: traceId,
sampled: traceFlags === TRACE_FLAG_SAMPLED,
attributes,
...restContext,
}));
} else {
return undefined;
}
}

/**
* Convert a span time input into a timestamp in seconds.
*/
Expand Down
112 changes: 112 additions & 0 deletions packages/core/test/lib/utils/spanUtils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,17 @@ import {
SPAN_STATUS_UNSET,
SentrySpan,
TRACEPARENT_REGEXP,
convertSpanLinksForEnvelope,
setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
} from '../../../src';
import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
import {
getRootSpan,
spanIsSampled,
Expand DownExpand Up@@ -156,6 +159,115 @@ describe('spanToTraceContext', () => {
});
});

describe('convertSpanLinksForEnvelope', () => {
it('returns undefined for undefined input', () => {
expect(convertSpanLinksForEnvelope(undefined)).toBeUndefined();
});

it('returns undefined for empty array input', () => {
expect(convertSpanLinksForEnvelope([])).toBeUndefined();
});

it('converts a single span link to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
]);
});

it('converts multiple span links to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
context: {
spanId: 'span2',
traceId: 'trace2',
traceFlags: TRACE_FLAG_NONE,
},
attributes: {
'sentry.link.type': 'another_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
span_id: 'span2',
trace_id: 'trace2',
sampled: false,
attributes: {
'sentry.link.type': 'another_trace',
},
},
]);
});

it('handles span links without attributes', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
},
]);
});
});

describe('spanTimeInputToSeconds', () => {
it('works with undefined', () => {
const now = timestampInSeconds();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export { handleCallbackErrors } from './utils/handleCallbackErrors';
export { parameterize } from './utils/parameterize';
export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
export {
convertSpanLinksForEnvelope,
spanToTraceHeader,
spanToJSON,
spanIsSampled,
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentryNonRecordingSpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,24 +69,12 @@ export class SentryNonRecordingSpan implements Span {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentrySpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,24 +109,12 @@ export class SentrySpan implements Span {
}
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/core/src/types-hoist/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import type { SpanAttributeValue, SpanContextData } from './span';

type SpanLinkAttributes = {
/**
* Setting the link type to 'previous_trace' helps the Sentry product linking to the previous trace
*/
'sentry.link.type'?: string | 'previous_trace';
} & Record<string, SpanAttributeValue | undefined>;

export interface SpanLink {
/**
* Contains the SpanContext of the span to link to
*/
context: SpanContextData;
/**
* A key-value pair with primitive values or an array of primitive values
*/
attributes?: SpanLinkAttributes;
}

/**
* Link interface for the event envelope item. It's a flattened representation of `SpanLink`.
* Can include additional fields defined by OTel.
*/
export interface SpanLinkJSON extends Record<string, unknown> {
span_id: string;
trace_id: string;
sampled?: boolean;
attributes?: SpanLinkAttributes;
}
17 changes: 13 additions & 4 deletions packages/core/src/types-hoist/span.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { SpanLink, SpanLinkJSON } from './link';
import type { Measurements } from './measurement';
import type { HrTime } from './opentelemetry';
import type { SpanStatus } from './spanStatus';
Expand DownExpand Up@@ -50,6 +51,7 @@ export interface SpanJSON {
measurements?: Measurements;
is_segment?: boolean;
segment_id?: string;
links?: SpanLinkJSON[];
}

// These are aligned with OpenTelemetry trace flags
Expand DownExpand Up@@ -249,14 +251,21 @@ export interface Span {
addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with a related span. Links can reference spans from the same or different trace
* and are typically used for batch operations, cross-trace scenarios, or scatter/gather patterns.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param link - The link containing the context of the span to link to and optional attributes
*/
addLink(link: unknown): this;
addLink(link: SpanLink): this;
Comment thread
Lms24 marked this conversation as resolved.

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with multiple related spans. See {@link addLink} for more details.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param links - Array of links to associate with this span
*/
addLinks(links: unknown): this;
addLinks(links: SpanLink[]): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/utils/spanUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import type {
SpanTimeInput,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
Expand DownExpand Up@@ -81,6 +82,25 @@ export function spanToTraceHeader(span: Span): string {
return generateSentryTraceHeader(traceId, spanId, sampled);
}

/**
* Converts the span links array to a flattened version to be sent within an envelope.
*
* If the links array is empty, it returns `undefined` so the empty value can be dropped before it's sent.
*/
export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[] | undefined {
if (links && links.length > 0) {
return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
span_id: spanId,
trace_id: traceId,
sampled: traceFlags === TRACE_FLAG_SAMPLED,
attributes,
...restContext,
}));
} else {
return undefined;
}
}

/**
* Convert a span time input into a timestamp in seconds.
*/
Expand Down
112 changes: 112 additions & 0 deletions packages/core/test/lib/utils/spanUtils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,17 @@ import {
SPAN_STATUS_UNSET,
SentrySpan,
TRACEPARENT_REGEXP,
convertSpanLinksForEnvelope,
setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
} from '../../../src';
import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
import {
getRootSpan,
spanIsSampled,
Expand DownExpand Up@@ -156,6 +159,115 @@ describe('spanToTraceContext', () => {
});
});

describe('convertSpanLinksForEnvelope', () => {
it('returns undefined for undefined input', () => {
expect(convertSpanLinksForEnvelope(undefined)).toBeUndefined();
});

it('returns undefined for empty array input', () => {
expect(convertSpanLinksForEnvelope([])).toBeUndefined();
});

it('converts a single span link to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
]);
});

it('converts multiple span links to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
context: {
spanId: 'span2',
traceId: 'trace2',
traceFlags: TRACE_FLAG_NONE,
},
attributes: {
'sentry.link.type': 'another_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
span_id: 'span2',
trace_id: 'trace2',
sampled: false,
attributes: {
'sentry.link.type': 'another_trace',
},
},
]);
});

it('handles span links without attributes', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
},
]);
});
});

describe('spanTimeInputToSeconds', () => {
it('works with undefined', () => {
const now = timestampInSeconds();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export { handleCallbackErrors } from './utils/handleCallbackErrors';
export { parameterize } from './utils/parameterize';
export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
export {
convertSpanLinksForEnvelope,
spanToTraceHeader,
spanToJSON,
spanIsSampled,
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentryNonRecordingSpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,24 +69,12 @@ export class SentryNonRecordingSpan implements Span {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentrySpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,24 +109,12 @@ export class SentrySpan implements Span {
}
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/core/src/types-hoist/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import type { SpanAttributeValue, SpanContextData } from './span';

type SpanLinkAttributes = {
/**
* Setting the link type to 'previous_trace' helps the Sentry product linking to the previous trace
*/
'sentry.link.type'?: string | 'previous_trace';
} & Record<string, SpanAttributeValue | undefined>;

export interface SpanLink {
/**
* Contains the SpanContext of the span to link to
*/
context: SpanContextData;
/**
* A key-value pair with primitive values or an array of primitive values
*/
attributes?: SpanLinkAttributes;
}

/**
* Link interface for the event envelope item. It's a flattened representation of `SpanLink`.
* Can include additional fields defined by OTel.
*/
export interface SpanLinkJSON extends Record<string, unknown> {
span_id: string;
trace_id: string;
sampled?: boolean;
attributes?: SpanLinkAttributes;
}
17 changes: 13 additions & 4 deletions packages/core/src/types-hoist/span.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { SpanLink, SpanLinkJSON } from './link';
import type { Measurements } from './measurement';
import type { HrTime } from './opentelemetry';
import type { SpanStatus } from './spanStatus';
Expand DownExpand Up@@ -50,6 +51,7 @@ export interface SpanJSON {
measurements?: Measurements;
is_segment?: boolean;
segment_id?: string;
links?: SpanLinkJSON[];
}

// These are aligned with OpenTelemetry trace flags
Expand DownExpand Up@@ -249,14 +251,21 @@ export interface Span {
addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with a related span. Links can reference spans from the same or different trace
* and are typically used for batch operations, cross-trace scenarios, or scatter/gather patterns.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param link - The link containing the context of the span to link to and optional attributes
*/
addLink(link: unknown): this;
addLink(link: SpanLink): this;
Comment thread
Lms24 marked this conversation as resolved.

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with multiple related spans. See {@link addLink} for more details.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param links - Array of links to associate with this span
*/
addLinks(links: unknown): this;
addLinks(links: SpanLink[]): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/utils/spanUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import type {
SpanTimeInput,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
Expand DownExpand Up@@ -81,6 +82,25 @@ export function spanToTraceHeader(span: Span): string {
return generateSentryTraceHeader(traceId, spanId, sampled);
}

/**
* Converts the span links array to a flattened version to be sent within an envelope.
*
* If the links array is empty, it returns `undefined` so the empty value can be dropped before it's sent.
*/
export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[] | undefined {
if (links && links.length > 0) {
return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
span_id: spanId,
trace_id: traceId,
sampled: traceFlags === TRACE_FLAG_SAMPLED,
attributes,
...restContext,
}));
} else {
return undefined;
}
}

/**
* Convert a span time input into a timestamp in seconds.
*/
Expand Down
112 changes: 112 additions & 0 deletions packages/core/test/lib/utils/spanUtils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,17 @@ import {
SPAN_STATUS_UNSET,
SentrySpan,
TRACEPARENT_REGEXP,
convertSpanLinksForEnvelope,
setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
} from '../../../src';
import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
import {
getRootSpan,
spanIsSampled,
Expand DownExpand Up@@ -156,6 +159,115 @@ describe('spanToTraceContext', () => {
});
});

describe('convertSpanLinksForEnvelope', () => {
it('returns undefined for undefined input', () => {
expect(convertSpanLinksForEnvelope(undefined)).toBeUndefined();
});

it('returns undefined for empty array input', () => {
expect(convertSpanLinksForEnvelope([])).toBeUndefined();
});

it('converts a single span link to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
]);
});

it('converts multiple span links to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
context: {
spanId: 'span2',
traceId: 'trace2',
traceFlags: TRACE_FLAG_NONE,
},
attributes: {
'sentry.link.type': 'another_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
span_id: 'span2',
trace_id: 'trace2',
sampled: false,
attributes: {
'sentry.link.type': 'another_trace',
},
},
]);
});

it('handles span links without attributes', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
},
]);
});
});

describe('spanTimeInputToSeconds', () => {
it('works with undefined', () => {
const now = timestampInSeconds();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export { handleCallbackErrors } from './utils/handleCallbackErrors';
export { parameterize } from './utils/parameterize';
export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
export {
convertSpanLinksForEnvelope,
spanToTraceHeader,
spanToJSON,
spanIsSampled,
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentryNonRecordingSpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,24 +69,12 @@ export class SentryNonRecordingSpan implements Span {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentrySpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,24 +109,12 @@ export class SentrySpan implements Span {
}
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/core/src/types-hoist/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import type { SpanAttributeValue, SpanContextData } from './span';

type SpanLinkAttributes = {
/**
* Setting the link type to 'previous_trace' helps the Sentry product linking to the previous trace
*/
'sentry.link.type'?: string | 'previous_trace';
} & Record<string, SpanAttributeValue | undefined>;

export interface SpanLink {
/**
* Contains the SpanContext of the span to link to
*/
context: SpanContextData;
/**
* A key-value pair with primitive values or an array of primitive values
*/
attributes?: SpanLinkAttributes;
}

/**
* Link interface for the event envelope item. It's a flattened representation of `SpanLink`.
* Can include additional fields defined by OTel.
*/
export interface SpanLinkJSON extends Record<string, unknown> {
span_id: string;
trace_id: string;
sampled?: boolean;
attributes?: SpanLinkAttributes;
}
17 changes: 13 additions & 4 deletions packages/core/src/types-hoist/span.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { SpanLink, SpanLinkJSON } from './link';
import type { Measurements } from './measurement';
import type { HrTime } from './opentelemetry';
import type { SpanStatus } from './spanStatus';
Expand DownExpand Up@@ -50,6 +51,7 @@ export interface SpanJSON {
measurements?: Measurements;
is_segment?: boolean;
segment_id?: string;
links?: SpanLinkJSON[];
}

// These are aligned with OpenTelemetry trace flags
Expand DownExpand Up@@ -249,14 +251,21 @@ export interface Span {
addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with a related span. Links can reference spans from the same or different trace
* and are typically used for batch operations, cross-trace scenarios, or scatter/gather patterns.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param link - The link containing the context of the span to link to and optional attributes
*/
addLink(link: unknown): this;
addLink(link: SpanLink): this;
Comment thread
Lms24 marked this conversation as resolved.

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with multiple related spans. See {@link addLink} for more details.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param links - Array of links to associate with this span
*/
addLinks(links: unknown): this;
addLinks(links: SpanLink[]): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/utils/spanUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import type {
SpanTimeInput,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
Expand DownExpand Up@@ -81,6 +82,25 @@ export function spanToTraceHeader(span: Span): string {
return generateSentryTraceHeader(traceId, spanId, sampled);
}

/**
* Converts the span links array to a flattened version to be sent within an envelope.
*
* If the links array is empty, it returns `undefined` so the empty value can be dropped before it's sent.
*/
export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[] | undefined {
if (links && links.length > 0) {
return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
span_id: spanId,
trace_id: traceId,
sampled: traceFlags === TRACE_FLAG_SAMPLED,
attributes,
...restContext,
}));
} else {
return undefined;
}
}

/**
* Convert a span time input into a timestamp in seconds.
*/
Expand Down
112 changes: 112 additions & 0 deletions packages/core/test/lib/utils/spanUtils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,17 @@ import {
SPAN_STATUS_UNSET,
SentrySpan,
TRACEPARENT_REGEXP,
convertSpanLinksForEnvelope,
setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
} from '../../../src';
import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
import {
getRootSpan,
spanIsSampled,
Expand DownExpand Up@@ -156,6 +159,115 @@ describe('spanToTraceContext', () => {
});
});

describe('convertSpanLinksForEnvelope', () => {
it('returns undefined for undefined input', () => {
expect(convertSpanLinksForEnvelope(undefined)).toBeUndefined();
});

it('returns undefined for empty array input', () => {
expect(convertSpanLinksForEnvelope([])).toBeUndefined();
});

it('converts a single span link to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
]);
});

it('converts multiple span links to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
context: {
spanId: 'span2',
traceId: 'trace2',
traceFlags: TRACE_FLAG_NONE,
},
attributes: {
'sentry.link.type': 'another_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
span_id: 'span2',
trace_id: 'trace2',
sampled: false,
attributes: {
'sentry.link.type': 'another_trace',
},
},
]);
});

it('handles span links without attributes', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
},
]);
});
});

describe('spanTimeInputToSeconds', () => {
it('works with undefined', () => {
const now = timestampInSeconds();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
1 change: 1 addition & 0 deletions packages/core/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,6 +76,7 @@ export { handleCallbackErrors } from './utils/handleCallbackErrors';
export { parameterize } from './utils/parameterize';
export { addAutoIpAddressToSession, addAutoIpAddressToUser } from './utils/ipAddress';
export {
convertSpanLinksForEnvelope,
spanToTraceHeader,
spanToJSON,
spanIsSampled,
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentryNonRecordingSpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,24 +69,12 @@ export class SentryNonRecordingSpan implements Span {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but we need it for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
16 changes: 2 additions & 14 deletions packages/core/src/tracing/sentrySpan.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,24 +109,12 @@ export class SentrySpan implements Span {
}
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLink(_link: unknown): this {
return this;
}

/**
* This should generally not be used,
* but it is needed for being compliant with the OTEL Span interface.
*
* @hidden
* @internal
*/
/** @inheritDoc */
public addLinks(_links: unknown[]): this {
return this;
}
Expand Down
30 changes: 30 additions & 0 deletions packages/core/src/types-hoist/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
import type { SpanAttributeValue, SpanContextData } from './span';

type SpanLinkAttributes = {
/**
* Setting the link type to 'previous_trace' helps the Sentry product linking to the previous trace
*/
'sentry.link.type'?: string | 'previous_trace';
} & Record<string, SpanAttributeValue | undefined>;

export interface SpanLink {
/**
* Contains the SpanContext of the span to link to
*/
context: SpanContextData;
/**
* A key-value pair with primitive values or an array of primitive values
*/
attributes?: SpanLinkAttributes;
}

/**
* Link interface for the event envelope item. It's a flattened representation of `SpanLink`.
* Can include additional fields defined by OTel.
*/
export interface SpanLinkJSON extends Record<string, unknown> {
span_id: string;
trace_id: string;
sampled?: boolean;
attributes?: SpanLinkAttributes;
}
17 changes: 13 additions & 4 deletions packages/core/src/types-hoist/span.ts
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
import type { SpanLink, SpanLinkJSON } from './link';
import type { Measurements } from './measurement';
import type { HrTime } from './opentelemetry';
import type { SpanStatus } from './spanStatus';
Expand DownExpand Up@@ -50,6 +51,7 @@ export interface SpanJSON {
measurements?: Measurements;
is_segment?: boolean;
segment_id?: string;
links?: SpanLinkJSON[];
}

// These are aligned with OpenTelemetry trace flags
Expand DownExpand Up@@ -249,14 +251,21 @@ export interface Span {
addEvent(name: string, attributesOrStartTime?: SpanAttributes | SpanTimeInput, startTime?: SpanTimeInput): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with a related span. Links can reference spans from the same or different trace
* and are typically used for batch operations, cross-trace scenarios, or scatter/gather patterns.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param link - The link containing the context of the span to link to and optional attributes
*/
addLink(link: unknown): this;
addLink(link: SpanLink): this;
Comment thread
Lms24 marked this conversation as resolved.

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
* Associates this span with multiple related spans. See {@link addLink} for more details.
*
* Prefer setting links directly when starting a span (e.g. `Sentry.startSpan()`) as some context information is only available during span creation.
* @param links - Array of links to associate with this span
*/
addLinks(links: unknown): this;
addLinks(links: SpanLink[]): this;

/**
* NOT USED IN SENTRY, only added for compliance with OTEL Span interface
Expand Down
20 changes: 20 additions & 0 deletions packages/core/src/utils/spanUtils.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,7 @@ import type {
SpanTimeInput,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty, dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
Expand DownExpand Up@@ -81,6 +82,25 @@ export function spanToTraceHeader(span: Span): string {
return generateSentryTraceHeader(traceId, spanId, sampled);
}

/**
* Converts the span links array to a flattened version to be sent within an envelope.
*
* If the links array is empty, it returns `undefined` so the empty value can be dropped before it's sent.
*/
export function convertSpanLinksForEnvelope(links?: SpanLink[]): SpanLinkJSON[] | undefined {
if (links && links.length > 0) {
return links.map(({ context: { spanId, traceId, traceFlags, ...restContext }, attributes }) => ({
span_id: spanId,
trace_id: traceId,
sampled: traceFlags === TRACE_FLAG_SAMPLED,
attributes,
...restContext,
}));
} else {
return undefined;
}
}

/**
* Convert a span time input into a timestamp in seconds.
*/
Expand Down
112 changes: 112 additions & 0 deletions packages/core/test/lib/utils/spanUtils.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,17 @@ import {
SPAN_STATUS_UNSET,
SentrySpan,
TRACEPARENT_REGEXP,
convertSpanLinksForEnvelope,
setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
} from '../../../src';
import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '../../../src/types-hoist';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
import {
getRootSpan,
spanIsSampled,
Expand DownExpand Up@@ -156,6 +159,115 @@ describe('spanToTraceContext', () => {
});
});

describe('convertSpanLinksForEnvelope', () => {
it('returns undefined for undefined input', () => {
expect(convertSpanLinksForEnvelope(undefined)).toBeUndefined();
});

it('returns undefined for empty array input', () => {
expect(convertSpanLinksForEnvelope([])).toBeUndefined();
});

it('converts a single span link to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
]);
});

it('converts multiple span links to a flattened envelope item', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
context: {
spanId: 'span2',
traceId: 'trace2',
traceFlags: TRACE_FLAG_NONE,
},
attributes: {
'sentry.link.type': 'another_trace',
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
attributes: {
'sentry.link.type': 'previous_trace',
},
},
{
span_id: 'span2',
trace_id: 'trace2',
sampled: false,
attributes: {
'sentry.link.type': 'another_trace',
},
},
]);
});

it('handles span links without attributes', () => {
const links: SpanLink[] = [
{
context: {
spanId: 'span1',
traceId: 'trace1',
traceFlags: TRACE_FLAG_SAMPLED,
},
},
];

const result = convertSpanLinksForEnvelope(links);

result?.forEach(item => expect(item).not.toHaveProperty('context'));
expect(result).toEqual([
{
span_id: 'span1',
trace_id: 'trace1',
sampled: true,
},
]);
});
});

describe('spanTimeInputToSeconds', () => {
it('works with undefined', () => {
const now = timestampInSeconds();
Expand Down