From f017ffdffcdfe7b2947f5045092d84ffe5469f9f Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 5 Aug 2025 10:07:30 -0700 Subject: [PATCH] Fix minidump endpoint configuration (#35646) Release Notes: - N/A --- .github/workflows/ci.yml | 2 +- .github/workflows/nix.yml | 2 +- .github/workflows/release_nightly.yml | 2 +- crates/client/src/telemetry.rs | 6 +++--- crates/zed/src/reliability.rs | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c08f4ac211..f83a3715a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ env: DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }} DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }} ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }} - ZED_SENTRY_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }} + ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }} jobs: job_spec: diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index c019f805fe..6c3a97c163 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.system.runner }} env: ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }} - ZED_SENTRY_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }} + ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }} ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }} GIT_LFS_SKIP_SMUDGE: 1 # breaks the livekit rust sdk examples which we don't actually depend on steps: diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index 69e5f86cb6..d62aa78293 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -13,7 +13,7 @@ env: CARGO_INCREMENTAL: 0 RUST_BACKTRACE: 1 ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }} - ZED_SENTRY_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }} + ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }} DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }} DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }} diff --git a/crates/client/src/telemetry.rs b/crates/client/src/telemetry.rs index 4a8e745fcb..43a1a0b7a4 100644 --- a/crates/client/src/telemetry.rs +++ b/crates/client/src/telemetry.rs @@ -74,10 +74,10 @@ static ZED_CLIENT_CHECKSUM_SEED: LazyLock>> = LazyLock::new(|| { }) }); -pub static SENTRY_MINIDUMP_ENDPOINT: LazyLock> = LazyLock::new(|| { - option_env!("SENTRY_MINIDUMP_ENDPOINT") +pub static MINIDUMP_ENDPOINT: LazyLock> = LazyLock::new(|| { + option_env!("ZED_MINIDUMP_ENDPOINT") .map(|s| s.to_owned()) - .or_else(|| env::var("SENTRY_MINIDUMP_ENDPOINT").ok()) + .or_else(|| env::var("ZED_MINIDUMP_ENDPOINT").ok()) }); static DOTNET_PROJECT_FILES_REGEX: LazyLock = LazyLock::new(|| { diff --git a/crates/zed/src/reliability.rs b/crates/zed/src/reliability.rs index 9157f66216..ed149a470a 100644 --- a/crates/zed/src/reliability.rs +++ b/crates/zed/src/reliability.rs @@ -4,7 +4,7 @@ use backtrace::{self, Backtrace}; use chrono::Utc; use client::{ TelemetrySettings, - telemetry::{self, SENTRY_MINIDUMP_ENDPOINT}, + telemetry::{self, MINIDUMP_ENDPOINT}, }; use db::kvp::KEY_VALUE_STORE; use futures::AsyncReadExt; @@ -584,7 +584,7 @@ async fn upload_minidump( minidump: Vec, panic: Option<&Panic>, ) -> Result<()> { - let sentry_upload_url = SENTRY_MINIDUMP_ENDPOINT + let minidump_endpoint = MINIDUMP_ENDPOINT .to_owned() .ok_or_else(|| anyhow::anyhow!("Minidump endpoint not set"))?; @@ -605,7 +605,7 @@ async fn upload_minidump( } let mut response_text = String::new(); - let mut response = http.send_multipart_form(&sentry_upload_url, form).await?; + let mut response = http.send_multipart_form(&minidump_endpoint, form).await?; response .body_mut() .read_to_string(&mut response_text)