Fix Appsec integration tests

cataphract · cataphract · commit 1856dd0271a7 · 2024-10-07T18:38:46.000+01:00
diff --git a/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy b/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/docker/AppSecContainer.groovy
@@ -76,6 +76,7 @@ class AppSecContainer<SELF extends AppSecContainer<SELF>> extends GenericContain
         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_SIDECAR_TRACE_SENDER', '0'
         withEnv 'DD_TRACE_DEBUG', '1'
         withEnv 'DD_AUTOLOAD_NO_COMPILE', 'true' // must be exactly 'true'
         withEnv 'DD_TRACE_GIT_METADATA_ENABLED', '0'
diff --git a/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/mock_agent/TracesV04Handler.groovy b/appsec/tests/integration/src/main/groovy/com/datadog/appsec/php/mock_agent/TracesV04Handler.groovy
@@ -101,7 +101,9 @@ class TracesV04Handler implements Handler {
         List<Object> traces = []
         MessageUnpacker unpacker = MessagePack.newDefaultUnpacker(is)
         while (unpacker.hasNext()) {
-            traces << MsgpackHelper.unpackSingle(unpacker)
+            def trace = MsgpackHelper.unpackSingle(unpacker)
+            log.debug('Read submitted trace {}', trace)
+            traces << trace
         }
 
         traces.first() as List<Object> ?: []
diff --git a/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy b/appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/CommonTests.groovy
@@ -392,7 +392,7 @@ trait CommonTests {
     void 'module does not have STATIC_TLS flag'() {
         Container.ExecResult res = container.execInContainer(
                 'bash', '-c',
-                '''! { readelf -d "$(php -r 'echo ini_get("extension_dir");')"/ddappsec.so | grep STATIC_TLS; }''')
+                '''! { readelf -d "$(DD_TRACE_CLI_ENABLED=0 php -r 'echo ini_get("extension_dir");')"/ddappsec.so | grep STATIC_TLS; }''')
         if (res.exitCode != 0) {
             throw new AssertionError("Module has STATIC_TLS flag: $res.stdout")
         }
diff --git a/appsec/tests/integration/src/test/www/laravel8x/initialize.sh b/appsec/tests/integration/src/test/www/laravel8x/initialize.sh
@@ -2,6 +2,8 @@
 
 cd /var/www
 
+export DD_TRACE_CLI_ENABLED=false
+
 composer install --no-dev
 chown -R www-data.www-data vendor
 
diff --git a/appsec/tests/integration/src/test/www/symfony62/initialize.sh b/appsec/tests/integration/src/test/www/symfony62/initialize.sh
@@ -2,6 +2,8 @@
 
 cd /var/www
 
+export DD_TRACE_CLI_ENABLED=false
+
 composer install
 php bin/console doctrine:database:drop --force
 php bin/console doctrine:database:create

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ trait CommonTests {`
`392`	`392`	`void 'module does not have STATIC_TLS flag'() {`
`393`	`393`	`Container.ExecResult res = container.execInContainer(`
`394`	`394`	`'bash', '-c',`
`395`		`- '''! { readelf -d "$(php -r 'echo ini_get("extension_dir");')"/ddappsec.so \| grep STATIC_TLS; }''')`
	`395`	`+ '''! { readelf -d "$(DD_TRACE_CLI_ENABLED=0 php -r 'echo ini_get("extension_dir");')"/ddappsec.so \| grep STATIC_TLS; }''')`
`396`	`396`	`if (res.exitCode != 0) {`
`397`	`397`	`throw new AssertionError("Module has STATIC_TLS flag: $res.stdout")`
`398`	`398`	`}`