CP-53470 Rejoin orphaned spans forwarded to xenopsd to their traceparent

xs-aidan · AnthoineB · commit f75a4dbfe038 · 2025-03-24T20:41:55.000+01:00
Signed-off-by: Aidan Allen &lt;aidan.allen1@cloud.com&gt;
diff --git a/ocaml/xenopsd/lib/xenops_migrate.ml b/ocaml/xenopsd/lib/xenops_migrate.ml
@@ -95,7 +95,7 @@ module Forwarded_http_request = struct
   type t = {
       uri: string
     ; query: (string * string) list
-    ; traceparent: string option
+    ; additional_headers: (string * string) list
     ; cookie: (string * string) list
     ; body: string option
   }
diff --git a/ocaml/xenopsd/lib/xenopsd.ml b/ocaml/xenopsd/lib/xenopsd.ml
@@ -356,7 +356,8 @@ let handle_received_fd this_connection =
         let context = {Xenops_server.transferred_fd= Some received_fd} in
         let uri = Uri.of_string req.Xenops_migrate.Forwarded_http_request.uri in
         let traceparent =
-          req.Xenops_migrate.Forwarded_http_request.traceparent
+          List.assoc_opt "traceparent"
+            req.Xenops_migrate.Forwarded_http_request.additional_headers
         in
         fn uri req.Xenops_migrate.Forwarded_http_request.cookie traceparent
           this_connection context

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ module Forwarded_http_request = struct`
`95`	`95`	`type t = {`
`96`	`96`	`uri: string`
`97`	`97`	`; query: (string * string) list`
`98`		`- ; traceparent: string option`
	`98`	`+ ; additional_headers: (string * string) list`
`99`	`99`	`; cookie: (string * string) list`
`100`	`100`	`; body: string option`
`101`	`101`	`}`