Make the test sets datadog.trace.agent_test_session_token

iamluc · iamluc · commit ccb107e91443 · 2024-09-04T09:52:36.000+02:00
diff --git a/ext/sidecar.c b/ext/sidecar.c
@@ -23,10 +23,6 @@ static uint8_t dd_sidecar_formatted_session_id[36];
 static void ddtrace_set_non_resettable_sidecar_globals(void) {
     ddtrace_format_runtime_id(&dd_sidecar_formatted_session_id);
     ddtrace_endpoint = ddtrace_sidecar_agent_endpoint();
-
-    if (ZSTR_LEN(get_global_DD_TRACE_AGENT_TEST_SESSION_TOKEN())) {
-        ddog_endpoint_set_test_token(ddtrace_endpoint, dd_zend_string_to_CharSlice(get_global_DD_TRACE_AGENT_TEST_SESSION_TOKEN()));
-    }
 }
 
 // Set the globals that must be updated in case of fork
@@ -180,6 +176,10 @@ ddog_Endpoint *ddtrace_sidecar_agent_endpoint(void) {
         free(agent_url);
     }
 
+    if (ZSTR_LEN(get_global_DD_TRACE_AGENT_TEST_SESSION_TOKEN())) {
+        ddog_endpoint_set_test_token(agent_endpoint, dd_zend_string_to_CharSlice(get_global_DD_TRACE_AGENT_TEST_SESSION_TOKEN()));
+    }
+
     return agent_endpoint;
 }
 
diff --git a/tests/ext/crashtracker_segfault.phpt b/tests/ext/crashtracker_segfault.phpt
@@ -13,12 +13,11 @@ include __DIR__ . '/includes/skipif_no_dev_env.inc';
 DD_TRACE_LOG_LEVEL=0
 DD_AGENT_HOST=request-replayer
 DD_TRACE_AGENT_PORT=80
+--INI--
+datadog.trace.agent_test_session_token=tests/ext/crashtracker_segfault.phpt
 --FILE--
 <?php
 
-// WARNING: This test does not set a value for "datadog.trace.agent_test_session_token"
-// because the crashtracker uploader does not pass the header.
-
 include __DIR__ . '/includes/request_replayer.inc';
 $rr = new RequestReplayer();
 $rr->replayRequest(); // cleanup possible leftover

Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,6 @@ static uint8_t dd_sidecar_formatted_session_id[36];`
`23`	`23`	`static void ddtrace_set_non_resettable_sidecar_globals(void) {`
`24`	`24`	`ddtrace_format_runtime_id(&dd_sidecar_formatted_session_id);`
`25`	`25`	`ddtrace_endpoint = ddtrace_sidecar_agent_endpoint();`
`26`		`-`
`27`		`- if (ZSTR_LEN(get_global_DD_TRACE_AGENT_TEST_SESSION_TOKEN())) {`
`28`		`- ddog_endpoint_set_test_token(ddtrace_endpoint, dd_zend_string_to_CharSlice(get_global_DD_TRACE_AGENT_TEST_SESSION_TOKEN()));`
`29`		`- }`
`30`	`26`	`}`
`31`	`27`
`32`	`28`	`// Set the globals that must be updated in case of fork`
`@@ -180,6 +176,10 @@ ddog_Endpoint *ddtrace_sidecar_agent_endpoint(void) {`
`180`	`176`	`free(agent_url);`
`181`	`177`	`}`
`182`	`178`
	`179`	`+ if (ZSTR_LEN(get_global_DD_TRACE_AGENT_TEST_SESSION_TOKEN())) {`
	`180`	`+ ddog_endpoint_set_test_token(agent_endpoint, dd_zend_string_to_CharSlice(get_global_DD_TRACE_AGENT_TEST_SESSION_TOKEN()));`
	`181`	`+ }`
	`182`	`+`
`183`	`183`	`return agent_endpoint;`
`184`	`184`	`}`
`185`	`185`