Merge remote-tracking branch 'origin/main' into release

Author: dd-octo-sts[bot]

.github/workflows/pr-metadata-docs-and-deps.yml

@@ -180,6 +180,30 @@ jobs:
         body-path: doc-check-results.md
         edit-mode: replace
 
+  missing-docs-delete:
+    needs: changed-crates
+    if: needs.changed-crates.outputs.crates_count == 0
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - name: Find existing comment
+      uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
+      id: find-comment
+      with:
+        issue-number: ${{ github.event.pull_request.number }}
+        comment-author: 'github-actions[bot]'
+        body-includes: '## 📚 Documentation Check Results'
+    - name: Delete existing docs comment
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      with:
+        script: |
+          github.rest.issues.deleteComment({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            comment_id: ${{ steps.find-comment.outputs.comment-id }},
+          })
+
   changelog-check:
     needs: changed-crates
     if: |
@@ -338,3 +362,27 @@ jobs:
       run: |
         echo "cargo-deny found ${{ steps.cargo-deny.outputs.total_errors }} error(s) and FAIL_IF_CARGO_DENY is enabled"
         exit 1
+
+  dependency-check-delete:
+    needs: changed-crates
+    if: needs.changed-crates.outputs.crates_count == 0
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - name: Find existing comment
+      uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
+      id: find-comment
+      with:
+        issue-number: ${{ github.event.pull_request.number }}
+        comment-author: 'github-actions[bot]'
+        body-includes: '## 🔒 Cargo Deny Results'
+    - name: Delete existing dependency check comment
+      uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+      with:
+        script: |
+          github.rest.issues.deleteComment({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            comment_id: ${{ steps.find-comment.outputs.comment-id }},
+          })

.github/workflows/release-proposal-dispatch.yml

@@ -136,7 +136,9 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
         with:
-          fetch-depth: 0  # Need full history for git tags
+          ref: ${{ env.RELEASE_BRANCH }}
+          fetch-depth: 0
+          fetch-tags: true
       - uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
         with:
           cache-targets: true
@@ -186,6 +188,14 @@ jobs:
       - name: Create a branch for the release proposal
         id: proposal-branch
         run: |
+          git status
+          
+          IS_SHALLOW=$(git rev-parse --is-shallow-repository)
+          if [ "$IS_SHALLOW" = "true" ]; then
+            echo "Repository is shallow"
+            git pull --unshallow
+          fi
+
           git checkout "${{ env.RELEASE_BRANCH }}"
           TIMESTAMP=$(date +%Y%m%d-%H%M%S)
           BRANCH_NAME="${{ env.PROPOSAL_BRANCH_PREFIX }}/${{ inputs.crate }}/$TIMESTAMP"
@@ -380,7 +390,6 @@ jobs:
             "",
             (if $api_info.version then "**Next version:** `\($api_info.version)`\n" else null end),
             "**Semver bump:** `\($api_info.level)`",
-            "",
             (if $api_info.tag then "**Tag:** `\($api_info.tag)`\n" else null end),
             (if $api_info.initial_release == "true" then
               "**Warning:** this is an initial release. Please verify that the version and commits included are correct.\n"

cliff.toml

@@ -85,7 +85,7 @@ commit_parsers = [
   { message = "^feat", group = "<!-- A -->Added" },
   { message = "^fix", group = "<!-- C -->Fixed" },
   { message = "^refactor\\(clippy\\)", skip = true },
-  { message = "^chore\\(release\\): prepare for", skip = true },
+  { message = "^chore\\(release\\)", skip = true },
   { message = "^chore: Release", skip = true },
   { message = "^chore\\(deps.*\\)", skip = true },
   { message = "^chore\\(pr\\)", skip = true },

datadog-sidecar-ffi/src/lib.rs

@@ -588,6 +588,7 @@ pub unsafe extern "C" fn ddog_sidecar_session_set_config(
     remote_config_capabilities_count: usize,
     remote_config_enabled: bool,
     is_fork: bool,
+    process_tags: ffi::CharSlice,
 ) -> MaybeError {
     #[cfg(unix)]
     let remote_config_notify_target = libc::getpid();
@@ -631,13 +632,31 @@ pub unsafe extern "C" fn ddog_sidecar_session_set_config(
             .as_slice()
             .to_vec(),
             remote_config_enabled,
+            process_tags: process_tags.to_utf8_lossy().into(),
         },
         is_fork
     ));
 
     MaybeError::None
 }
 
+/// Updates the process_tags for an existing session.
+#[no_mangle]
+#[allow(clippy::missing_safety_doc)]
+pub unsafe extern "C" fn ddog_sidecar_session_set_process_tags(
+    transport: &mut Box<SidecarTransport>,
+    session_id: ffi::CharSlice,
+    process_tags: ffi::CharSlice,
+) -> MaybeError {
+    try_c!(blocking::set_session_process_tags(
+        transport,
+        session_id.to_utf8_lossy().into(),
+        process_tags.to_utf8_lossy().into(),
+    ));
+
+    MaybeError::None
+}
+
 #[repr(C)]
 pub struct TracerHeaderTags<'a> {
     pub lang: ffi::CharSlice<'a>,

