Skip to content

Commit 58dd586

Browse files
authored
fix subsegment callback error parameter type (#644)
1 parent d3f0d52 commit 58dd586

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

sdk_contrib/fetch/lib/fetch_p.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ type fetchModuleFetch = (url: URL | fetchModule.RequestInfo, init?: fetchModule.
88

99
export function captureFetchGlobal(
1010
downstreamXRayEnabled?: boolean,
11-
subsegmentCallback?: (subsegment: AWSXRay.Subsegment, req: Request, res: Response | null, error: Error) => void):
11+
subsegmentCallback?: (subsegment: AWSXRay.Subsegment, req: Request, res: Response | null, error?: Error | undefined) => void):
1212
typeof globalThis.fetch;
1313

1414
export function captureFetchModule(
1515
fetch: FetchModuleType,
1616
downstreamXRayEnabled?: boolean,
17-
subsegmentCallback?: (subsegment: AWSXRay.Subsegment, req: fetchModule.Request, res: fetchModule.Response | null, error: Error) => void):
17+
subsegmentCallback?: (subsegment: AWSXRay.Subsegment, req: fetchModule.Request, res: fetchModule.Response | null, error?: Error | undefined) => void):
1818
(url: URL | fetchModule.RequestInfo, init?: fetchModule.RequestInit | undefined) => Promise<fetchModule.Response>;
1919

sdk_contrib/fetch/test-d/index.test-d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { captureFetchGlobal, captureFetchModule } from '../lib/fetch_p';
66
type ModuleFetch = (url: URL | fetchModule.RequestInfo, init?: fetchModule.RequestInit | undefined) => Promise<fetchModule.Response>;
77

88
if (globalThis.fetch !== undefined) {
9-
function fetchGlobalCallback(subsegment: AWSXRay.Subsegment, req: Request, res: Response | null, error: Error) {
9+
function fetchGlobalCallback(subsegment: AWSXRay.Subsegment, req: Request, res: Response | null, error?: Error | undefined) {
1010
console.log({ subsegment, req, res, error });
1111
}
1212

@@ -17,7 +17,7 @@ if (globalThis.fetch !== undefined) {
1717
expectType<typeof globalThis.fetch>(captureFetchGlobal(false, fetchGlobalCallback));
1818
}
1919

20-
function fetchModuleCallback(subsegment: AWSXRay.Subsegment, req: fetchModule.Request, res: fetchModule.Response | null, error: Error) {
20+
function fetchModuleCallback(subsegment: AWSXRay.Subsegment, req: fetchModule.Request, res: fetchModule.Response | null, error?: Error | undefined) {
2121
console.log({ subsegment, req, res, error });
2222
}
2323

0 commit comments

Comments
 (0)