Skip to content

Commit da88c72

Browse files
CzechhCzechh
committed
make america pretty again
1 parent 7cb5350 commit da88c72

File tree

2 files changed

+95
-81
lines changed

2 files changed

+95
-81
lines changed

‎src/trace/context.spec.ts

Lines changed: 94 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -395,13 +395,13 @@ describe("readTraceFromLambdaContext", () => {
395395
clientContext: {
396396
custom: {
397397
_datadog: {
398-
"x-datadog-trace-id":"666",
399-
"x-datadog-parent-id":"777",
400-
"x-datadog-sampled":"1",
401-
"x-datadog-sampling-priority":"1"
402-
}
403-
}
404-
}
398+
"x-datadog-trace-id": "666",
399+
"x-datadog-parent-id": "777",
400+
"x-datadog-sampled": "1",
401+
"x-datadog-sampling-priority": "1",
402+
},
403+
},
404+
},
405405
});
406406
expect(result).toEqual({
407407
parentID: "777",
@@ -413,8 +413,8 @@ describe("readTraceFromLambdaContext", () => {
413413
it("can handle no `custom` key", () => {
414414
const result = readTraceFromLambdaContext({
415415
clientContext: {
416-
foo: 'bar'
417-
}
416+
foo: "bar",
417+
},
418418
});
419419
expect(result).toBeUndefined();
420420
});
@@ -562,13 +562,16 @@ describe("extractTraceContext", () => {
562562
it("returns trace read from header as highest priority", () => {
563563
process.env["_X_AMZN_TRACE_ID"] = "Root=1-5ce31dc2-2c779014b90ce44db5e03875;Parent=0b11cc4230d3e09e;Sampled=1";
564564

565-
const result = extractTraceContext({
566-
headers: {
567-
"x-datadog-parent-id": "797643193680388251",
568-
"x-datadog-sampling-priority": "2",
569-
"x-datadog-trace-id": "4110911582297405551",
565+
const result = extractTraceContext(
566+
{
567+
headers: {
568+
"x-datadog-parent-id": "797643193680388251",
569+
"x-datadog-sampling-priority": "2",
570+
"x-datadog-trace-id": "4110911582297405551",
571+
},
570572
},
571-
}, {});
573+
{},
574+
);
572575
expect(result).toEqual({
573576
parentID: "797643193680388251",
574577
sampleMode: SampleMode.USER_KEEP,
@@ -579,31 +582,34 @@ describe("extractTraceContext", () => {
579582
it("returns trace read from SQS metadata as second highest priority", () => {
580583
process.env["_X_AMZN_TRACE_ID"] = "Root=1-5ce31dc2-2c779014b90ce44db5e03875;Parent=0b11cc4230d3e09e;Sampled=1";
581584

582-
const result = extractTraceContext({
583-
Records: [
584-
{
585-
body: "Hello world",
586-
attributes: {
587-
ApproximateReceiveCount: "1",
588-
SentTimestamp: "1605544528092",
589-
SenderId: "AROAYYB64AB3JHSRKO6XR:sqs-trace-dev-producer",
590-
ApproximateFirstReceiveTimestamp: "1605544528094",
591-
},
592-
messageAttributes: {
593-
_datadog: {
594-
stringValue:
595-
'{"x-datadog-trace-id":"4555236104497098341","x-datadog-parent-id":"3369753143434738315","x-datadog-sampled":"1","x-datadog-sampling-priority":"1"}',
596-
stringListValues: [],
597-
binaryListValues: [],
598-
dataType: "String",
585+
const result = extractTraceContext(
586+
{
587+
Records: [
588+
{
589+
body: "Hello world",
590+
attributes: {
591+
ApproximateReceiveCount: "1",
592+
SentTimestamp: "1605544528092",
593+
SenderId: "AROAYYB64AB3JHSRKO6XR:sqs-trace-dev-producer",
594+
ApproximateFirstReceiveTimestamp: "1605544528094",
595+
},
596+
messageAttributes: {
597+
_datadog: {
598+
stringValue:
599+
'{"x-datadog-trace-id":"4555236104497098341","x-datadog-parent-id":"3369753143434738315","x-datadog-sampled":"1","x-datadog-sampling-priority":"1"}',
600+
stringListValues: [],
601+
binaryListValues: [],
602+
dataType: "String",
603+
},
599604
},
605+
eventSource: "aws:sqs",
606+
eventSourceARN: "arn:aws:sqs:sa-east-1:601427279990:metal-queue",
607+
awsRegion: "sa-east-1",
600608
},
601-
eventSource: "aws:sqs",
602-
eventSourceARN: "arn:aws:sqs:sa-east-1:601427279990:metal-queue",
603-
awsRegion: "sa-east-1",
604-
},
605-
],
606-
}, {});
609+
],
610+
},
611+
{},
612+
);
607613
expect(result).toEqual({
608614
parentID: "3369753143434738315",
609615
sampleMode: SampleMode.AUTO_KEEP,
@@ -617,39 +623,41 @@ describe("extractTraceContext", () => {
617623
clientContext: {
618624
custom: {
619625
_datadog: {
620-
"x-datadog-trace-id":"4555236104497098341",
621-
"x-datadog-parent-id":"3369753143434738315",
622-
"x-datadog-sampled":"1",
623-
"x-datadog-sampling-priority":"1"
624-
}
625-
}
626-
}
627-
};
628-
const result = extractTraceContext({
629-
Records: [
630-
{
631-
body: "Hello world",
632-
attributes: {
633-
ApproximateReceiveCount: "1",
634-
SentTimestamp: "1605544528092",
635-
SenderId: "AROAYYB64AB3JHSRKO6XR:sqs-trace-dev-producer",
636-
ApproximateFirstReceiveTimestamp: "1605544528094",
626+
"x-datadog-trace-id": "4555236104497098341",
627+
"x-datadog-parent-id": "3369753143434738315",
628+
"x-datadog-sampled": "1",
629+
"x-datadog-sampling-priority": "1",
637630
},
638-
messageAttributes: {
639-
_datadog: {
640-
stringValue:
641-
'{"x-datadog-parent-id":"666","x-datadog-sampled":"1","x-datadog-sampling-priority":"1"}',
642-
stringListValues: [],
643-
binaryListValues: [],
644-
dataType: "String",
631+
},
632+
},
633+
};
634+
const result = extractTraceContext(
635+
{
636+
Records: [
637+
{
638+
body: "Hello world",
639+
attributes: {
640+
ApproximateReceiveCount: "1",
641+
SentTimestamp: "1605544528092",
642+
SenderId: "AROAYYB64AB3JHSRKO6XR:sqs-trace-dev-producer",
643+
ApproximateFirstReceiveTimestamp: "1605544528094",
645644
},
645+
messageAttributes: {
646+
_datadog: {
647+
stringValue: '{"x-datadog-parent-id":"666","x-datadog-sampled":"1","x-datadog-sampling-priority":"1"}',
648+
stringListValues: [],
649+
binaryListValues: [],
650+
dataType: "String",
651+
},
652+
},
653+
eventSource: "aws:sqs",
654+
eventSourceARN: "arn:aws:sqs:sa-east-1:601427279990:metal-queue",
655+
awsRegion: "sa-east-1",
646656
},
647-
eventSource: "aws:sqs",
648-
eventSourceARN: "arn:aws:sqs:sa-east-1:601427279990:metal-queue",
649-
awsRegion: "sa-east-1",
650-
},
651-
],
652-
}, lambdaContext);
657+
],
658+
},
659+
lambdaContext,
660+
);
653661
expect(result).toEqual({
654662
parentID: "3369753143434738315",
655663
sampleMode: SampleMode.AUTO_KEEP,
@@ -684,13 +692,16 @@ describe("extractTraceContext", () => {
684692
process.env[xrayTraceEnvVar] = "Root=1-5e272390-8c398be037738dc042009320;Parent=94ae789b969f1cc5;Sampled=1";
685693
process.env[awsXrayDaemonAddressEnvVar] = "localhost:127.0.0.1:2000";
686694

687-
const result = extractTraceContext({
688-
headers: {
689-
"x-datadog-parent-id": "797643193680388251",
690-
"x-datadog-sampling-priority": "2",
691-
"x-datadog-trace-id": "4110911582297405551",
695+
const result = extractTraceContext(
696+
{
697+
headers: {
698+
"x-datadog-parent-id": "797643193680388251",
699+
"x-datadog-sampling-priority": "2",
700+
"x-datadog-trace-id": "4110911582297405551",
701+
},
692702
},
693-
}, {});
703+
{},
704+
);
694705

695706
expect(sentSegment instanceof Buffer).toBeTruthy();
696707
expect(closedSocket).toBeTruthy();
@@ -704,13 +715,16 @@ describe("extractTraceContext", () => {
704715
jest.spyOn(Date, "now").mockImplementation(() => 1487076708000);
705716
process.env[xrayTraceEnvVar] = "Root=1-5e272390-8c398be037738dc042009320;Parent=94ae789b969f1cc5;Sampled=1";
706717

707-
const result = extractTraceContext({
708-
headers: {
709-
"x-datadog-parent-id": "797643193680388251",
710-
"x-datadog-sampling-priority": "2",
711-
"x-datadog-trace-id": "4110911582297405551",
718+
const result = extractTraceContext(
719+
{
720+
headers: {
721+
"x-datadog-parent-id": "797643193680388251",
722+
"x-datadog-sampling-priority": "2",
723+
"x-datadog-trace-id": "4110911582297405551",
724+
},
712725
},
713-
}, {});
726+
{},
727+
);
714728

715729
expect(sentSegment).toBeUndefined();
716730
});

‎src/trace/context.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export function extractTraceContext(event: any, context: any) {
5252
let trace = readTraceFromEvent(event);
5353

5454
if (trace === undefined) {
55-
trace = readTraceFromLambdaContext(context)
55+
trace = readTraceFromLambdaContext(context);
5656
}
5757

5858
const stepFuncContext = readStepFunctionContextFromEvent(event);

0 commit comments

Comments
 (0)