datadog-sidecar-ffi/tests/sidecar.rs

@@ -112,6 +112,7 @@ fn test_ddog_sidecar_register_app() {
             0,
             false,
             false,
+            "".into(),
         )
         .unwrap_none();
 
@@ -162,6 +163,7 @@ fn test_ddog_sidecar_register_app() {
             0,
             false,
             false,
+            "".into(),
         )
         .unwrap_none();
 

datadog-sidecar/src/service/blocking.rs

@@ -243,6 +243,28 @@ pub fn set_session_config(
     })
 }
 
+/// Updates the process tags for an existing session.
+///
+/// # Arguments
+///
+/// * `transport` - The transport used for communication.
+/// * `session_id` - The ID of the session.
+/// * `process_tags` - The process tags string to set.
+///
+/// # Returns
+///
+/// An `io::Result<()>` indicating the result of the operation.
+pub fn set_session_process_tags(
+    transport: &mut SidecarTransport,
+    session_id: String,
+    process_tags: String,
+) -> io::Result<()> {
+    transport.send(SidecarInterfaceRequest::SetSessionProcessTags {
+        session_id,
+        process_tags,
+    })
+}
+
 /// Sends a trace as bytes.
 ///
 /// # Arguments

datadog-sidecar/src/service/mod.rs

@@ -64,6 +64,7 @@ pub struct SessionConfig {
     pub remote_config_products: Vec<RemoteConfigProduct>,
     pub remote_config_capabilities: Vec<RemoteConfigCapabilities>,
     pub remote_config_enabled: bool,
+    pub process_tags: String,
 }
 
 #[derive(Debug, Deserialize, Serialize)]

datadog-sidecar/src/service/session_info.rs

@@ -43,6 +43,7 @@ pub(crate) struct SessionInfo {
     pub(crate) session_id: String,
     pub(crate) pid: Arc<AtomicI32>,
     pub(crate) remote_config_enabled: Arc<Mutex<bool>>,
+    pub(crate) process_tags: Arc<Mutex<Option<String>>>,
 }
 
 impl Clone for SessionInfo {
@@ -62,6 +63,7 @@ impl Clone for SessionInfo {
             session_id: self.session_id.clone(),
             pid: self.pid.clone(),
             remote_config_enabled: self.remote_config_enabled.clone(),
+            process_tags: self.process_tags.clone(),
         }
     }
 }

datadog-sidecar/src/service/sidecar_interface.rs

@@ -67,6 +67,14 @@ pub trait SidecarInterface {
         is_fork: bool,
     );
 
+    /// Updates the process tags for an existing session.
+    ///
+    /// # Arguments
+    ///
+    /// * `session_id` - The ID of the session.
+    /// * `process_tags` - The process tags string.
+    async fn set_session_process_tags(session_id: String, process_tags: String);
+
     /// Shuts down a runtime.
     ///
     /// # Arguments

datadog-sidecar/src/service/sidecar_server.rs

@@ -421,6 +421,8 @@ impl SidecarInterface for SidecarServer {
                 .unwrap_or("unknown-service");
             let env = entry.get().env.as_deref().unwrap_or("none");
 
+            let process_tags = session.process_tags.lock_or_panic().clone();
+
             // Lock telemetry client
             let telemetry_mutex = self.telemetry_clients.get_or_create(
                 service,
@@ -438,6 +440,7 @@ impl SidecarInterface for SidecarServer {
                             Config::default()
                         })
                 },
+                process_tags,
             );
             let mut telemetry = telemetry_mutex.lock_or_panic();
 
@@ -565,6 +568,8 @@ impl SidecarInterface for SidecarServer {
             *session.remote_config_notify_function.lock().unwrap() = remote_config_notify_function;
         }
         *session.remote_config_enabled.lock_or_panic() = config.remote_config_enabled;
+        *session.process_tags.lock_or_panic() =
+            (!config.process_tags.is_empty()).then_some(config.process_tags.clone());
         session.modify_telemetry_config(|cfg| {
             cfg.telemetry_heartbeat_interval = config.telemetry_heartbeat_interval;
             let endpoint = get_product_endpoint(
@@ -658,6 +663,19 @@ impl SidecarInterface for SidecarServer {
         })
     }
 
+    type SetSessionProcessTagsFut = NoResponse;
+
+    fn set_session_process_tags(
+        self,
+        _: Context,
+        session_id: String,
+        process_tags: String,
+    ) -> Self::SetSessionProcessTagsFut {
+        let session = self.get_session(&session_id);
+        *session.process_tags.lock_or_panic() = (!process_tags.is_empty()).then_some(process_tags);
+        no_response()
+    }
+
     type ShutdownRuntimeFut = NoResponse;
 
     fn shutdown_runtime(self, _: Context, instance_id: InstanceId) -> Self::ShutdownRuntimeFut {