Add test for DD_TRACE_LOG_FILE

Signed-off-by: Bob Weinand <[email protected]>

Author: bwoebi

appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy

@@ -70,6 +70,7 @@ class AppSecContainer<SELF extends AppSecContainer<SELF>> extends GenericContain
         withEnv 'DD_TRACE_ENABLED', '1'
         withEnv 'DD_SERVICE', 'appsec_int_tests'
         withEnv 'DD_ENV', 'integration'
+        withEnv 'DD_TRACE_LOG_LEVEL', 'info,startup=off'
         withEnv 'DD_TRACE_AGENT_FLUSH_AFTER_N_REQUESTS', '0'
         withEnv 'DD_TRACE_AGENT_FLUSH_INTERVAL', '0'
         withEnv 'DD_TRACE_DEBUG', '1'

ext/logging.c

@@ -75,7 +75,11 @@ int ddtrace_get_fd_path(int fd, char *buf) {
 #else
     char pathbuf[PATH_MAX];
     snprintf(pathbuf, PATH_MAX, "/proc/self/fd/%d", fd);
-    return readlink(pathbuf, buf, PATH_MAX);
+    int len = readlink(pathbuf, buf, PATH_MAX);
+    if (len >= 0) {
+        buf[len] = 0;
+    }
+    return len;
 #endif
 }
 
@@ -109,7 +113,7 @@ int ddtrace_log_with_time(int fd, const char *msg, int msg_len) {
 
     uintmax_t last_check = atomic_exchange(&dd_error_log_fd_rotated, (uintmax_t) now);
     if (last_check < (uintmax_t)now - 60) { // 1x/min
-        char pathbuf[PATH_MAX];
+        char pathbuf[PATH_MAX + 1];
         if (ddtrace_get_fd_path(fd, pathbuf) >= 0) {
             int new_fd = VCWD_OPEN_MODE(pathbuf, O_CREAT | O_RDWR | O_APPEND, 0666);
             dup2(new_fd, fd); // atomic replace

ext/sidecar.c

@@ -20,7 +20,7 @@ static void ddtrace_set_sidecar_globals(void) {
 }
 
 static bool dd_sidecar_connection_init(void) {
-    char logpath[PATH_MAX];
+    char logpath[PATH_MAX + 1];
     int error_fd = atomic_load(&ddtrace_error_log_fd);
     if (error_fd == -1 || ddtrace_get_fd_path(error_fd, logpath) < 0) {
         *logpath = 0;

libdatadog

@@ -0,0 +1,20 @@
+--TEST--
+Using DD_TRACE_LOG_FILE
+--SKIPIF--
+<?php
+if (getenv('PHP_PEAR_RUNTESTS') === '1') die("skip: pecl run-tests does not support {PWD}");
+?>
+--INI--
+datadog.trace.log_file={PWD}/dd_trace_log_file.log
+datadog.trace.log_level="Off,span=Trace"
+datadog.trace.generate_root_span=0
+--FILE--
+<?php
+
+readfile(__DIR__ . "/dd_trace_log_file.log");
+
+?>
+--EXPECTF--
+[%s] [ddtrace] [span] Creating new root SpanStack: %d, parent_stack: 0
+--CLEAN--
+<?php @unlink(__DIR__ . "/dd_trace_log_file.log"); ?>