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
11 changes: 1 addition & 10 deletions packages/core/src/envelope.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,7 @@ import {
SessionEnvelope,
SessionItem,
} from '@sentry/types';
import { createEnvelope, dropUndefinedKeys, dsnToString } from '@sentry/utils';

/** Extract sdk info from from the API metadata */
function getSdkMetadataForEnvelopeHeader(metadata?: SdkMetadata): SdkInfo | undefined {
if (!metadata || !metadata.sdk) {
return;
}
const { name, version } = metadata.sdk;
return { name, version };
}
import { createEnvelope, dropUndefinedKeys, dsnToString, getSdkMetadataForEnvelopeHeader } from '@sentry/utils';

/**
* Apply SdkInfo (name, version, packages, integrations) to the corresponding event key.
Expand Down
5 changes: 2 additions & 3 deletions packages/replay/src/util/createReplayEnvelope.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import { Envelope, Event } from '@sentry/types';
import { createEnvelope } from '@sentry/utils';
import { createEnvelope, getSdkMetadataForEnvelopeHeader } from '@sentry/utils';

export function createReplayEnvelope(
replayId: string,
replayEvent: Event,
payloadWithSequence: string | Uint8Array,
): Envelope {
const { name, version } = replayEvent.sdk || {};
return createEnvelope(
{
event_id: replayId,
sent_at: new Date().toISOString(),
sdk: { name, version },
sdk: getSdkMetadataForEnvelopeHeader(replayEvent),
},
[
// @ts-ignore New types
Expand Down
12 changes: 12 additions & 0 deletions packages/utils/src/envelope.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import {
Envelope,
EnvelopeItem,
EnvelopeItemType,
Event,
SdkInfo,
SdkMetadata,
TextEncoderInternal,
} from '@sentry/types';

Expand Down Expand Up @@ -142,3 +145,12 @@ const ITEM_TYPE_TO_DATA_CATEGORY_MAP: Record<EnvelopeItemType, DataCategory> = {
export function envelopeItemTypeToDataCategory(type: EnvelopeItemType): DataCategory {
return ITEM_TYPE_TO_DATA_CATEGORY_MAP[type];
}

/** Extracts the minimal SDK info from from the metadata or an events */
export function getSdkMetadataForEnvelopeHeader(metadataOrEvent?: SdkMetadata | Event): SdkInfo | undefined {
if (!metadataOrEvent || !metadataOrEvent.sdk) {
return;
}
const { name, version } = metadataOrEvent.sdk;
return { name, version };
}