Skip to content

Commit fe89cc2

Browse files
authored
chore: fix lint warnings (#331)
1 parent 034f9dd commit fe89cc2

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

e2e-test-server/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ async function pubSubPull(): Promise<void> {
7171
headers: message.attributes,
7272
testId,
7373
});
74-
} catch (e: any) {
74+
} catch (e) {
7575
logger.error(
7676
'caught error from handler for scenario %s: %s',
7777
scenario,
7878
e
7979
);
8080
res = {
8181
statusCode: Status.INTERNAL,
82-
data: Buffer.from(e?.stack ?? String(e)),
82+
data: Buffer.from((e as Error | undefined)?.stack ?? String(e)),
8383
};
8484
} finally {
8585
if (res! === undefined) {

packages/opentelemetry-cloud-monitoring-exporter/src/monitoring.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ export class MetricExporter implements IMetricExporter {
145145
)) {
146146
try {
147147
await this._sendTimeSeries(batchedTimeSeries);
148-
} catch (err: any) {
148+
} catch (e) {
149+
const err = asError(e);
149150
err.message = `Send TimeSeries failed: ${err.message}`;
150151
failure = {sendFailed: true, error: err};
151152
diag.error(err.message);
@@ -222,8 +223,9 @@ export class MetricExporter implements IMetricExporter {
222223
}
223224
);
224225
});
225-
} catch (err: any) {
226-
diag.error(`MetricExporter: Failed to write data: ${err.message}`);
226+
} catch (e) {
227+
const err = asError(e);
228+
diag.error('MetricExporter: Failed to write data: %s', err.message);
227229
}
228230
}
229231

@@ -258,3 +260,10 @@ export class MetricExporter implements IMetricExporter {
258260
return (await this._auth.getClient()) as JWT;
259261
}
260262
}
263+
264+
function asError(error: unknown): Error {
265+
if (error instanceof Error) {
266+
return error;
267+
}
268+
return new Error(String(error));
269+
}

packages/opentelemetry-cloud-trace-exporter/src/trace.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ export class TraceExporter implements SpanExporter {
9191
diag.debug('Google Cloud Trace batch writing traces');
9292
try {
9393
this._traceServiceClient = await this._getClient();
94-
} catch (error: any) {
94+
} catch (e) {
95+
const error = asError(e);
9596
error.message = `failed to create client: ${error.message}`;
9697
diag.error(error.message);
9798
return {code: ExportResultCode.FAILED, error};
@@ -106,7 +107,8 @@ export class TraceExporter implements SpanExporter {
106107
await batchWriteSpans(spans, metadata);
107108
diag.debug('batchWriteSpans successfully');
108109
return {code: ExportResultCode.SUCCESS};
109-
} catch (error: any) {
110+
} catch (e) {
111+
const error = asError(e);
110112
error.message = `batchWriteSpans error: ${error.message}`;
111113
diag.error(error.message);
112114
return {code: ExportResultCode.FAILED, error};
@@ -146,3 +148,10 @@ export class TraceExporter implements SpanExporter {
146148
);
147149
}
148150
}
151+
152+
function asError(error: unknown): Error {
153+
if (error instanceof Error) {
154+
return error;
155+
}
156+
return new Error(String(error));
157+
}

0 commit comments

Comments
 (0)