reorder params

Author: mabdinur

libdd-telemetry-ffi/src/builder/expanded.rs

@@ -324,8 +324,8 @@ mod macros {
         HostKernelVersion,
         RuntimeId,
         SessionId,
-        RootSessionId,
         ParentSessionId,
+        RootSessionId,
     }
     #[no_mangle]
     /**
@@ -357,10 +357,10 @@ mod macros {
 
      * session_id
 
-     * root_session_id
-
      * parent_session_id
 
+     * root_session_id
+
     */
     pub unsafe extern "C" fn ddog_telemetry_builder_with_property_str(
         telemetry_builder: &mut TelemetryWorkerBuilder,
@@ -571,8 +571,8 @@ mod macros {
                         }
                     };
             }
-            RootSessionId => {
-                telemetry_builder.config.root_session_id =
+            ParentSessionId => {
+                telemetry_builder.config.parent_session_id =
                     match (|s: ffi::CharSlice| -> Result<_, String> {
                         Ok(Some(s.to_utf8_lossy().into_owned()))
                     })(param)
@@ -588,8 +588,8 @@ mod macros {
                         }
                     };
             }
-            ParentSessionId => {
-                telemetry_builder.config.parent_session_id =
+            RootSessionId => {
+                telemetry_builder.config.root_session_id =
                     match (|s: ffi::CharSlice| -> Result<_, String> {
                         Ok(Some(s.to_utf8_lossy().into_owned()))
                     })(param)
@@ -638,10 +638,10 @@ mod macros {
 
      * session_id
 
-     * root_session_id
-
      * parent_session_id
 
+     * root_session_id
+
     */
     pub unsafe extern "C" fn ddog_telemetry_builder_with_str_named_property(
         telemetry_builder: &mut TelemetryWorkerBuilder,
@@ -862,8 +862,8 @@ mod macros {
                         }
                     };
             }
-            "root_session_id" => {
-                telemetry_builder.config.root_session_id =
+            "parent_session_id" => {
+                telemetry_builder.config.parent_session_id =
                     match (|s: ffi::CharSlice| -> Result<_, String> {
                         Ok(Some(s.to_utf8_lossy().into_owned()))
                     })(param)
@@ -879,8 +879,8 @@ mod macros {
                         }
                     };
             }
-            "parent_session_id" => {
-                telemetry_builder.config.parent_session_id =
+            "root_session_id" => {
+                telemetry_builder.config.root_session_id =
                     match (|s: ffi::CharSlice| -> Result<_, String> {
                         Ok(Some(s.to_utf8_lossy().into_owned()))
                     })(param)

libdd-telemetry-ffi/src/builder/macros.rs

@@ -38,8 +38,8 @@ crate::c_setters!(
 
         runtime_id,
         session_id,
-        root_session_id,
         parent_session_id,
+        root_session_id,
     }
 );
 

libdd-telemetry/src/config.rs

@@ -37,9 +37,9 @@ pub struct Config {
     #[serde(default)]
     pub session_id: Option<String>,
     #[serde(default)]
-    pub root_session_id: Option<String>,
-    #[serde(default)]
     pub parent_session_id: Option<String>,
+    #[serde(default)]
+    pub root_session_id: Option<String>,
 }
 
 fn endpoint_with_telemetry_path(
@@ -174,8 +174,8 @@ impl Default for Config {
             restartable: false,
             debug_enabled: false,
             session_id: None,
-            root_session_id: None,
             parent_session_id: None,
+            root_session_id: None,
         }
     }
 }
@@ -260,8 +260,8 @@ impl Config {
             restartable: false,
             debug_enabled: false,
             session_id: None,
-            root_session_id: None,
             parent_session_id: None,
+            root_session_id: None,
         };
         if let Ok(url) = parse_uri(&trace_agent_url) {
             let _res = this.set_endpoint(Endpoint {

libdd-telemetry/src/worker/http_client.rs

@@ -29,11 +29,13 @@ pub mod header {
     pub const DD_PARENT_SESSION_ID: HeaderName = HeaderName::from_static("dd-parent-session-id");
 }
 
+/// `session_id`, then `parent_session_id`, then `root_session_id` (must match call sites in
+/// `build_request`).
 pub(crate) fn add_instrumentation_session_headers(
     mut builder: HttpRequestBuilder,
     session_id: Option<&str>,
-    root_session_id: Option<&str>,
     parent_session_id: Option<&str>,
+    root_session_id: Option<&str>,
 ) -> HttpRequestBuilder {
     let Some(s) = session_id.filter(|id| !id.is_empty()) else {
         return builder;

libdd-telemetry/src/worker/mod.rs

@@ -767,8 +767,8 @@ impl TelemetryWorker {
         let req = http_client::add_instrumentation_session_headers(
             req,
             self.config.session_id.as_deref(),
-            self.config.root_session_id.as_deref(),
             self.config.parent_session_id.as_deref(),
+            self.config.root_session_id.as_deref(),
         );
 
         let body = http_common::Body::from(serialize::serialize(&tel)?);