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
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@
"e2e": "xvfb-maybe vitest run --root=./test/e2e --silent=false --disable-console-intercept"
},
"dependencies": {
"@sentry/browser": "10.36.0",
"@sentry/core": "10.36.0",
"@sentry/node": "10.36.0"
"@sentry/browser": "10.38.0",
"@sentry/core": "10.38.0",
"@sentry/node": "10.38.0"
},
"peerDependencies": {
"@sentry/node-native": "10.36.0"
"@sentry/node-native": "10.38.0"
},
"peerDependenciesMeta": {
"@sentry/node-native": {
Expand All @@ -119,9 +119,9 @@
},
"devDependencies": {
"@rollup/plugin-typescript": "^12.1.3",
"@sentry/node-native": "10.36.0",
"@sentry-internal/eslint-config-sdk": "10.36.0",
"@sentry-internal/typescript": "10.36.0",
"@sentry/node-native": "10.38.0",
"@sentry-internal/eslint-config-sdk": "10.38.0",
"@sentry-internal/typescript": "10.38.0",
"@types/busboy": "^1.5.4",
"@types/koa": "^2.0.52",
"@types/koa-bodyparser": "^4.3.0",
Expand Down
43 changes: 24 additions & 19 deletions src/main/index.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
export type {
Breadcrumb,
BreadcrumbHint,
PolymorphicRequest,
SdkInfo,
ErrorEvent,
Event,
EventHint,
ErrorEvent,
Exception,
PolymorphicRequest,
SdkInfo,
Session,
SeverityLevel,
Span,
StackFrame,
Stacktrace,
Thread,
User,
Span,
} from '@sentry/core';

export {
Expand Down Expand Up @@ -80,19 +80,23 @@ export {
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
initOpenTelemetry,
instrumentAnthropicAiClient,
instrumentGoogleGenAIClient,
instrumentLangGraph,
instrumentOpenAiClient,
instrumentStateGraphCompile,
instrumentSupabaseClient,
isEnabled,
isInitialized,
kafkaIntegration,
knexIntegration,
koaIntegration,
langChainIntegration,
langGraphIntegration,
lastEventId,
launchDarklyIntegration,
linkedErrorsIntegration,
localVariablesIntegration,
langChainIntegration,
logger,
lruMemoizerIntegration,
metrics,
Expand Down Expand Up @@ -123,6 +127,7 @@ export {
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
SentryContextManager,
setConversationId,
setContext,
setCurrentClient,
setExtra,
Expand Down Expand Up @@ -168,29 +173,29 @@ export {

export type { NodeOptions } from '@sentry/node';

export { electronBreadcrumbsIntegration } from './integrations/electron-breadcrumbs.js';
export { onUncaughtExceptionIntegration } from './integrations/onuncaughtexception.js';
export { sentryMinidumpIntegration } from './integrations/sentry-minidump/index.js';
export { electronMinidumpIntegration } from './integrations/electron-minidump.js';
export { preloadInjectionIntegration } from './integrations/preload-injection.js';
export { mainProcessSessionIntegration } from './integrations/main-process-session.js';
export { browserWindowSessionIntegration } from './integrations/browser-window-session.js';
export { additionalContextIntegration } from './integrations/additional-context.js';
export { electronNetIntegration } from './integrations/net-breadcrumbs.js';
export { browserWindowSessionIntegration } from './integrations/browser-window-session.js';
export { childProcessIntegration } from './integrations/child-process.js';
export { screenshotsIntegration } from './integrations/screenshots.js';
export { rendererProfileFromIpc } from './integrations/renderer-profiling.js';
export { normalizePathsIntegration } from './integrations/normalize-paths.js';
export { electronBreadcrumbsIntegration } from './integrations/electron-breadcrumbs.js';
export { electronContextIntegration } from './integrations/electron-context.js';
export { electronMinidumpIntegration } from './integrations/electron-minidump.js';
export { electronNetIntegration } from './integrations/net-breadcrumbs.js';
export { gpuContextIntegration } from './integrations/gpu-context.js';
export { mainProcessSessionIntegration } from './integrations/main-process-session.js';
export { normalizePathsIntegration } from './integrations/normalize-paths.js';
export { onUncaughtExceptionIntegration } from './integrations/onuncaughtexception.js';
export { preloadInjectionIntegration } from './integrations/preload-injection.js';
export { rendererEventLoopBlockIntegration } from './integrations/renderer-anr.js';
export { rendererProfileFromIpc } from './integrations/renderer-profiling.js';
export { screenshotsIntegration } from './integrations/screenshots.js';
export { sentryMinidumpIntegration } from './integrations/sentry-minidump/index.js';
export { startupTracingIntegration } from './integrations/startup-tracing.js';

export { makeElectronTransport } from './transports/electron-net.js';
export { makeElectronOfflineTransport } from './transports/electron-offline-net.js';
export { makeElectronTransport } from './transports/electron-net.js';

export type { ElectronMainOptions } from './sdk.js';
export { init, getDefaultIntegrations } from './sdk.js';
export { defaultStackParser } from './stack-parse.js';
export type { ElectronMainOptions } from './sdk.js';
export { getDefaultIntegrations, init } from './sdk.js';

export { IPCMode } from '../common/ipc.js';
10 changes: 5 additions & 5 deletions src/renderer/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ export { logger, metrics };
export type {
Breadcrumb,
BreadcrumbHint,
ErrorEvent,
Event,
EventHint,
ErrorEvent,
Exception,
SdkInfo,
Session,
Expand Down Expand Up @@ -41,9 +41,9 @@ export {
consoleLoggingIntegration,
contextLinesIntegration,
continueTrace,
createTransport,
createConsolaReporter,
createLangChainCallbackHandler,
createTransport,
createUserFeedbackEnvelope,
dedupeIntegration,
defaultRequestInstrumentationOptions,
Expand Down Expand Up @@ -144,8 +144,8 @@ export {

export type { BrowserOptions, ReportDialogOptions } from '@sentry/browser';

export { scopeToMainIntegration } from './integrations/scope-to-main.js';
export { electronRendererStackParser as defaultStackParser } from './stack-parse.js';
export { eventLoopBlockIntegration } from './integrations/event-loop-block.js';
export { getDefaultIntegrations, init } from './sdk.js';
export { makeRendererTransport } from './transport.js';
export { electronRendererStackParser as defaultStackParser } from './stack-parse.js';
export { init, getDefaultIntegrations } from './sdk.js';
export { scopeToMainIntegration } from './integrations/scope-to-main.js';
2 changes: 1 addition & 1 deletion src/renderer/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ interface ElectronRendererOptions extends Partial<ElectronRendererOptionsInterna
export function init<O extends ElectronRendererOptions>(
options: ElectronRendererOptions & O = {} as ElectronRendererOptions & O,
// This parameter name ensures that TypeScript error messages contain a hint for fixing SDK version mismatches
originalInit: (if_you_get_a_typescript_error_ensure_sdks_use_version_v10_36_0: O) => void = browserInit,
originalInit: (if_you_get_a_typescript_error_ensure_sdks_use_version_v10_38_0: O) => void = browserInit,
): void {
// Ensure the browser SDK is only init'ed once.
if (window?.__SENTRY__RENDERER_INIT__) {
Expand Down
17 changes: 11 additions & 6 deletions src/utility/index.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
export type {
Breadcrumb,
BreadcrumbHint,
PolymorphicRequest,
SdkInfo,
ErrorEvent,
Event,
EventHint,
ErrorEvent,
Exception,
PolymorphicRequest,
SdkInfo,
Session,
SeverityLevel,
Span,
StackFrame,
Stacktrace,
Thread,
User,
Span,
} from '@sentry/core';

export {
Expand Down Expand Up @@ -81,19 +81,23 @@ export {
// eslint-disable-next-line deprecation/deprecation
inboundFiltersIntegration,
initOpenTelemetry,
instrumentAnthropicAiClient,
instrumentGoogleGenAIClient,
instrumentLangGraph,
instrumentOpenAiClient,
instrumentStateGraphCompile,
instrumentSupabaseClient,
isEnabled,
isInitialized,
kafkaIntegration,
knexIntegration,
koaIntegration,
langChainIntegration,
langGraphIntegration,
lastEventId,
launchDarklyIntegration,
linkedErrorsIntegration,
localVariablesIntegration,
langChainIntegration,
logger,
lruMemoizerIntegration,
metrics,
Expand Down Expand Up @@ -125,6 +129,7 @@ export {
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
SentryContextManager,
setConversationId,
setContext,
setCurrentClient,
setExtra,
Expand Down Expand Up @@ -172,4 +177,4 @@ export type { NodeOptions } from '@sentry/node';

export { makeUtilityProcessTransport } from './transport.js';

export { init, getDefaultIntegrations, defaultStackParser } from './sdk.js';
export { defaultStackParser, getDefaultIntegrations, init } from './sdk.js';
5 changes: 4 additions & 1 deletion test/e2e/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,10 @@ export function profileChunkEnvelope(chunk: Partial<ProfileChunk>): Envelope {
},
[
[
{ type: 'profile_chunk' },
{
platform: 'javascript',
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting this has been added to profiles!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was missing before and we added it in getsentry/sentry-javascript#18954

type: 'profile_chunk',
},
{
chunk_id: UUID_MATCHER,
profiler_id: UUID_MATCHER,
Expand Down
Loading
Loading