apply feedbacks

Signed-off-by: Alexandre Rulleau <alexandre.rulleau@datadoghq.com>

Author: Leiyks

components-rs/sidecar.h

@@ -92,70 +92,14 @@ void ddog_sidecar_transport_drop(struct ddog_SidecarTransport*);
  */
 ddog_MaybeError ddog_sidecar_connect(struct ddog_SidecarTransport **connection);
 
-/**
- * Start master listener thread for thread-based connections (Unix only).
- *
- * This spawns a listener thread that accepts worker connections. Only one
- * master listener can be active per process.
- *
- * # Arguments
- * * `pid` - Process ID that owns this listener
- *
- * # Returns
- * * `MaybeError::None` on success
- * * `MaybeError::Some(Error)` on failure
- */
 ddog_MaybeError ddog_sidecar_connect_master(int32_t pid);
 
-/**
- * Connect as worker to master listener thread (Unix only).
- *
- * Establishes a connection to the master listener for the given PID.
- *
- * # Arguments
- * * `pid` - Process ID of the master process
- * * `connection` - Output parameter for the connection
- *
- * # Returns
- * * `MaybeError::None` on success
- * * `MaybeError::Some(Error)` on failure
- */
 ddog_MaybeError ddog_sidecar_connect_worker(int32_t pid, struct ddog_SidecarTransport **connection);
 
-/**
- * Shutdown the master listener thread (Unix only).
- *
- * Sends shutdown signal and joins the listener thread. This is blocking.
- *
- * # Returns
- * * `MaybeError::None` on success
- * * `MaybeError::Some(Error)` on failure
- */
 ddog_MaybeError ddog_sidecar_shutdown_master_listener(void);
 
-/**
- * Check if master listener is active for the given PID (Unix only).
- *
- * Used for fork detection.
- *
- * # Arguments
- * * `pid` - Process ID to check
- *
- * # Returns
- * * `true` if listener is active for this PID
- * * `false` otherwise
- */
 bool ddog_sidecar_is_master_listener_active(int32_t pid);
 
-/**
- * Clear inherited master listener state in child after fork (Unix only).
- *
- * Child processes must call this to avoid using the parent's listener.
- *
- * # Returns
- * * `MaybeError::None` on success
- * * `MaybeError::Some(Error)` on failure
- */
 ddog_MaybeError ddog_sidecar_clear_inherited_listener(void);
 
 ddog_MaybeError ddog_sidecar_ping(struct ddog_SidecarTransport **transport);

ext/ddtrace.c

@@ -453,10 +453,7 @@ static void dd_activate_once(void) {
         }
 
         // if we're to enable appsec, we need to enable sidecar
-        bool enable_sidecar = ddtrace_sidecar_maybe_enable_appsec(&appsec_activation, &appsec_config);
-        if (!enable_sidecar) {
-            enable_sidecar = get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED() || get_global_DD_TRACE_SIDECAR_TRACE_SENDER();
-        }
+        bool enable_sidecar = ddtrace_sidecar_should_enable(&appsec_activation, &appsec_config);
 
         if (enable_sidecar)
 #endif
@@ -1615,11 +1612,7 @@ static PHP_MSHUTDOWN_FUNCTION(ddtrace) {
 
     ddtrace_user_req_shutdown();
 
-    // Only shutdown sidecar in MSHUTDOWN for non-CLI SAPIs
-    // CLI SAPI shuts down in RSHUTDOWN to allow thread joins before ASAN checks
-    if (strcmp(sapi_module.name, "cli") != 0) {
-        ddtrace_sidecar_shutdown();
-    }
+    ddtrace_sidecar_shutdown();
 
     ddtrace_live_debugger_mshutdown();
 
@@ -2639,30 +2632,9 @@ void dd_internal_handle_fork(void) {
         ddtrace_coms_curl_shutdown();
         ddtrace_coms_clean_background_sender_after_fork();
     }
-
-    // Handle thread mode after fork
-    int32_t current_pid = (int32_t)getpid();
-    bool is_child_process = (ddtrace_sidecar_master_pid != 0 &&
-                             current_pid != ddtrace_sidecar_master_pid);
-
-    if (is_child_process && ddtrace_sidecar_active_mode == DD_SIDECAR_CONNECTION_THREAD) {
-        // Clear inherited master listener state (child doesn't own it)
-        ddtrace_ffi_try("Failed clearing inherited listener state",
-                        ddog_sidecar_clear_inherited_listener());
-
-        // Attempt to reconnect child to parent's master listener
-        bool appsec_activation = false;
-        bool appsec_config = false;
-        bool enable_sidecar = ddtrace_sidecar_maybe_enable_appsec(&appsec_activation, &appsec_config);
-        if (!enable_sidecar) {
-            enable_sidecar = get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED() || get_global_DD_TRACE_SIDECAR_TRACE_SENDER();
-        }
-
-        if (enable_sidecar && !ddtrace_sidecar_reconnect_after_fork(appsec_activation, appsec_config)) {
-            LOG(WARN, "Child process after fork with thread mode: failed to reconnect to parent's listener");
-        }
-    }
 #endif
+
+    ddtrace_sidecar_handle_fork();
     if (DDTRACE_G(agent_config_reader)) {
         ddog_agent_remote_config_reader_drop(DDTRACE_G(agent_config_reader));
         DDTRACE_G(agent_config_reader) = NULL;
@@ -2677,11 +2649,6 @@ void dd_internal_handle_fork(void) {
     }
     ddtrace_seed_prng();
     ddtrace_generate_runtime_id();
-    // Thread mode already handled sidecar reconnection above (lines 2648-2664)
-    // Only reset for subprocess mode
-    if (ddtrace_sidecar_active_mode != DD_SIDECAR_CONNECTION_THREAD) {
-        ddtrace_reset_sidecar();
-    }
     if (!get_DD_TRACE_FORKED_PROCESS()) {
         ddtrace_disable_tracing_in_current_request();
     }