Skip to content

[Enhancement] tweaks for better error handling#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kezhenxu94 merged 1 commit into from
Dec 3, 2020
Merged

[Enhancement] tweaks for better error handling #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 35 additions & 31 deletions src/plugins/HttpPlugin.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,44 +60,49 @@ class HttpPlugin implements SwPlugin {
};
const operation = pathname.replace(/\?.*$/g, '');

const [span, request]: [Span, ClientRequest] = ContextManager.withSpanNoStop(
ContextManager.current.newExitSpan(operation, host), (_span: Span, args) => {
let stopped = 0; // compensating if request aborted right after creation 'close' is not emitted
const span = ContextManager.current.newExitSpan(operation, host).start();
const stopIfNotStopped = () => !stopped++ ? span.stop() : null; // make sure we stop only once

_span.component = Component.HTTP;
_span.layer = SpanLayer.HTTP;
_span.tag(Tag.httpURL(host + pathname));
try {
span.component = Component.HTTP;
span.layer = SpanLayer.HTTP;
span.tag(Tag.httpURL(host + pathname));

const _request = original.apply(this, args);
const request: ClientRequest = original.apply(this, arguments);

_span.extract().items.forEach((item) => {
_request.setHeader(item.key, item.value);
span.extract().items.forEach((item) => {
request.setHeader(item.key, item.value);
});

return [_span, _request];

}, arguments);
request.on('close', stopIfNotStopped);
request.on('abort', () => (span.errored = true, stopIfNotStopped()));
request.on('error', (err) => (span.error(err), stopIfNotStopped()));

request.prependListener('response', (res) => {
span.resync();
span.tag(Tag.httpStatusCode(res.statusCode));
if (res.statusCode && res.statusCode >= 400) {
span.errored = true;
}
if (res.statusMessage) {
span.tag(Tag.httpStatusMsg(res.statusMessage));
}
stopIfNotStopped();
});

span.async();
span.async();

let stopped = 0; // compensating if request aborted right after creation 'close' is not emitted
const stopIfNotStopped = () => !stopped++ ? span.stop() : null; // make sure we stop only once
request.on('close', stopIfNotStopped);
request.on('abort', () => (span.errored = true, stopIfNotStopped()));
request.on('error', (err) => (span.error(err), stopIfNotStopped()));
return request;

request.prependListener('response', (res) => {
span.resync();
span.tag(Tag.httpStatusCode(res.statusCode));
if (res.statusCode && res.statusCode >= 400) {
span.errored = true;
} catch (e) {
if (!stopped) {
span.error(e);
stopIfNotStopped();
}
if (res.statusMessage) {
span.tag(Tag.httpStatusMsg(res.statusMessage));
}
stopIfNotStopped();
});

return request;
throw e;
}
};
})(http.request);
}
Expand All@@ -122,10 +127,9 @@ class HttpPlugin implements SwPlugin {

const carrier = ContextCarrier.from(headersMap);
const operation = (req.url || '/').replace(/\?.*/g, '');
const span = ContextManager.current.newEntrySpan(operation, carrier);

return ContextManager.withSpan(ContextManager.current.newEntrySpan(operation, carrier),
(span, self, args) => {

return ContextManager.withSpan(span, (self, args) => {
span.component = Component.HTTP_SERVER;
span.layer = SpanLayer.HTTP;
span.tag(Tag.httpURL((req.headers.host || '') + req.url));
Expand Down
17 changes: 2 additions & 15 deletions src/trace/context/ContextManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ class ContextManager {
span.start();

try {
return callback(span, ...args);
return callback(...args);
} catch (e) {
span.error(e);
throw e;
Expand All@@ -82,27 +82,14 @@ class ContextManager {
span.start();

try {
return await callback(span, ...args);
return await callback(...args);
} catch (e) {
span.error(e);
throw e;
} finally {
span.stop();
}
}

withSpanNoStop(span: Span, callback: (...args: any[]) => any, ...args: any[]): any {
if(!span.startTime)
span.start();

try {
return callback(span, ...args);
} catch (e) {
span.error(e);
span.stop();
throw e;
}
}
}

export default new ContextManager();