feat: decouple startup logs from DD_TRACE_DEBUG

ext/configuration.h

@@ -206,7 +206,7 @@ enum ddtrace_sidecar_connection_mode {
     CONFIG(INT, DD_TELEMETRY_HEARTBEAT_INTERVAL, "60", .ini_change = zai_config_system_ini_change)             \
     CONFIG(INT, DD_TRACE_AGENT_FLUSH_AFTER_N_REQUESTS, "0")                                                    \
     CONFIG(INT, DD_TRACE_SHUTDOWN_TIMEOUT, "5000", .ini_change = zai_config_system_ini_change)                 \
-    CONFIG(BOOL, DD_TRACE_STARTUP_LOGS, "true")                                                                \
+    CONFIG(BOOL, DD_TRACE_STARTUP_LOGS, "false")                                                               \
     CONFIG(BOOL, DD_TRACE_ONCE_LOGS, "true")                                                                   \
     CONFIG(INT, DD_TRACE_AGENT_RETRIES, "0", .ini_change = zai_config_system_ini_change)                       \
     CONFIG(BOOL, DD_TRACE_AGENT_DEBUG_VERBOSE_CURL, "false", .ini_change = zai_config_system_ini_change)       \

ext/logging.c

@@ -7,7 +7,6 @@
 #include <time.h>
 
 #include "configuration.h"
-#include <main/SAPI.h>
 
 #ifndef _WIN32
 #define atomic_compare_exchange_strong_int atomic_compare_exchange_strong
@@ -17,7 +16,8 @@
 static void dd_log_set_level(bool debug) {
     bool once = runtime_config_first_init ? get_DD_TRACE_ONCE_LOGS() : get_global_DD_TRACE_ONCE_LOGS();
     if (debug) {
-        if (strcmp("cli", sapi_module.name) != 0 && (runtime_config_first_init ? get_DD_TRACE_STARTUP_LOGS() : get_global_DD_TRACE_STARTUP_LOGS())) {
+        bool startup = runtime_config_first_init ? get_DD_TRACE_STARTUP_LOGS() : get_global_DD_TRACE_STARTUP_LOGS();
+        if (startup) {
             ddog_set_log_level(DDOG_CHARSLICE_C("debug"), once);
         } else {
             ddog_set_log_level(DDOG_CHARSLICE_C("debug,startup=error"), once);

ext/startup_logging.c

@@ -363,31 +363,58 @@ static void _dd_print_values_to_log(HashTable *ht, void (*log)(const char *forma
     ZEND_HASH_FOREACH_END();
 }
 
+static void _dd_log_to_stderr(const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    vfprintf(stderr, format, args);
+    va_end(args);
+    fprintf(stderr, "\n");
+}
+
 // Only show startup logs on the first request
 void ddtrace_startup_logging_first_rinit(void) {
-    LOGEV(STARTUP, {
-        HashTable *ht;
-        ALLOC_HASHTABLE(ht);
-        zend_hash_init(ht, DDTRACE_STARTUP_STAT_COUNT, NULL, ZVAL_PTR_DTOR, 0);
+    bool to_stderr = get_DD_TRACE_STARTUP_LOGS();
+    bool to_log = ddog_shall_log(DDOG_LOG_STARTUP);
+    if (!to_stderr && !to_log) {
+        return;
+    }
 
-        ddtrace_startup_diagnostics(ht, true);
+    HashTable *ht;
+    ALLOC_HASHTABLE(ht);
+    zend_hash_init(ht, DDTRACE_STARTUP_STAT_COUNT, NULL, ZVAL_PTR_DTOR, 0);
+
+    ddtrace_startup_diagnostics(ht, true);
+    LOGEV(STARTUP, {
         _dd_print_values_to_log(ht, log);
-        _dd_get_startup_config(ht);
+    })
+
+    _dd_get_startup_config(ht);
+
+    smart_str buf = {0};
+    _dd_serialize_json(ht, &buf, 0);
 
-        smart_str buf = {0};
-        _dd_serialize_json(ht, &buf, 0);
+    if (to_stderr) {
+        _dd_log_to_stderr("DATADOG TRACER CONFIGURATION - %s", ZSTR_VAL(buf.s));
+        _dd_log_to_stderr("For additional diagnostic checks such as Agent connectivity, see the 'ddtrace' section of a phpinfo() "
+            "page. Alternatively set DD_TRACE_DEBUG=Error,Startup to add diagnostic checks to the error logs on the first request "
+            "of a new PHP process. Set DD_TRACE_STARTUP_LOGS=0 to disable this tracer configuration message.");
+        if (get_DD_OPENAI_LOGS_ENABLED()) {
+            _dd_log_to_stderr("Note that DD_OPENAI_LOGS_ENABLED=1 may be changed or removed in any release.");
+        }
+    }
+
+    LOGEV(STARTUP, {
         log("DATADOG TRACER CONFIGURATION - %s", ZSTR_VAL(buf.s));
         log("For additional diagnostic checks such as Agent connectivity, see the 'ddtrace' section of a phpinfo() "
             "page. Alternatively set DD_TRACE_DEBUG=Error,Startup to add diagnostic checks to the error logs on the first request "
             "of a new PHP process. Set DD_TRACE_STARTUP_LOGS=0 to disable this tracer configuration message.");
-
         if (get_DD_OPENAI_LOGS_ENABLED()) {
             log("Note that DD_OPENAI_LOGS_ENABLED=1 may be changed or removed in any release.");
         }
+    })
 
-        smart_str_free(&buf);
+    smart_str_free(&buf);
 
-        zend_hash_destroy(ht);
-        FREE_HASHTABLE(ht);
-    })
+    zend_hash_destroy(ht);
+    FREE_HASHTABLE(ht);
 }

metadata/supported-configurations.json

@@ -2288,7 +2288,7 @@
       {
         "implementation": "C",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_STRIPE_ANALYTICS_ENABLED": [

tests/ext/startup_logging_without_debug.phpt

@@ -0,0 +1,58 @@
+--TEST--
+Startup logging is enabled without DD_TRACE_DEBUG
+--SKIPIF--
+<?php include 'startup_logging_skipif.inc'; ?>
+--FILE--
+<?php
+include_once 'startup_logging.inc';
+$logs = dd_get_startup_logs(['-ddatadog.trace.sources_path='], [
+    'DD_TRACE_STARTUP_LOGS' => 1,
+]);
+
+// Ignore any Agent connection errors for now
+unset($logs['agent_error']);
+// Ignore sidecar config as it depends on specific versions of PHP for now
+unset($logs['sidecar_trace_sender']);
+
+dd_dump_startup_logs($logs);
+?>
+--EXPECTF--
+datadog.trace.sources_path_reachable: false
+date: "%s"
+os_name: "%s"
+os_version: "%s"
+version: "%s"
+lang: "php"
+lang_version: "%s"
+env: null
+enabled: true
+service: null
+enabled_cli: %s
+agent_url: "%s"
+debug: false
+analytics_enabled: false
+sample_rate: -1
+sampling_rules: []
+tags: []
+service_mapping: []
+distributed_tracing_enabled: true
+dd_version: null
+architecture: "%s"
+instrumentation_telemetry_enabled: true
+sapi: "cgi-fcgi"
+datadog.trace.sources_path: null
+open_basedir_configured: false
+uri_fragment_regex: null
+uri_mapping_incoming: null
+uri_mapping_outgoing: null
+auto_flush_enabled: false
+generate_root_span: true
+http_client_split_by_domain: false
+measure_compile_time: true
+report_hostname_on_root_span: false
+traced_internal_functions: null
+enabled_from_env: true
+opcache.file_cache: null
+dynamic_instrumentation_enabled: false
+exception_replay_enabled: false
+loaded_by_ssi: false