From 4d6b362f9c66f07645483a2808083c1a03c94a32 Mon Sep 17 00:00:00 2001
From: Warren <5959690+wrn14897@users.noreply.github.com>
Date: Sun, 14 Jul 2024 21:22:27 -0700
Subject: [PATCH] feat: support sentry sdk 'X-Sentry-Auth' header (#473)

---
 .changeset/violet-ads-heal.md |  6 ++++++
 docker/ingestor/core.toml     | 17 +++++++++++++++++
 docker/ingestor/sources.toml  |  3 ++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/violet-ads-heal.md

diff --git a/.changeset/violet-ads-heal.md b/.changeset/violet-ads-heal.md
new file mode 100644
index 000000000..437d99722
--- /dev/null
+++ b/.changeset/violet-ads-heal.md
@@ -0,0 +1,6 @@
+---
+'@hyperdx/api': minor
+'@hyperdx/app': minor
+---
+
+feat: support sentry sdk 'X-Sentry-Auth' header
diff --git a/docker/ingestor/core.toml b/docker/ingestor/core.toml
index 6b7143b74..f9ed6ffd4 100644
--- a/docker/ingestor/core.toml
+++ b/docker/ingestor/core.toml
@@ -40,8 +40,24 @@ inputs = ["http_server"]
 source = '''
   .hdx_content_type = del(."Content-Type")
   .hdx_trace_id = split(del(.Traceparent), "-")[1] ?? null
+  tmp_sentry_auth = del(."X-Sentry-Auth")
 
   # Hack sentry 😎
+  # for client like ruby
+  if is_string(tmp_sentry_auth) {
+    # input example: Sentry sentry_version=7, sentry_client=sentry-ruby/5.18.1, sentry_timestamp=1720998946, sentry_key=blabla
+    tmp_sentry_auth_headers = parse_key_value(tmp_sentry_auth, field_delimiter:",") ?? null
+    if is_object(tmp_sentry_auth_headers) {
+      .sentry_version = tmp_sentry_auth_headers."Sentry sentry_version"
+      .sentry_client = tmp_sentry_auth_headers.sentry_client
+      .sentry_key = tmp_sentry_auth_headers.sentry_key
+      tmp_timestamp = tmp_sentry_auth_headers.sentry_timestamp
+      if !is_nullish(tmp_timestamp) {
+        # override timestamp so its type is consistent
+        .b.timestamp = tmp_timestamp
+      }
+    }
+  }
   if is_string(.sentry_key) && length(to_string(.sentry_key) ?? "") == 32 { 
     .hdx_content_type = "application/json"
     .hdx_platform = "sentry"
@@ -548,6 +564,7 @@ del(.timestamp)
 del(.authorization)
 del(.hdx_content_type)
 del(.hdx_trace_id)
+del(.sentry_client)
 del(.sentry_key)
 del(.sentry_version)
 '''
diff --git a/docker/ingestor/sources.toml b/docker/ingestor/sources.toml
index 2a0f4ce14..499ad72b0 100644
--- a/docker/ingestor/sources.toml
+++ b/docker/ingestor/sources.toml
@@ -1,12 +1,13 @@
 [sources.http_server]
 type = "http_server"
 address = "0.0.0.0:8002"
-headers = ["authorization", "Content-Type", "Traceparent"]
+headers = ["authorization", "Content-Type", "Traceparent", "X-Sentry-Auth"]
 strict_path = false
 path = ""
 query_parameters = [
   "hdx_platform",
   "hdx_token",
+  "sentry_client",
   "sentry_key",
   "sentry_version"
 ]