fix(tracer): remove debug logs

Leiyks · Leiyks · commit cda73e8ca254 · 2026-01-16T16:24:06.000+01:00
Signed-off-by: Alexandre Rulleau &lt;alexandre.rulleau@datadoghq.com&gt;
diff --git a/components-rs/common.h b/components-rs/common.h
diff --git a/components-rs/crashtracker.h b/components-rs/crashtracker.h
@@ -451,7 +451,7 @@ void ddog_crasht_CrashInfoBuilder_drop(struct ddog_crasht_Handle_CrashInfoBuilde
  * which has not previously been dropped.
  */
 DDOG_CHECK_RETURN
-struct ddog_crasht_CrashInfo_NewResult ddog_crasht_CrashInfoBuilder_build(struct ddog_crasht_Handle_CrashInfoBuilder *builder);
+ddog_crasht_CrashInfo_NewResult ddog_crasht_CrashInfoBuilder_build(struct ddog_crasht_Handle_CrashInfoBuilder *builder);
 
 /**
  * # Safety
@@ -854,7 +854,7 @@ struct ddog_StringWrapperResult ddog_crasht_demangle(ddog_CharSlice name,
  * signal handler is dangerous, so we fork a sidecar to do the stuff we aren't
  * allowed to do in the handler.
  *
- * See comments in [datadog-crashtracker/lib.rs] for a full architecture description.
+ * See comments in [libdd-crashtracker/lib.rs] for a full architecture description.
  * # Safety
  * No safety concerns
  */
@@ -868,7 +868,7 @@ DDOG_CHECK_RETURN struct ddog_VoidResult ddog_crasht_receiver_entry_point_stdin(
  * signal handler is dangerous, so we fork a sidecar to do the stuff we aren't
  * allowed to do in the handler.
  *
- * See comments in [datadog-crashtracker/lib.rs] for a full architecture
+ * See comments in [libdd-crashtracker/lib.rs] for a full architecture
  * description.
  * # Safety
  * No safety concerns
diff --git a/components-rs/ddtrace.h b/components-rs/ddtrace.h
@@ -116,16 +116,6 @@ ddog_MaybeError ddog_sidecar_connect_php(struct ddog_SidecarTransport **connecti
 void ddtrace_sidecar_reconnect(struct ddog_SidecarTransport **transport,
                                struct ddog_SidecarTransport *(*factory)(void));
 
-// Thread-based sidecar connection (Unix only)
-#if !defined(_WIN32)
-ddog_MaybeError ddog_sidecar_connect_master(int32_t pid);
-ddog_MaybeError ddog_sidecar_connect_worker(int32_t pid,
-                                             struct ddog_SidecarTransport **connection);
-ddog_MaybeError ddog_sidecar_shutdown_master_listener(void);
-bool ddog_sidecar_is_master_listener_active(int32_t pid);
-ddog_MaybeError ddog_sidecar_clear_inherited_listener(void);
-#endif
-
 bool ddog_shm_limiter_inc(const struct ddog_MaybeShmLimiter *limiter, uint32_t limit);
 
 bool ddog_exception_hash_limiter_inc(struct ddog_SidecarTransport *connection,
diff --git a/components-rs/sidecar.h b/components-rs/sidecar.h
@@ -95,40 +95,68 @@ 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.
+ * 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
  */
-#if !defined(_WIN32)
 ddog_MaybeError ddog_sidecar_connect_master(int32_t pid);
-#endif
 
 /**
  * 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
  */
-#if !defined(_WIN32)
-ddog_MaybeError ddog_sidecar_connect_worker(int32_t pid,
-                                             struct ddog_SidecarTransport **connection);
-#endif
+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
  */
-#if !defined(_WIN32)
 ddog_MaybeError ddog_sidecar_shutdown_master_listener(void);
-#endif
 
 /**
  * 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
  */
-#if !defined(_WIN32)
 bool ddog_sidecar_is_master_listener_active(int32_t pid);
-#endif
 
 /**
  * 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
  */
-#if !defined(_WIN32)
 ddog_MaybeError ddog_sidecar_clear_inherited_listener(void);
-#endif
 
 ddog_MaybeError ddog_sidecar_ping(struct ddog_SidecarTransport **transport);
 
@@ -156,7 +184,8 @@ ddog_MaybeError ddog_sidecar_telemetry_enqueueConfig(struct ddog_SidecarTranspor
                                                      ddog_CharSlice config_key,
                                                      ddog_CharSlice config_value,
                                                      enum ddog_ConfigurationOrigin origin,
-                                                     ddog_CharSlice config_id);
+                                                     ddog_CharSlice config_id,
+                                                     struct ddog_Option_U64 seq_id);
 
 /**
  * Reports a dependency to the telemetry.
diff --git a/components-rs/telemetry.h b/components-rs/telemetry.h
@@ -42,7 +42,8 @@ ddog_MaybeError ddog_telemetry_builder_with_config(struct ddog_TelemetryWorkerBu
                                                    ddog_CharSlice name,
                                                    ddog_CharSlice value,
                                                    enum ddog_ConfigurationOrigin origin,
-                                                   ddog_CharSlice config_id);
+                                                   ddog_CharSlice config_id,
+                                                   struct ddog_Option_U64 seq_id);
 
 /**
  * Builds the telemetry worker and return a handle to it
diff --git a/ext/sidecar.c b/ext/sidecar.c
@@ -268,7 +268,6 @@ ddog_SidecarTransport *ddtrace_sidecar_connect(bool is_fork) {
     switch (mode) {
     case DD_TRACE_SIDECAR_CONNECTION_MODE_SUBPROCESS:
         // Force subprocess only
-        LOG(DEBUG, "Sidecar connection mode: subprocess (forced)");
         transport = ddtrace_sidecar_connect_subprocess();
         if (!transport) {
             LOG(ERROR, "Subprocess connection failed (mode=subprocess, no fallback)");
@@ -277,7 +276,6 @@ ddog_SidecarTransport *ddtrace_sidecar_connect(bool is_fork) {
 
     case DD_TRACE_SIDECAR_CONNECTION_MODE_THREAD:
         // Force thread only
-        LOG(DEBUG, "Sidecar connection mode: thread (forced)");
         transport = ddtrace_sidecar_connect_thread();
         if (!transport) {
             LOG(ERROR, "Thread connection failed (mode=thread, no fallback)");
@@ -287,23 +285,22 @@ ddog_SidecarTransport *ddtrace_sidecar_connect(bool is_fork) {
     case DD_TRACE_SIDECAR_CONNECTION_MODE_AUTO:
     default:
         // Try subprocess first, fallback to thread if needed
-        LOG(DEBUG, "Sidecar connection mode: auto (trying subprocess first)");
         transport = ddtrace_sidecar_connect_subprocess();
 
-        if (transport) {
-            LOG(DEBUG, "Connected to sidecar via subprocess");
-        } else if (!ddtrace_endpoint) {
-            // Don't try fallback if endpoint is invalid - both modes need a valid endpoint
-            // The "Invalid DD_TRACE_AGENT_URL" error was already logged during endpoint creation
-        } else {
-            // Subprocess failed but endpoint is valid - try thread mode fallback
-            LOG(WARN, "Subprocess connection failed, falling back to thread mode");
-            transport = ddtrace_sidecar_connect_thread();
-
-            if (transport) {
-                LOG(INFO, "Connected to sidecar via thread (fallback)");
+        if (!transport) {
+            if (!ddtrace_endpoint) {
+                // Don't try fallback if endpoint is invalid - both modes need a valid endpoint
+                // The "Invalid DD_TRACE_AGENT_URL" error was already logged during endpoint creation
             } else {
-                LOG(ERROR, "Both subprocess and thread connections failed, sidecar unavailable");
+                // Subprocess failed but endpoint is valid - try thread mode fallback
+                LOG(WARN, "Subprocess connection failed, falling back to thread mode");
+                transport = ddtrace_sidecar_connect_thread();
+
+                if (transport) {
+                    LOG(INFO, "Connected to sidecar via thread (fallback)");
+                } else {
+                    LOG(ERROR, "Both subprocess and thread connections failed, sidecar unavailable");
+                }
             }
         }
         break;
diff --git a/tests/ext/sandbox/die_in_sandbox.phpt b/tests/ext/sandbox/die_in_sandbox.phpt
@@ -17,8 +17,6 @@ x();
 
 ?>
 --EXPECTF--
-[ddtrace] [debug] Sidecar connection mode: auto (trying subprocess first)
-[ddtrace] [debug] Connected to sidecar via subprocess
 [ddtrace] [warning] UnwindExit thrown in ddtrace's closure defined at %s:%d for x(): <exit> in Unknown on line 0
 [ddtrace] [span] Encoding span: Span { service: die_in_sandbox.php, name: die_in_sandbox.php, resource: die_in_sandbox.php, type: cli, trace_id: %d, span_id: %d, parent_id: %d, start: %d, duration: %d, error: %d, meta: %s, metrics: %s, meta_struct: %s, span_links: %s, span_events: %s }
 [ddtrace] [span] Encoding span: Span { service: die_in_sandbox.php, name: x, resource: x, type: cli, trace_id: %d, span_id: %d, parent_id: %d, start: %d, duration: %d, error: %d, meta: %s, metrics: %s, meta_struct: %s, span_links: %s, span_events: %s }
diff --git a/tests/ext/span_on_close.phpt b/tests/ext/span_on_close.phpt
@@ -24,8 +24,6 @@ $span->onClose = [
 
 ?>
 --EXPECTF--
-[ddtrace] [debug] Sidecar connection mode: auto (trying subprocess first)
-[ddtrace] [debug] Connected to sidecar via subprocess
 Second
 First
 [ddtrace] [span] Encoding span: Span { service: %s, name: root span, resource: root span, type: cli, trace_id: %d, span_id: %d, parent_id: %d, start: %d, duration: %d, error: %d, meta: %s, metrics: %s, meta_struct: %s, span_links: %s, span_events: %s }
diff --git a/tests/ext/startup_logging_json_config.phpt b/tests/ext/startup_logging_json_config.phpt
@@ -52,8 +52,6 @@ dd_dump_startup_logs($logs, [
 ]);
 ?>
 --EXPECT--
-[ddtrace] [debug] Sidecar connection mode: auto (trying subprocess first)
-[ddtrace] [debug] Connected to sidecar via subprocess
 Sanity check
 env: "my-env"
 service: "my-service"
