Commit2ed5771

committed

fix(minidump_parser): improve ordering of logs

Use 'additional_minidumps' in .extra to prioritize logs.

1 parent61f72f2 commit2ed5771Copy full SHA for 2ed5771

File tree

+23

-8

lines changed

+23

-8

lines changed

Lines changed: 15 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -213,16 +213,23 @@ def dmp_files(src_dir: Path) -> list[Path]:`
`213`	`213`	`Returns:`
`214`	`214`	`Dump files.`
`215`	`215`	`"""`
	`216`	`+prioritize:set[str]=set()`
	`217`	`+forentryinsorted(src_dir.glob("*.extra")):`
	`218`	`+withentry.open("r")asout_fp:`
	`219`	`+try:`
	`220`	`+extra_data=load(out_fp)`
	`221`	`+exceptJSONDecodeError:`
	`222`	`+extra_data= {}`
	`223`	`+LOG.debug("invalid json in: %s",extra_data)`
	`224`	`+if"additional_minidumps"inextra_data:`
	`225`	`+forotherinextra_data["additional_minidumps"].split(","):`
	`226`	`+prioritize.add(f"{entry.stem}-{other}.dmp")`
	`227`	`+elif"MozCrashReason"inextra_data:`
	`228`	`+prioritize.add(f"{entry.stem}.dmp")`
	`229`	`+`
`216`	`230`	`dmps:list[Path]= []`
`217`	`231`	`fordmpinsorted(src_dir.glob("*.dmp"),key=lambdax:x.stat().st_mtime):`
`218`		`-try:`
`219`		`-# check .extra file for MozCrashReason entry`
`220`		`-withdmp.with_suffix(".extra").open()asout_fp:`
`221`		`-has_reason=load(out_fp).get("MozCrashReason")isnotNone`
`222`		`-except (FileNotFoundError,JSONDecodeError):`
`223`		`-has_reason=False`
`224`		`-# prioritize dmp with MozCrashReason`
`225`		`-ifhas_reason:`
	`232`	`+ifdmp.nameinprioritize:`
`226`	`233`	`dmps.insert(0,dmp)`
`227`	`234`	`else:`
`228`	`235`	`dmps.append(dmp)`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -281,6 +281,14 @@ def test_minidump_parser_06(tmp_path):`
`281`	`281`	`# add .extra file to prioritize .dmp file`
`282`	`282`	`(tmp_path/"b.extra").write_text('{"MozCrashReason":"foo"}')`
`283`	`283`	`assertMinidumpParser.dmp_files(tmp_path)[0]== (tmp_path/"b.dmp")`
	`284`	`+ (tmp_path/"b.extra").unlink()`
	`285`	`+# add .extra file to prioritize .dmp file`
	`286`	`+ (tmp_path/"c-browser.dmp").write_text("c-browser")`
	`287`	`+ (tmp_path/"c.extra").write_text('{"additional_minidumps":"browser"}')`
	`288`	`+assertMinidumpParser.dmp_files(tmp_path)[0]== (tmp_path/"c-browser.dmp")`
	`289`	`+# corrupt (bad json) .extra file`
	`290`	`+ (tmp_path/"c.extra").write_text("!")`
	`291`	`+assertMinidumpParser.dmp_files(tmp_path)`
`284`	`292`
`285`	`293`
`286`	`294`	`deftest_minidump_parser_missing_crashing_thread(tmp_path):`

Comments

(0)