Fix installer AppSec tests for duplicate INI entry registration #3604
+2
−2
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes installer test failures caused by duplicate INI entry registration in 1.16.0.
Problem
In 1.16.0, commit f1ee6fb added
DD_APPSEC_ENABLEDtoext/configuration.h. This created a duplicate registration since the same INI entry was already defined inappsec/src/extension/configuration.h.When both extensions register the same INI entry, only the first one (ddtrace) succeeds. The AppSec extension's
php --ri ddappsecoutput no longer displaysdatadog.appsec.enabledbecause it's now owned by the ddtrace extension.Solution
Updated
assert_appsec_enabled()andassert_appsec_disabled()to check for"Current state => Enabled"instead ofdatadog.appsec.enabled => On. This status line is always displayed by AppSec's phpinfo function regardless of INI ownership