Skip to content

Fix bug with closing xray socket too early #124

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
merged 2 commits into from
Nov 10, 2020
Merged

Fix bug with closing xray socket too early #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b7839d
Fix bug with closing xray socket too early
DarcyRaynerDD Nov 10, 2020
f182d0e
Fix unit tests
DarcyRaynerDD Nov 10, 2020
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
11 changes: 10 additions & 1 deletion src/trace/context.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,16 @@ jest.mock("dgram", () => {
return {
createSocket: () => {
return {
send: (message: string) => {
send: (
message: string,
start: number,
length: number,
port: number,
address: string,
callback: (error: string | undefined, bytes: number) => void,
) => {
sentSegment = message;
callback(undefined, 1);
},
close: () => {
closedSocket = true;
Expand Down Expand Up @@ -475,6 +483,7 @@ describe("extractTraceContext", () => {
extractTraceContext(stepFunctionEvent);

expect(sentSegment instanceof Buffer).toBeTruthy();

expect(closedSocket).toBeTruthy();

const sentMessage = sentSegment.toString();
Expand Down
5 changes: 2 additions & 3 deletions src/trace/context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,12 @@ export function sendXraySubsegment(segment: string) {
client = createSocket("udp4");
// Send segment asynchronously to xray daemon
client.send(message, 0, message.length, port, address, (error, bytes) => {
client?.close();
logDebug(`Xray daemon received metadata payload`, { error, bytes });
});
} catch (error) {
logDebug("Error occurred submitting to xray daemon", { error });
} finally {
// Cleanup socket
client?.close();
logDebug("Error occurred submitting to xray daemon", { error });
}
}

Expand Down