ci(appsec): fix ddwaf circular import #12013
Merged
+1
−1
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.
Fix the following CI failures: https://gitlab.ddbuild.io/DataDog/apm-reliability/dd-trace-py/-/jobs/774636553
Reproduction:
ddtrace/appsec/_metrics
defines _set_waf_init_metricddtrace/appsec/_metrics
imports ddtrace.appsec._proccessorsddtrace.appsec._proccessors
imports _set_waf_init_metricThe fix here is to avoid importing
ddwaf
fromddtrace.appsec._processor
inddtrace.appsec._metrics
. Instead we can import ddwaf directly fromddtrace.appsec._ddwaf
.This issue does not occur if the
ddtrace.appsec._processor
module is imported beforeddtrace.appsec._metrics
. This is why we do not see this error in most of our appsec tests. However the order of imports is not guaranteed by the slots check. This explains the flakiness in this job.Checklist
Reviewer Checklist