feat(prof): add source code integration (#3418)

realFlowControl · morrisonlevi · web-flow · commit f32784c2c860 · 2025-09-23T12:55:59.000-06:00
* add basic SCI support via env variables

* move SCI env vars to config

* leave protocol in URL

* refactor: rename var since meaning changed

---------

Co-authored-by: Levi Morrison &lt;levi.morrison@datadoghq.com&gt;
diff --git a/profiling/src/config.rs b/profiling/src/config.rs
@@ -379,6 +379,8 @@ pub(crate) enum ConfigId {
     TraceAgentPort,
     TraceAgentUrl,
     Version,
+    GitCommitSha,
+    GitRepositoryUrl,
 }
 
 use ConfigId::*;
@@ -411,6 +413,8 @@ impl ConfigId {
             TraceAgentPort => b"DD_TRACE_AGENT_PORT\0",
             TraceAgentUrl => b"DD_TRACE_AGENT_URL\0",
             Version => b"DD_VERSION\0",
+            GitCommitSha => b"DD_GIT_COMMIT_SHA\0",
+            GitRepositoryUrl => b"DD_GIT_REPOSITORY_URL\0",
         };
 
         // Safety: all these byte strings are [CStr::from_bytes_with_nul_unchecked] compatible.
@@ -673,6 +677,20 @@ pub(crate) unsafe fn version() -> Option<String> {
     get_str(Version)
 }
 
+/// # Safety
+/// This function must only be called after config has been initialized in
+/// rinit, and before it is uninitialized in mshutdown.
+pub(crate) unsafe fn git_commit_sha() -> Option<String> {
+    get_str(GitCommitSha)
+}
+
+/// # Safety
+/// This function must only be called after config has been initialized in
+/// rinit, and before it is uninitialized in mshutdown.
+pub(crate) unsafe fn git_repository_url() -> Option<String> {
+    get_str(GitRepositoryUrl)
+}
+
 /// # Safety
 /// This function must only be called after config has been initialized in
 /// rinit, and before it is uninitialized in mshutdown.
@@ -1164,6 +1182,30 @@ pub(crate) fn minit(module_number: libc::c_int) {
                     displayer: None,
                     env_config_fallback: None,
                 },
+                zai_config_entry {
+                    id: transmute::<ConfigId, u16>(GitCommitSha),
+                    name: GitCommitSha.env_var_name(),
+                    type_: ZAI_CONFIG_TYPE_STRING,
+                    default_encoded_value: ZaiStr::new(),
+                    aliases: ptr::null_mut(),
+                    aliases_count: 0,
+                    ini_change: None,
+                    parser: Some(parse_utf8_string),
+                    displayer: None,
+                    env_config_fallback: None,
+                },
+                zai_config_entry {
+                    id: transmute::<ConfigId, u16>(GitRepositoryUrl),
+                    name: GitRepositoryUrl.env_var_name(),
+                    type_: ZAI_CONFIG_TYPE_STRING,
+                    default_encoded_value: ZaiStr::new(),
+                    aliases: ptr::null_mut(),
+                    aliases_count: 0,
+                    ini_change: None,
+                    parser: Some(parse_utf8_string),
+                    displayer: None,
+                    env_config_fallback: None,
+                },
             ]
         };
 
@@ -1208,6 +1250,8 @@ mod tests {
             (b"DD_SERVICE\0", "datadog.service"),
             (b"DD_ENV\0", "datadog.env"),
             (b"DD_VERSION\0", "datadog.version"),
+            (b"DD_GIT_COMMIT_SHA\0", "datadog.git_commit_sha"),
+            (b"DD_GIT_REPOSITORY_URL\0", "datadog.git_repository_url"),
             (b"DD_TRACE_AGENT_URL\0", "datadog.trace.agent_url"),
             (b"DD_TRACE_AGENT_PORT\0", "datadog.trace.agent_port"),
             (b"DD_AGENT_HOST\0", "datadog.agent_host"),
diff --git a/profiling/src/lib.rs b/profiling/src/lib.rs
@@ -413,6 +413,8 @@ pub struct RequestLocals {
     pub env: Option<String>,
     pub service: Option<String>,
     pub version: Option<String>,
+    pub git_commit_sha: Option<String>,
+    pub git_repository_url: Option<String>,
     pub tags: Vec<Tag>,
 
     /// SystemSettings are global. Note that if this is being read in fringe
@@ -442,6 +444,8 @@ impl Default for RequestLocals {
             env: None,
             service: None,
             version: None,
+            git_commit_sha: None,
+            git_repository_url: None,
             tags: vec![],
             system_settings: ptr::NonNull::from(INITIAL_SYSTEM_SETTINGS.deref()),
             interrupt_count: AtomicU32::new(0),
@@ -590,6 +594,21 @@ extern "C" fn rinit(_type: c_int, _module_number: c_int) -> ZendResult {
                 }
             });
             locals.version = config::version();
+            locals.git_commit_sha = config::git_commit_sha();
+            locals.git_repository_url = config::git_repository_url().map(|val| {
+                // Remove potential credentials, customers are encouraged to not send those anyway.
+                if let Some(at_pos) = val.find("@") {
+                    if let Some(proto_pos) = val.find("://") {
+                        // Keep protocol, but remove credentials
+                        format!("{}{}", &val[..(proto_pos + 3)], &val[(at_pos + 1)..])
+                    } else {
+                        // No protocol, just remove everything before @
+                        val[(at_pos + 1)..].to_string()
+                    }
+                } else {
+                    val
+                }
+            });
 
             let (tags, maybe_err) = config::tags();
             if let Some(err) = maybe_err {
@@ -682,16 +701,20 @@ extern "C" fn rinit(_type: c_int, _module_number: c_int) -> ZendResult {
             TAGS.set({
                 // SAFETY: accessing in RINIT after config is initialized.
                 let globals = GLOBAL_TAGS.deref();
-                let unified_service_tags_len = locals.service.is_some() as usize
+                let extra_tags_len = locals.service.is_some() as usize
                     + locals.env.is_some() as usize
-                    + locals.version.is_some() as usize;
+                    + locals.version.is_some() as usize
+                    + locals.git_commit_sha.is_some() as usize
+                    + locals.git_repository_url.is_some() as usize;
 
                 let mut tags = Vec::new();
-                tags.reserve_exact(globals.len() + unified_service_tags_len + locals.tags.len());
+                tags.reserve_exact(globals.len() + extra_tags_len + locals.tags.len());
                 tags.extend_from_slice(globals.as_slice());
                 add_optional_tag(&mut tags, "service", &locals.service);
                 add_optional_tag(&mut tags, "env", &locals.env);
                 add_optional_tag(&mut tags, "version", &locals.version);
+                add_optional_tag(&mut tags, "git.commit.sha", &locals.git_commit_sha);
+                add_optional_tag(&mut tags, "git.repository_url", &locals.git_repository_url);
                 tags.extend_from_slice(locals.tags.as_slice());
                 Arc::new(tags)
             });
