Merge branch 'master' into srest2021/REPLAY-413

Author: srest2021

.github/workflows/build.yml

@@ -33,6 +33,14 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
 
+      - name: Add Rustup Target
+        run: |
+          rustup set profile minimal
+          rustup target add ${{ matrix.target }}
+
+      - name: Cache Dependencies
+        uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
+
       - name: Build
         run: cargo build --release --target=${{ matrix.target }} --locked
 
@@ -64,6 +72,9 @@ jobs:
       - name: Add Rustup Target
         run: rustup target add ${{ matrix.target }}
 
+      - name: Cache Dependencies
+        uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
+
       - name: Run Cargo Build
         run: cargo build --target=${{ matrix.target }} --release --locked
 
@@ -190,6 +201,9 @@ jobs:
       - name: Add Rustup Target
         run: rustup target add ${{ env.TARGET }}
 
+      - name: Cache Dependencies
+        uses: swatinem/rust-cache@98c8021b550208e191a6a3145459bfc9fb29c4c0 # 2.8.0
+
       - name: Run Cargo Build
         run: cargo build --target=${{ env.TARGET }} --release --locked
 

.github/workflows/lint.yml

@@ -40,11 +40,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
 
-      - name: Install Rust Toolchain
-        run: rustup toolchain install stable --profile minimal --component clippy --component rustfmt --no-self-update
-
-      - name: Add Target
-        run: rustup target add ${{ matrix.target }}
+      - name: Setup Rust Toolchain
+        run: |
+          rustup set profile minimal
+          rustup component add clippy rustfmt
+          rustup target add ${{ matrix.target }}
 
       - name: Install musl-gcc (Linux only)
         if: matrix.os == 'ubuntu-24.04'

.github/workflows/test.yml

@@ -41,8 +41,10 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # 5.0.0
 
-      - name: Add Target
-        run: rustup target add ${{ matrix.target }}
+      - name: Setup Rust Toolchain
+        run: |
+          rustup set profile minimal
+          rustup target add ${{ matrix.target }}
 
       - name: Install musl-gcc (Linux only)
         if: matrix.os == 'ubuntu-24.04'

CLAUDE.md

@@ -76,3 +76,7 @@ Access the `.cursor/rules/` directory and read rule file contents. Parse the fro
 - **Parse frontmatter carefully** - use the metadata to determine rule applicability
 
 Treat these rules as **mandatory guidance** that you must follow for all code changes and development activities within this project.
+
+# Code Formatting
+
+**ALWAYS** run `cargo fmt` before committing any Rust code changes to ensure consistent formatting across the codebase.

rust-toolchain.toml

@@ -0,0 +1,4 @@
+[toolchain]
+# We pin the minor version to prevent new Clippy lints from breaking CI.
+# But, we still want to pick up new patch versions.
+channel = "1.89"

src/commands/bash_hook.rs

@@ -19,6 +19,8 @@ use crate::config::Config;
 use crate::utils::event::{attach_logfile, get_sdk_info};
 use crate::utils::releases::detect_release_name;
 
+const MAX_BREADCRUMBS: usize = 100;
+
 const BASH_SCRIPT: &str = include_str!("../bashsupport.sh");
 lazy_static! {
     static ref FRAME_RE: Regex = Regex::new(r"^(.*?):(.*):(\d+)$").unwrap();
@@ -188,7 +190,7 @@ fn send_event(
         }
     }
 
-    attach_logfile(&mut event, logfile, true)?;
+    attach_logfile(&mut event, logfile, true, MAX_BREADCRUMBS)?;
 
     event.exception.values.push(Exception {
         ty: "BashError".into(),

src/commands/send_event.rs

@@ -20,6 +20,9 @@ use crate::utils::args::{get_timestamp, validate_distribution};
 use crate::utils::event::{attach_logfile, get_sdk_info};
 use crate::utils::releases::detect_release_name;
 
+/// The maximum number of breadcrumbs to attach to an event.
+const MAX_BREADCRUMBS: usize = 100;
+
 pub fn make_command(command: Command) -> Command {
     command.about("Send a manual event to Sentry.")
         .long_about(
@@ -143,7 +146,7 @@ pub fn make_command(command: Command) -> Command {
             Arg::new("logfile")
                 .value_name("PATH")
                 .long("logfile")
-                .help("Send a logfile as breadcrumbs with the event (last 100 records)"),
+                .help(format!("Send a logfile as breadcrumbs with the event (last {MAX_BREADCRUMBS} records)")),
         )
         .arg(
             Arg::new("with_categories")
@@ -322,7 +325,12 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
     }
 
     if let Some(logfile) = matches.get_one::<String>("logfile") {
-        attach_logfile(&mut event, logfile, matches.get_flag("with_categories"))?;
+        attach_logfile(
+            &mut event,
+            logfile,
+            matches.get_flag("with_categories"),
+            MAX_BREADCRUMBS,
+        )?;
     }
 
     let id = send_raw_event(event)?;

src/utils/event.rs

@@ -13,7 +13,12 @@ lazy_static! {
 }
 
 /// Attaches all logs from a logfile as breadcrumbs to the given event.
-pub fn attach_logfile(event: &mut Event<'_>, logfile: &str, with_component: bool) -> Result<()> {
+pub fn attach_logfile(
+    event: &mut Event<'_>,
+    logfile: &str,
+    with_component: bool,
+    max_breadcrumbs: usize,
+) -> Result<()> {
     let f = fs::File::open(logfile).context("Could not open logfile")?;
 
     // sentry currently requires timestamps for breadcrumbs at all times.
@@ -46,8 +51,8 @@ pub fn attach_logfile(event: &mut Event<'_>, logfile: &str, with_component: bool
         })
     }
 
-    if event.breadcrumbs.len() > 100 {
-        let skip = event.breadcrumbs.len() - 100;
+    if event.breadcrumbs.len() > max_breadcrumbs {
+        let skip = event.breadcrumbs.len() - max_breadcrumbs;
         event.breadcrumbs.values.drain(..skip);
     }
 

src/utils/vcs.rs

@@ -284,7 +284,7 @@ fn find_merge_base_ref(
 }
 
 /// Attempts to get the base repository name from git remotes.
-/// Prefers "origin" remote if it exists, otherwise uses the first available remote.
+/// Prefers "upstream" remote if it exists, then "origin", otherwise uses the first available remote.
 /// Returns the base repository name if a remote is found.
 pub fn git_repo_base_repo_name(repo: &git2::Repository) -> Result<Option<String>> {
     let remotes = repo.remotes()?;
@@ -295,8 +295,10 @@ pub fn git_repo_base_repo_name(repo: &git2::Repository) -> Result<Option<String>
         return Ok(None);
     }
 
-    // Prefer "origin" remote if it exists, otherwise use the first one
-    let chosen_remote = if remote_names.contains(&"origin") {
+    // Prefer "upstream" if it exists, then "origin", otherwise use the first one
+    let chosen_remote = if remote_names.contains(&"upstream") {
+        "upstream"
+    } else if remote_names.contains(&"origin") {
         "origin"
     } else {
         remote_names[0]