Skip to content

Commit b5f0b92

Browse files
committed
Add dyanmic log file capabilities
Signed-off-by: Bob Weinand <[email protected]>
1 parent ca93c16 commit b5f0b92

File tree

5 files changed

+32
-3
lines changed

5 files changed

+32
-3
lines changed

components-rs/sidecar.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ ddog_MaybeError ddog_sidecar_session_set_config(ddog_SidecarTransport **transpor
120120
uint64_t flush_interval_milliseconds,
121121
uintptr_t force_flush_size,
122122
uintptr_t force_drop_size,
123-
ddog_CharSlice log_level);
123+
ddog_CharSlice log_level,
124+
ddog_CharSlice log_path);
124125

125126
ddog_MaybeError ddog_sidecar_send_trace_v04_shm(ddog_SidecarTransport **transport,
126127
const struct ddog_InstanceId *instance_id,

ext/sidecar.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ static bool dd_sidecar_connection_init(void) {
5858
get_global_DD_TRACE_AGENT_FLUSH_INTERVAL(),
5959
get_global_DD_TRACE_AGENT_STACK_INITIAL_SIZE(),
6060
get_global_DD_TRACE_AGENT_STACK_BACKLOG() * get_global_DD_TRACE_AGENT_MAX_PAYLOAD_SIZE(),
61-
get_global_DD_TRACE_DEBUG() ? DDOG_CHARSLICE_C("debug") : dd_zend_string_to_CharSlice(get_global_DD_TRACE_LOG_LEVEL()));
61+
get_global_DD_TRACE_DEBUG() ? DDOG_CHARSLICE_C("debug") : dd_zend_string_to_CharSlice(get_global_DD_TRACE_LOG_LEVEL()),
62+
(ddog_CharSlice){ .ptr = logpath, .len = strlen(logpath) });
6263

6364
return true;
6465
}

tests/ext/close_spans_until.phpt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,34 @@ var_dump(DDTrace\close_spans_until(null));
2525

2626
?>
2727
--EXPECTF--
28+
[ddtrace] [span] Creating new root SpanStack: 1, parent_stack: 0
29+
[ddtrace] [span] Creating new root SpanStack: 3, parent_stack: 1
30+
[ddtrace] [span] Switching to different SpanStack: 3
31+
[ddtrace] [span] Starting new root span: trace_id=%s, span_id=%d, parent_id=0, SpanStack=3, parent_SpanStack=1
32+
[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=3
33+
[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=3
34+
[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=3
2835
bool(false)
36+
[ddtrace] [span] Closing span: trace_id=%s, span_id=%d
37+
[ddtrace] [span] Closing span: trace_id=%s, span_id=%d
2938
int(2)
39+
[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=3
40+
[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=3
41+
[ddtrace] [span] Starting new span: trace_id=%s, span_id=%d, parent_id=%d, SpanStack=3
42+
[ddtrace] [span] Closing span: trace_id=%s, span_id=%d
43+
[ddtrace] [span] Closing span: trace_id=%s, span_id=%d
3044
int(2)
45+
[ddtrace] [span] Closing span: trace_id=%s, span_id=%d
46+
[ddtrace] [span] Closing span: trace_id=%s, span_id=%d
47+
[ddtrace] [span] Closing root span: trace_id=%s, span_id=%d
48+
[ddtrace] [span] Switching to different SpanStack: 1
3149
int(1)
3250
int(0)
51+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='close_spans_until.php', service='close_spans_until.php', resource: 'close_spans_until.php', type 'cli' with tags: runtime-id='%s', _dd.p.dm='-0', _dd.p.tid='%s'; and metrics: process_id='%d', _dd.agent_psr='1', _sampling_priority_v1='1', php.compilation.total_time_ms='%f'
52+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='traced', service='close_spans_until.php', resource: 'traced', type 'cli' with tags: -; and metrics: -
53+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: -
54+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: -
55+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: -
56+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: -
57+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='', service='close_spans_until.php', resource: '', type 'cli' with tags: -; and metrics: -
3358
[ddtrace] [info] Flushing trace of size 7 to send-queue for %s

tests/ext/sandbox/die_in_sandbox.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ x();
1616
?>
1717
--EXPECTF--
1818
[ddtrace] [warning] UnwindExit thrown in ddtrace's closure defined at %s:%d for x(): <exit>
19+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='die_in_sandbox.php', service='die_in_sandbox.php', resource: 'die_in_sandbox.php', type 'cli' with tags: runtime-id='%s', _dd.p.dm='-0', _dd.p.tid='%s'; and metrics: process_id='%d', _dd.agent_psr='1', _sampling_priority_v1='1', php.compilation.total_time_ms='%f'
20+
[ddtrace] [span] Encoding span %d: trace_id=%s, name='x', service='die_in_sandbox.php', resource: 'x', type 'cli' with tags: -; and metrics: -
1921
[ddtrace] [info] Flushing trace of size 2 to send-queue for %s

0 commit comments

Comments
 (0)