Skip to content

Commit e159ec0

Browse files
committed
Revert
1 parent 5ba06af commit e159ec0

File tree

1 file changed

+17
-49
lines changed

1 file changed

+17
-49
lines changed

datadog-crashtracker/src/crash_info/telemetry.rs

Lines changed: 17 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -238,31 +238,16 @@ impl TelemetryCrashUploader {
238238
// Send to both telemetry and errors intake
239239
let telemetry_result = self.send_telemetry_payload(&payload).await;
240240

241-
// Also send crash ping to errors intake if available
242-
// if let Some(errors_uploader) = &self.errors_intake_uploader {
243-
// let crash_metadata = self.telemetry_metadata_to_crashtracker_metadata();
244-
// if let Err(e) = errors_uploader
245-
// .send_crash_ping(crash_uuid, sig_info, &crash_metadata)
246-
// .await
247-
// {
248-
// eprintln!("Failed to send crash ping to errors intake: {e}");
249-
// }
250-
// } else {
251-
// eprintln!("DEBUG: No errors intake uploader available for crash ping");
252-
// }
253-
{
254-
let client = ddtelemetry::worker::http_client::from_config(&self.cfg);
255-
let req = http::Request::builder()
256-
.method(http::Method::POST)
257-
.uri("http://localhost:9126/evp_proxy/v2/api/v2/errorsintake")
258-
.header("X-Datadog-EVP-Subdomain", "event-platform-intake")
259-
.body(serde_json::to_string(&crash_ping_msg)?.into())
260-
.unwrap();
261-
262-
// Fire-and-forget notification; ignore errors.
263-
let _ = tokio::spawn(async move {
264-
let _ = client.request(req).await;
265-
});
241+
if let Some(errors_uploader) = &self.errors_intake_uploader {
242+
let crash_metadata = self.telemetry_metadata_to_crashtracker_metadata();
243+
let errors_intake_result = errors_uploader
244+
.send_crash_ping(crash_uuid, sig_info, &crash_metadata)
245+
.await;
246+
if let Err(e) = errors_intake_result {
247+
eprintln!("Failed to send crash report to errors intake: {e}");
248+
}
249+
} else {
250+
eprintln!("No errors intake uploader available for crash report");
266251
}
267252

268253
telemetry_result
@@ -308,30 +293,13 @@ impl TelemetryCrashUploader {
308293
// Send to both telemetry and errors intake
309294
let telemetry_result = self.send_telemetry_payload(&payload).await;
310295

311-
// Also send crash report to errors intake if available
312-
// if let Some(errors_uploader) = &self.errors_intake_uploader {
313-
// eprintln!("DEBUG: Attempting to send crash report to errors intake");
314-
// if let Err(e) = errors_uploader.upload_to_errors_intake(crash_info).await {
315-
// eprintln!("Failed to send crash report to errors intake: {e}");
316-
// }
317-
// } else {
318-
// eprintln!("DEBUG: No errors intake uploader available for crash report");
319-
// }
320-
// Send an HTTP request to http://localhost:9126/
321-
// This is a fire-and-forget notification; ignore errors.
322-
{
323-
let client = ddtelemetry::worker::http_client::from_config(&self.cfg);
324-
let req = http::Request::builder()
325-
.method(http::Method::POST)
326-
.uri("http://localhost:9126/evp_proxy/v2/api/v2/errorsintake")
327-
.header("X-Datadog-EVP-Subdomain", "event-platform-intake")
328-
.body(serde_json::to_string(&payload)?.into())
329-
.unwrap();
330-
331-
// Fire-and-forget notification; ignore errors.
332-
let _ = tokio::spawn(async move {
333-
let _ = client.request(req).await;
334-
});
296+
if let Some(errors_uploader) = &self.errors_intake_uploader {
297+
let errors_intake_result = errors_uploader.upload_to_errors_intake(crash_info).await;
298+
if let Err(e) = errors_intake_result {
299+
eprintln!("Failed to send crash report to errors intake: {e}");
300+
}
301+
} else {
302+
eprintln!("No errors intake uploader available for crash report");
335303
}
336304
telemetry_result
337305
}

0 commit comments

Comments
 (0)