Skip to content

Commit ce04aac

Browse files
authoredMay 16, 2023
Add message when tail exists sampling mode (#3214)

File tree

3 files changed

+28
-10
lines changed

3 files changed

+28
-10
lines changed
 

‎.changeset/short-ears-grow.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
Add message for when `wrangler tail` exits sampling mode

‎packages/wrangler/src/__tests__/tail.test.ts

+21-10
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,14 @@ describe("tail", () => {
514514
const api = mockWebsocketAPIs();
515515
await runWrangler("tail test-worker --format pretty");
516516

517-
const event = generateTailInfo();
518-
const message = generateMockEventMessage({ event });
519-
const serializedMessage = serialize(message);
517+
let event = generateTailInfo(true);
518+
let message = generateMockEventMessage({ event });
519+
let serializedMessage = serialize(message);
520+
api.ws.send(serializedMessage);
520521

522+
event = generateTailInfo(false);
523+
message = generateMockEventMessage({ event });
524+
serializedMessage = serialize(message);
521525
api.ws.send(serializedMessage);
522526
expect(
523527
std.out.replace(
@@ -527,7 +531,8 @@ describe("tail", () => {
527531
).toMatchInlineSnapshot(`
528532
"Successfully created tail, expires at [mock expiration date]
529533
Connected to test-worker, waiting for logs...
530-
Tail is currently in sampling mode due to the high volume of messages. To prevent messages from being dropped consider adding filters."
534+
Tail is currently in sampling mode due to the high volume of messages. To prevent messages from being dropped consider adding filters.
535+
Tail has exited sampling mode and is no longer dropping messages."
531536
`);
532537
});
533538

@@ -980,10 +985,16 @@ function generateMockEmailEvent(opts?: Partial<EmailEvent>): EmailEvent {
980985
};
981986
}
982987

983-
function generateTailInfo(): TailInfo {
984-
return {
985-
message:
986-
"Tail is currently in sampling mode due to the high volume of messages. To prevent messages from being dropped consider adding filters.",
987-
type: "overload",
988-
};
988+
function generateTailInfo(overload: boolean): TailInfo {
989+
return overload
990+
? {
991+
message:
992+
"Tail is currently in sampling mode due to the high volume of messages. To prevent messages from being dropped consider adding filters.",
993+
type: "overload",
994+
}
995+
: {
996+
message:
997+
"Tail has exited sampling mode and is no longer dropping messages.",
998+
type: "overload-stop",
999+
};
9891000
}

‎packages/wrangler/src/tail/printing.ts

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ export function prettyPrintLogs(data: WebSocket.RawData): void {
5353
} else if (isTailInfo(eventMessage.event)) {
5454
if (eventMessage.event.type === "overload") {
5555
logger.log(`${chalk.red.bold(eventMessage.event.message)}`);
56+
} else if (eventMessage.event.type === "overload-stop") {
57+
logger.log(`${chalk.yellow.bold(eventMessage.event.message)}`);
5658
}
5759
} else {
5860
// Unknown event type

0 commit comments

Comments
 (0)
Please sign in to comment.