Skip to content

Commit 6970ee1

Browse files
committed
convert SyncPromise.resolve
1 parent b6934a5 commit 6970ee1

File tree

8 files changed

+24
-23
lines changed

8 files changed

+24
-23
lines changed

packages/browser/src/eventbuilder.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
isErrorEvent,
99
isEvent,
1010
isPlainObject,
11-
SyncPromise,
11+
syncPromiseResolve,
1212
} from '@sentry/utils';
1313

1414
import { eventFromPlainObject, eventFromStacktrace, prepareFramesForEvent } from './parsers';
@@ -28,7 +28,7 @@ export function eventFromException(options: Options, exception: unknown, hint?:
2828
if (hint && hint.event_id) {
2929
event.event_id = hint.event_id;
3030
}
31-
return SyncPromise.resolve(event);
31+
return syncPromiseResolve(event);
3232
}
3333

3434
/**
@@ -49,7 +49,7 @@ export function eventFromMessage(
4949
if (hint && hint.event_id) {
5050
event.event_id = hint.event_id;
5151
}
52-
return SyncPromise.resolve(event);
52+
return syncPromiseResolve(event);
5353
}
5454

5555
/**

packages/browser/src/sdk.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { getCurrentHub, initAndBind, Integrations as CoreIntegrations } from '@sentry/core';
2-
import { addInstrumentationHandler, getGlobalObject, logger, SyncPromise } from '@sentry/utils';
2+
import { addInstrumentationHandler, getGlobalObject, logger, syncPromiseResolve } from '@sentry/utils';
33

44
import { BrowserOptions } from './backend';
55
import { BrowserClient } from './client';
@@ -162,7 +162,7 @@ export function flush(timeout?: number): PromiseLike<boolean> {
162162
return client.flush(timeout);
163163
}
164164
logger.warn('Cannot flush events. No client defined.');
165-
return SyncPromise.resolve(false);
165+
return syncPromiseResolve(false);
166166
}
167167

168168
/**
@@ -179,7 +179,7 @@ export function close(timeout?: number): PromiseLike<boolean> {
179179
return client.close(timeout);
180180
}
181181
logger.warn('Cannot flush events and disable SDK. No client defined.');
182-
return SyncPromise.resolve(false);
182+
return syncPromiseResolve(false);
183183
}
184184

185185
/**

packages/browser/test/unit/mocks/simpletransport.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { eventStatusFromHttpCode, SyncPromise } from '@sentry/utils';
1+
import { eventStatusFromHttpCode, syncPromiseResolve } from '@sentry/utils';
22

33
import { Event, Response } from '../../../src';
44
import { BaseTransport } from '../../../src/transports';
55

66
export class SimpleTransport extends BaseTransport {
77
public sendEvent(_: Event): PromiseLike<Response> {
88
return this._buffer.add(() =>
9-
SyncPromise.resolve({
9+
syncPromiseResolve({
1010
status: eventStatusFromHttpCode(200),
1111
}),
1212
);

packages/core/src/baseclient.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import {
2121
normalize,
2222
SentryError,
2323
SyncPromise,
24+
syncPromiseResolve,
2425
truncate,
2526
uuid4,
2627
} from '@sentry/utils';
@@ -356,7 +357,7 @@ export abstract class BaseClient<B extends Backend, O extends Options> implement
356357
}
357358

358359
// We prepare the result here with a resolved Event.
359-
let result = SyncPromise.resolve<Event | null>(prepared);
360+
let result = syncPromiseResolve<Event | null>(prepared);
360361

361362
// This should be the last thing called, since we want that
362363
// {@link Hub.addEventProcessor} gets the finished prepared event.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { Event, Response, Transport } from '@sentry/types';
2-
import { SyncPromise } from '@sentry/utils';
2+
import { syncPromiseResolve } from '@sentry/utils';
33

44
/** Noop transport */
55
export class NoopTransport implements Transport {
66
/**
77
* @inheritDoc
88
*/
99
public sendEvent(_: Event): PromiseLike<Response> {
10-
return SyncPromise.resolve({
11-
reason: `NoopTransport: Event has been skipped because no Dsn is configured.`,
10+
return syncPromiseResolve({
11+
reason: 'NoopTransport: Event has been skipped because no Dsn is configured.',
1212
status: 'skipped',
1313
});
1414
}
@@ -17,6 +17,6 @@ export class NoopTransport implements Transport {
1717
* @inheritDoc
1818
*/
1919
public close(_?: number): PromiseLike<boolean> {
20-
return SyncPromise.resolve(true);
20+
return syncPromiseResolve(true);
2121
}
2222
}

packages/core/test/mocks/backend.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Session } from '@sentry/hub';
22
import { Event, Options, SeverityLevel, Transport } from '@sentry/types';
3-
import { SyncPromise } from '@sentry/utils';
3+
import { syncPromiseResolve } from '@sentry/utils';
44

55
import { BaseBackend } from '../../src/basebackend';
66

@@ -24,7 +24,7 @@ export class TestBackend extends BaseBackend<TestOptions> {
2424

2525
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
2626
public eventFromException(exception: any): PromiseLike<Event> {
27-
return SyncPromise.resolve({
27+
return syncPromiseResolve({
2828
exception: {
2929
values: [
3030
{
@@ -39,7 +39,7 @@ export class TestBackend extends BaseBackend<TestOptions> {
3939
}
4040

4141
public eventFromMessage(message: string, level: SeverityLevel = 'info'): PromiseLike<Event> {
42-
return SyncPromise.resolve({ message, level });
42+
return syncPromiseResolve({ message, level });
4343
}
4444

4545
public sendEvent(event: Event): void {

packages/node/src/integrations/linkederrors.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { addGlobalEventProcessor, getCurrentHub } from '@sentry/core';
22
import { Event, EventHint, Exception, ExtendedError, Integration } from '@sentry/types';
3-
import { isInstanceOf, SyncPromise } from '@sentry/utils';
3+
import { isInstanceOf, SyncPromise, syncPromiseResolve } from '@sentry/utils';
44

55
import { getExceptionFromError } from '../parsers';
66

@@ -56,7 +56,7 @@ export class LinkedErrors implements Integration {
5656
*/
5757
private _handler(event: Event, hint?: EventHint): PromiseLike<Event> {
5858
if (!event.exception || !event.exception.values || !hint || !isInstanceOf(hint.originalException, Error)) {
59-
return SyncPromise.resolve(event);
59+
return syncPromiseResolve(event);
6060
}
6161

6262
return new SyncPromise<Event>(resolve => {
@@ -78,7 +78,7 @@ export class LinkedErrors implements Integration {
7878
*/
7979
private _walkErrorTree(error: ExtendedError, key: string, stack: Exception[] = []): PromiseLike<Exception[]> {
8080
if (!isInstanceOf(error[key], Error) || stack.length + 1 >= this._limit) {
81-
return SyncPromise.resolve(stack);
81+
return syncPromiseResolve(stack);
8282
}
8383
return new SyncPromise<Exception[]>((resolve, reject) => {
8484
void getExceptionFromError(error[key])

packages/node/src/parsers.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Event, Exception, ExtendedError, StackFrame } from '@sentry/types';
2-
import { addContextToFrame, basename, dirname, SyncPromise } from '@sentry/utils';
2+
import { addContextToFrame, basename, dirname, SyncPromise, syncPromiseResolve } from '@sentry/utils';
33
import { readFile } from 'fs';
44
import { LRUMap } from 'lru_map';
55

@@ -71,7 +71,7 @@ function getModule(filename: string, base?: string): string {
7171
function readSourceFiles(filenames: string[]): PromiseLike<{ [key: string]: string | null }> {
7272
// we're relying on filenames being de-duped already
7373
if (filenames.length === 0) {
74-
return SyncPromise.resolve({});
74+
return syncPromiseResolve({});
7575
}
7676

7777
return new SyncPromise<{
@@ -176,15 +176,15 @@ export function parseStack(stack: stacktrace.StackFrame[], options?: NodeOptions
176176

177177
// We do an early return if we do not want to fetch context liens
178178
if (linesOfContext <= 0) {
179-
return SyncPromise.resolve(frames);
179+
return syncPromiseResolve(frames);
180180
}
181181

182182
try {
183183
return addPrePostContext(filesToRead, frames, linesOfContext);
184184
} catch (_) {
185185
// This happens in electron for example where we are not able to read files from asar.
186186
// So it's fine, we recover be just returning all frames without pre/post context.
187-
return SyncPromise.resolve(frames);
187+
return syncPromiseResolve(frames);
188188
}
189189
}
190190

0 commit comments

Comments
 (0)