Leave empty if not available as per PR comment

DataDog · Dec 2, 2024 · 5272418 · 5272418
1 parent e4198c1
commit 5272418
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/crashtracker/src/crash_info/telemetry.rs b/crashtracker/src/crash_info/telemetry.rs
@@ -149,7 +149,7 @@ impl TelemetryCrashUploader {
             seq_id: 1,
             application: &metadata.application,
             host: &metadata.host,
-            origin: "Crashtracker",
+            origin: Some("Crashtracker"),
             payload: &data::Payload::Logs(vec![data::Log {
                 message,
                 level: LogLevel::Error,

diff --git a/crashtracker/src/rfc5_crash_info/telemetry.rs b/crashtracker/src/rfc5_crash_info/telemetry.rs
@@ -136,6 +136,7 @@ impl TelemetryCrashUploader {
                 is_sensitive: true,
                 count: 1,
             }]),
+            origin: Some("Crashtracker"),
         };
         let client = ddtelemetry::worker::http_client::from_config(&self.cfg);
         let req = request_builder(&self.cfg)?

diff --git a/ddtelemetry/examples/tm-ping.rs b/ddtelemetry/examples/tm-ping.rs
@@ -35,7 +35,7 @@ fn build_request<'a>(
         tracer_time: SystemTime::UNIX_EPOCH.elapsed().map_or(0, |d| d.as_secs()),
         runtime_id: "runtime_id",
         seq_id: seq_id(),
-        origin: "tm-ping",
+        origin: Some("tm-ping"),
         application,
         host,
         payload,

diff --git a/ddtelemetry/examples/tm-send-sketch.rs b/ddtelemetry/examples/tm-send-sketch.rs
@@ -33,7 +33,7 @@ fn build_request<'a>(
         tracer_time: SystemTime::UNIX_EPOCH.elapsed().map_or(0, |d| d.as_secs()),
         runtime_id: "runtime_id",
         seq_id: seq_id(),
-        origin: "tm-send-sketch",
+        origin: Some("tm-send-sketch"),
         application,
         host,
         payload,

diff --git a/ddtelemetry/src/data/common.rs b/ddtelemetry/src/data/common.rs
@@ -30,7 +30,8 @@ pub struct Telemetry<'a> {
     pub seq_id: u64,
     pub application: &'a Application,
     pub host: &'a Host,
-    pub origin: &'a str,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub origin: Option<&'a str>,
     #[serde(flatten)]
     pub payload: &'a Payload,
 }

diff --git a/ddtelemetry/src/worker/mod.rs b/ddtelemetry/src/worker/mod.rs
@@ -636,7 +636,7 @@ impl TelemetryWorker {
             runtime_id: &self.runtime_id,
             seq_id,
             host: &self.data.host,
-            origin: "unknown",
+            origin: None,
             application: &self.data.app,
             payload,
         };