(Feat): Upload streamlined BEP file #226

TylerJang27 · 2024-12-13T00:52:30Z

Include a subset of the BEP file in the bundle tar. This strips it to just testResult events, which removes sensitive information that may be in other events

This is mainly for our debugging purposes and for evaluating the success of this feature

trunk-io · 2024-12-13T00:52:33Z

😎 Merged successfully - details.

trunk-staging-io · 2024-12-13T01:09:01Z

_{View Full Report ↗︎ ⋅ Docs}

TylerJang27 · 2024-12-13T09:32:33Z

bundle/src/bundler.rs

+            bep_events_file.flush()?;
+            bep_events_file.seek(std::io::SeekFrom::Start(0))?;


This seemed to be necessary in order for the tests to work on Mac.

Yeah, I think it's necessary when you write then immediately read again within the same scope

TylerJang27 · 2024-12-13T09:33:43Z

context/src/bazel_bep/parser.rs

                    match parse_event {
                        Result::Err(ref err) => {
                            errors.push(format!("Error parsing build event: {}", err));
                        }
                        Result::Ok(build_event) => {
-                            if let Some(Payload::TestResult(test_result)) = build_event.payload {
-                                let xml_files = test_result
+                            if let Some(Payload::TestResult(test_result)) = &build_event.payload {


I will also be uploading TestSummary events in a follow-up. I considered the started events too, but that can include some env vars and bazel config that we probably shouldn't collect

max-trunk

LGTM, just 1 Q!

max-trunk · 2024-12-13T15:10:49Z

bundle/src/bundler.rs

            tar.append_file("CODEOWNERS", &mut file)?;
            total_bytes_in += std::fs::metadata(path)?.len();
        }

+        if let Some(bep_parser) = self.bep_parser.as_ref() {
+            let mut bep_events_file = tempfile::tempfile()?;
+            bep_parser.bep_test_events().iter().for_each(|event| {


This assumes that bep_parser.parse() was called somewhere upstream (and I do see that it was called in the upload flow before being passed to the BundlerUtil here). Curious if you've considered having the BazelBepParser output a single struct with all of the relevant parsed data that we can pass around rather than the parser itself?

Agreed—might be better to have a struct which represents an already parsed state

Good point. I'm refactoring to handle that

dfrankland · 2024-12-13T17:03:56Z

bundle/src/bundler.rs

 use std::path::PathBuf;
+use std::{
+    fs::File,
+    io::{Seek, Write},
+};


would be awesome if we could combine these std imports and stick them in their own group above these normal crate imports

👍 Need a linter for this 🙄

bundle/src/bundler.rs

dfrankland · 2024-12-13T17:06:33Z

bundle/src/bundler.rs

            tar.append_file("CODEOWNERS", &mut file)?;
            total_bytes_in += std::fs::metadata(path)?.len();
        }

+        if let Some(bep_parser) = self.bep_parser.as_ref() {
+            let mut bep_events_file = tempfile::tempfile()?;
+            bep_parser.bep_test_events().iter().for_each(|event| {


Agreed—might be better to have a struct which represents an already parsed state

bundle/src/bundler.rs

dfrankland · 2024-12-13T17:16:42Z

bundle/src/bundler.rs

+            bep_events_file.flush()?;
+            bep_events_file.seek(std::io::SeekFrom::Start(0))?;


Yeah, I think it's necessary when you write then immediately read again within the same scope

dfrankland · 2024-12-13T17:20:30Z

cli-tests/src/upload.rs

+    let mut bazel_bep_parser = BazelBepParser::new(
+        tar_extract_directory
+            .join("bazel_bep.json")
+            .to_string_lossy()
+            .to_string(),
+    );


If we update BazelBepParser you won't have to do all of this Path <-> String conversion:

#[derive(Debug, Clone, Default)] pub struct BazelBepParser { bazel_bep_path: PathBuf, test_results: Vec<TestResult>, bep_test_events: Vec<BuildEvent>, errors: Vec<String>, } impl BazelBepParser { pub fn new<T: Into<PathBuf>>(bazel_bep_path: T) -> Self { Self { bazel_bep_path: bazel_bep_path.into(), ..Default::default() } } // ... other code ... }

Everytime I'm sitting here thinking "there has to be a better way," Dylan's got me

Follow-up to #215 (incomplete, just timestamps) and #226 (more BEP debugging). Parses bazel [TestSummary](https://github.com/bazelbuild/bazel/blob/master/src/main/java/com/google/devtools/build/lib/buildeventstream/proto/build_event_stream.proto#L781) events in order to override the failure status of a given junit. This allows us to properly return a zero exit code if bazel marks a test as flaky, rather than waiting for a quarantine status to properly return. This should hopefully also allow us to better inform the rules engine for test runner-identified flakiness from bazel Notes: - I have attempted to make this as generic as possible without entangling too much logic with bazel parsing - Unfortunately this logic does have to (and already does) live in the client, since we need to parse the junits in order to properly arrive at a quarantine result - I have added unit and integration tests here, and also validated this against the repros identified in [thread](https://trunk-io.slack.com/archives/C044VBASZ0D/p1734028034948189).

TylerJang27 added 2 commits December 12, 2024 16:41

implement uploading bundle

3a1db68

add test

936a041

try to fix mac issues

f647bd5

TylerJang27 marked this pull request as ready for review December 13, 2024 09:32

TylerJang27 commented Dec 13, 2024

View reviewed changes

TylerJang27 requested review from dfrankland, pv72895, tenesttang-trunk and max-trunk December 13, 2024 09:34

max-trunk approved these changes Dec 13, 2024

View reviewed changes

dfrankland approved these changes Dec 13, 2024

View reviewed changes

TylerJang27 added 2 commits December 13, 2024 16:28

refactor so parse returns a result object

f6c3c8b

address comments

6a21d6c

trunk-io bot merged commit 9fbb8d4 into main Dec 15, 2024
13 checks passed

TylerJang27 mentioned this pull request Dec 17, 2024

(Feat): Parse BEP TestSummary #242

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(Feat): Upload streamlined BEP file #226

(Feat): Upload streamlined BEP file #226

TylerJang27 commented Dec 13, 2024 •

edited

Loading

trunk-io bot commented Dec 13, 2024 •

edited

Loading

trunk-staging-io bot commented Dec 13, 2024 •

edited

Loading

TylerJang27 Dec 13, 2024

dfrankland Dec 13, 2024

TylerJang27 Dec 13, 2024

max-trunk left a comment

max-trunk Dec 13, 2024

dfrankland Dec 13, 2024

TylerJang27 Dec 14, 2024

dfrankland Dec 13, 2024

TylerJang27 Dec 14, 2024

dfrankland Dec 13, 2024

dfrankland Dec 13, 2024

dfrankland Dec 13, 2024

TylerJang27 Dec 14, 2024

		bep_events_file.flush()?;
		bep_events_file.seek(std::io::SeekFrom::Start(0))?;

(Feat): Upload streamlined BEP file #226

(Feat): Upload streamlined BEP file #226

Conversation

TylerJang27 commented Dec 13, 2024 • edited Loading

trunk-io bot commented Dec 13, 2024 • edited Loading

trunk-staging-io bot commented Dec 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

max-trunk left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TylerJang27 commented Dec 13, 2024 •

edited

Loading

trunk-io bot commented Dec 13, 2024 •

edited

Loading

trunk-staging-io bot commented Dec 13, 2024 •

edited

Loading