Fix minidump endpoint configuration (#35646)

Max Brunsfeld created 3 months ago

Release Notes:

- N/A

Change summary

.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(-)

Detailed changes

.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:

.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:

.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 }}
 

crates/client/src/telemetry.rs

@@ -74,10 +74,10 @@ static ZED_CLIENT_CHECKSUM_SEED: LazyLock<Option<Vec<u8>>> = LazyLock::new(|| {
         })
 });
 
-pub static SENTRY_MINIDUMP_ENDPOINT: LazyLock<Option<String>> = LazyLock::new(|| {
-    option_env!("SENTRY_MINIDUMP_ENDPOINT")
+pub static MINIDUMP_ENDPOINT: LazyLock<Option<String>> = 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<Regex> = LazyLock::new(|| {

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<u8>,
     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)