Skip to content

ref: Avoid dropUndefinedKeys for spanToJSON calls #15792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 24, 2025
Merged

ref: Avoid dropUndefinedKeys for spanToJSON calls #15792

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feda36e
ref: Avoid `dropUndefinedKeys` for `spanToJSON` calls
mydea Mar 24, 2025
da1c387
drop here too
mydea Mar 24, 2025
abc16fb
remove unneeded test
mydea Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/core/src/tracing/sentrySpan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import type {
} from '../types-hoist';
import type { SpanLink } from '../types-hoist/link';
import { logger } from '../utils-hoist/logger';
import { dropUndefinedKeys } from '../utils-hoist/object';
import { generateSpanId, generateTraceId } from '../utils-hoist/propagationContext';
import { timestampInSeconds } from '../utils-hoist/time';
import {
Expand Down Expand Up @@ -223,7 +222,7 @@ export class SentrySpan implements Span {
* use `spanToJSON(span)` instead.
*/
public getSpanJSON(): SpanJSON {
return dropUndefinedKeys({
return {
data: this._attributes,
description: this._name,
op: this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP],
Expand All @@ -240,7 +239,7 @@ export class SentrySpan implements Span {
is_segment: (this._isStandaloneSpan && getRootSpan(this) === this) || undefined,
segment_id: this._isStandaloneSpan ? getRootSpan(this).spanContext().spanId : undefined,
links: convertSpanLinksForEnvelope(this._links),
});
};
}

/** @inheritdoc */
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/utils/spanUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export function spanToJSON(span: Span): SpanJSON {
if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;

return dropUndefinedKeys({
return {
span_id,
trace_id,
data: attributes,
Expand All @@ -160,7 +160,7 @@ export function spanToJSON(span: Span): SpanJSON {
op: attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP],
origin: attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] as SpanOrigin | undefined,
links: convertSpanLinksForEnvelope(links),
});
};
}

// Finally, at least we have `spanContext()`....
Expand Down
Loading