Pass in API key

Author: gyuheon0h

datadog-crashtracker/src/crash_info/mod.rs

@@ -195,6 +195,21 @@ impl CrashInfo {
         let payload_json = serde_json::to_string(&error_tracking_payload)?;
 
         // Log endpoint and payload for debugging/testing
+        let debug_msg = format!(
+            "DEBUG: upload_to_error_tracking called with endpoint: {}, api_key: {}\n",
+            endpoint.url,
+            if endpoint.api_key.is_some() {
+                "present"
+            } else {
+                "missing"
+            }
+        );
+        let _ = std::fs::OpenOptions::new()
+            .create(true)
+            .append(true)
+            .open("/tmp/crashtracker_debug.log")
+            .and_then(|mut f| std::io::Write::write_all(&mut f, debug_msg.as_bytes()));
+
         if let Err(e) = self.log_error_tracking_request(&endpoint.url.to_string(), &payload_json) {
             eprintln!("Failed to log error tracking request: {}", e);
         }

datadog-crashtracker/src/shared/configuration.rs

@@ -142,16 +142,10 @@ impl CrashtrackerConfiguration {
 
         // If no secondary endpoint is provided but we have a primary endpoint,
         // derive a default secondary endpoint
-        // let secondary_endpoint = secondary_endpoint.or_else(|| {
-        //     endpoint
-        //         .as_ref()
-        //         .and_then(|primary| derive_default_secondary_endpoint(primary))
-        // });
-
         let secondary_endpoint = secondary_endpoint.or_else(|| {
-            let derived = derive_default_secondary_endpoint(endpoint.as_ref().unwrap());
-            panic!("{}", format!("new_with_secondary: {:?}", derived));
-            endpoint.as_ref().and_then(|primary| derived)
+            endpoint
+                .as_ref()
+                .and_then(|primary| derive_default_secondary_endpoint(primary))
         });
 
         // Note:  don't check the receiver socket upfront, since a configuration can be interned
@@ -314,9 +308,31 @@ fn derive_default_secondary_endpoint(primary: &Endpoint) -> Option<Endpoint> {
         return None;
     };
 
+    // For Error Tracking endpoints, we need an API key
+    let api_key = primary.api_key.clone().or_else(|| {
+        std::env::var("DD_API_KEY")
+            .ok()
+            .map(std::borrow::Cow::Owned)
+    });
+
+    let debug_msg = format!(
+        "DEBUG: Creating secondary endpoint: {} with api_key: {}\n",
+        secondary_url,
+        if api_key.is_some() {
+            "present"
+        } else {
+            "missing"
+        }
+    );
+    let _ = std::fs::OpenOptions::new()
+        .create(true)
+        .append(true)
+        .open("/tmp/crashtracker_debug.log")
+        .and_then(|mut f| std::io::Write::write_all(&mut f, debug_msg.as_bytes()));
+
     Some(Endpoint {
         url: secondary_url.parse().ok()?,
-        api_key: primary.api_key.clone(),
+        api_key,
         timeout_ms: primary.timeout_ms,
         test_token: primary.test_token.clone(),
     })