Skip to content

Filter crash telemetry data per-line so it's not completely filtered later on #13379

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 3 commits into from
Mar 18, 2025
Merged

Filter crash telemetry data per-line so it's not completely filtered later on #13379

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
206939b
Filter crash telemetry data per-line so it's not completely filtered …
sean-mcmanus Mar 17, 2025
722a884
Remove temp test code.
sean-mcmanus Mar 17, 2025
7b0bd00
Merge branch 'main' into seanmcm/useTelemetryRegex
sean-mcmanus Mar 17, 2025
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
35 changes: 16 additions & 19 deletions Extension/src/LanguageServer/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1165,8 +1165,9 @@ function handleMacCrashFileRead(err: NodeJS.ErrnoException | undefined | null, d
logMacCrashTelemetry(data);
}

function containsUnexpectedTelemetryCharacter(str: string): boolean {
return str.includes("/") || str.includes("\\") || str.includes("@");
function containsFilteredTelemetryData(str: string): boolean {
const regex: RegExp = /(key|token|sig|secret|signature|password|passwd|pwd|android:value)[^a-zA-Z0-9]/i;
return regex.test(str);
}

async function handleCrashFileRead(crashDirectory: string, crashFile: string, crashDate: Date, err: NodeJS.ErrnoException | undefined | null, data: string): Promise<void> {
Expand Down Expand Up @@ -1197,10 +1198,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
if (pendingCrashLogLine === "ENDLOG") {
break;
}
if (!containsUnexpectedTelemetryCharacter(pendingCrashLogLine)) {
crashLog += pendingCrashLogLine + "\n";
if (containsFilteredTelemetryData(pendingCrashLogLine)) {
crashLog += "?\n";
} else {
crashLog += "<unexpectedCharacter>\n";
crashLog += pendingCrashLogLine + "\n";
}
}
crashLog = crashLog.trimEnd();
Expand Down Expand Up @@ -1255,12 +1256,8 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
funcStr = funcStr.replace(/, std::allocator<std::string>/g, "");
}
}
if (funcStr.includes("/")) {
funcStr = "<funcForwardSlash>";
} else if (funcStr.includes("\\")) {
funcStr = "<funcBackSlash>";
} else if (funcStr.includes("@")) {
funcStr = "<funcAt>";
if (containsFilteredTelemetryData(funcStr)) {
funcStr = "?";
} else if (!validFrameFound && (funcStr.startsWith("crash_handler(") || funcStr.startsWith("_sigtramp"))) {
continue; // Skip these on early frames.
}
Expand All @@ -1271,10 +1268,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
const offsetPos2: number = offsetPos + offsetStr.length;
if (isMac) {
const pendingOffset: string = line.substring(offsetPos2);
if (!containsUnexpectedTelemetryCharacter(pendingOffset)) {
crashCallStack += pendingOffset;
if (containsFilteredTelemetryData(pendingOffset)) {
crashCallStack += "?";
} else {
crashCallStack += "<offsetUnexpectedCharacter>";
crashCallStack += pendingOffset;
}
const startAddressPos: number = line.indexOf("0x");
if (startAddressPos === -1 || startAddressPos >= startPos) {
Expand All @@ -1290,10 +1287,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
continue; // unexpected
}
const pendingOffset: string = line.substring(offsetPos2, endPos);
if (!containsUnexpectedTelemetryCharacter(pendingOffset)) {
crashCallStack += pendingOffset;
if (containsFilteredTelemetryData(pendingOffset)) {
crashCallStack += "?";
} else {
crashCallStack += "<offsetUnexpectedCharacter>";
crashCallStack += pendingOffset;
}
}
}
Expand All @@ -1312,8 +1309,8 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
data = data.substring(0, 8191) + "…";
}

if (containsUnexpectedTelemetryCharacter(addressData)) {
addressData = "<addressDataUnexpectedCharacter>";
if (containsFilteredTelemetryData(addressData)) {
addressData = "?";
}

logCppCrashTelemetry(data, addressData, crashLog);
Expand Down