Skip to content

Fix memory leak on roadrunner/frankenphp/etc due to appsec telemetry #4061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cataphract wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −1
Open

Fix memory leak on roadrunner/frankenphp/etc due to appsec telemetry #4061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab8e68c
Fix memory leak on roadrunner/frankenphp/etc due to appsec telemetry
cataphract Jul 24, 2026
c18198c
Merge branch 'master' into glopes/fix-leak-user-req-tel
cataphract Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ext/telemetry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,25 @@ DATADOG_PUBLIC bool datadog_metric_add_point(zend_string *name, double value, ze
return true;
}

static void dd_commit_metrics() {
void datadog_telemetry_commit_user_request_metrics(void) {
if (!DATADOG_G(metrics_buffer)) {
return;
}

if (!DATADOG_G(sidecar) || !get_global_DD_INSTRUMENTATION_TELEMETRY_ENABLED()) {
ddog_sidecar_telemetry_buffer_drop(DATADOG_G(metrics_buffer));
DATADOG_G(metrics_buffer) = NULL;
return;
}

dd_commit_metrics();
}

static void dd_commit_metrics(void) {
if (!DATADOG_G(metrics_buffer)) {
return;
}

ddog_sidecar_telemetry_buffer_flush(
&DATADOG_G(sidecar), datadog_sidecar_instance_id, &DATADOG_G(sidecar_queue_id), DATADOG_G(metrics_buffer));
DATADOG_G(metrics_buffer) = NULL;
Expand Down
1 change: 1 addition & 0 deletions ext/telemetry.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const char *ddtrace_telemetry_redact_file(const char *file);
void datadog_telemetry_rinit(void);
void datadog_telemetry_rshutdown(void);
void datadog_telemetry_finalize(void);
void datadog_telemetry_commit_user_request_metrics(void);
void datadog_telemetry_lifecycle_end(void);
void datadog_telemetry_register_services(ddog_SidecarTransport **sidecar);

Expand Down
3 changes: 3 additions & 0 deletions tracer/user_request.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <main/SAPI.h>
#include "configuration.h"
#include "ddtrace.h"
#include <ext/telemetry.h>
#include "span.h"

#define NS "DDTrace\\UserRequest\\"
Expand Down Expand Up @@ -196,6 +197,8 @@ void ddtrace_user_req_notify_finish(ddtrace_span_data *span)
ddtrace_user_req_listeners *listener = reg_listeners.listeners[i];
listener->finish_user_req(listener, &span->std);
}

datadog_telemetry_commit_user_request_metrics();
}

PHP_FUNCTION(DDTrace_UserRequest_set_blocking_function);
Expand Down
Loading