Enable the sidecar sender by default on AWS lambda (#3147)

bwoebi · web-flow · commit ca48d25f2eee · 2025-03-28T15:15:30.000+01:00
Signed-off-by: Bob Weinand &lt;bob.weinand@datadoghq.com&gt;
diff --git a/appsec/src/extension/configuration.c b/appsec/src/extension/configuration.c
@@ -216,13 +216,6 @@ static void _register_testing_objects(void);
 
 bool dd_config_minit(int module_number)
 {
-    // We have to disable remote config by default on lambda due to issues with
-    // the sidecar there. We'll eventually fix it though.
-    if (getenv("AWS_LAMBDA_FUNCTION_NAME")) { // NOLINT
-        config_entries[DDAPPSEC_CONFIG_DD_REMOTE_CONFIG_ENABLED]
-            .default_encoded_value = (zai_str)ZAI_STR_FROM_CSTR("false");
-    }
-
     if (!zai_config_minit(config_entries,
             (sizeof config_entries / sizeof *config_entries),
             dd_ini_env_to_ini_name, module_number)) {
diff --git a/ext/configuration.c b/ext/configuration.c
@@ -181,11 +181,9 @@ bool ddtrace_config_minit(int module_number) {
     }
 
 #ifndef _WIN32
-    // Sidecar is currently broken - no traces sent. Investigation pending, background sender just works though.
+    // Background sender does not send a Content-Length header, but sidecar does. Force-enable it thus, as the background sender does not work at all.
     if (getenv("AWS_LAMBDA_FUNCTION_NAME")) {
-        config_entries[DDTRACE_CONFIG_DD_REMOTE_CONFIG_ENABLED].default_encoded_value = (zai_str) ZAI_STR_FROM_CSTR("false");
-        config_entries[DDTRACE_CONFIG_DD_TRACE_SIDECAR_TRACE_SENDER].default_encoded_value = (zai_str) ZAI_STR_FROM_CSTR("false");
-        config_entries[DDTRACE_CONFIG_DD_INSTRUMENTATION_TELEMETRY_ENABLED].default_encoded_value = (zai_str) ZAI_STR_FROM_CSTR("false");
+        config_entries[DDTRACE_CONFIG_DD_TRACE_SIDECAR_TRACE_SENDER].default_encoded_value = (zai_str) ZAI_STR_FROM_CSTR("true");
     }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -181,11 +181,9 @@ bool ddtrace_config_minit(int module_number) {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`#ifndef _WIN32`
`184`		`- // Sidecar is currently broken - no traces sent. Investigation pending, background sender just works though.`
	`184`	`+ // Background sender does not send a Content-Length header, but sidecar does. Force-enable it thus, as the background sender does not work at all.`
`185`	`185`	`if (getenv("AWS_LAMBDA_FUNCTION_NAME")) {`
`186`		`- config_entries[DDTRACE_CONFIG_DD_REMOTE_CONFIG_ENABLED].default_encoded_value = (zai_str) ZAI_STR_FROM_CSTR("false");`
`187`		`- config_entries[DDTRACE_CONFIG_DD_TRACE_SIDECAR_TRACE_SENDER].default_encoded_value = (zai_str) ZAI_STR_FROM_CSTR("false");`
`188`		`- config_entries[DDTRACE_CONFIG_DD_INSTRUMENTATION_TELEMETRY_ENABLED].default_encoded_value = (zai_str) ZAI_STR_FROM_CSTR("false");`
	`186`	`+ config_entries[DDTRACE_CONFIG_DD_TRACE_SIDECAR_TRACE_SENDER].default_encoded_value = (zai_str) ZAI_STR_FROM_CSTR("true");`
`189`	`187`	`}`
`190`	`188`	`#endif`
`191`	`189`