From a7afb58d8caef6f93441c82d075377eef59e63c6 Mon Sep 17 00:00:00 2001 From: Kelvin Jin Date: Tue, 12 Dec 2017 16:21:33 -0800 Subject: [PATCH] use new node error constructor type definitions --- src/span-data.ts | 4 ++-- src/types.d.ts | 25 ------------------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/src/span-data.ts b/src/span-data.ts index 875bebd2a..264d9ef78 100644 --- a/src/span-data.ts +++ b/src/span-data.ts @@ -79,10 +79,10 @@ export class SpanData implements SpanDataInterface { const origPrepare = Error.prepareStackTrace; Error.prepareStackTrace = - (error: Error, structured: CallSite[]): CallSite[] => { + (error: Error, structured: NodeJS.CallSite[]): NodeJS.CallSite[] => { return structured; }; - const e: {stack?: CallSite[]} = {}; + const e: {stack?: NodeJS.CallSite[]} = {}; Error.captureStackTrace(e, SpanData); const stackFrames: StackFrame[] = []; diff --git a/src/types.d.ts b/src/types.d.ts index 580fb5913..bdbaff35a 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -18,31 +18,6 @@ declare namespace NodeJS { } } -interface CallSite { - getThis: () => any | undefined; - getTypeName: () => string; - getFunction: () => Function | undefined; - getFunctionName: () => string; - getMethodName: () => string; - getFileName: () => string | undefined; - getLineNumber: () => number | undefined; - getColumnNumber: () => number | undefined; - getEvalOrigin: () => CallSite | undefined; - isToplevel: () => boolean; - isEval: () => boolean; - isNative: () => boolean; - isConstructor: () => boolean; -} - -interface ErrorConstructor { - prepareStackTrace?: ( - error: Error, - structuredStackTrace: CallSite[] - ) => CallSite[] | string; - captureStackTrace(targetObject: Object, constructorOpt?: Function): void; - stackTraceLimit: number; -} - declare module '@google-cloud/common' { import * as request from 'request';