Skip to content

appsec: pass PCRE2 includes to xtest tracer build - #4088

Merged
cataphract merged 2 commits into
masterfrom
glopes/tracer-build-macos
Aug 7, 2026
Merged

appsec: pass PCRE2 includes to xtest tracer build#4088
cataphract merged 2 commits into
masterfrom
glopes/tracer-build-macos

Conversation

@cataphract

Copy link
Copy Markdown
Contributor

Forward the PCRE2 include directories discovered by CMake to the Makefile-based ddtrace dependency build used by xtest.

Description

Reviewer checklist

  • Test coverage seems ok.
  • Appropriate labels assigned.

Forward the PCRE2 include directories discovered by CMake to the
Makefile-based ddtrace dependency build used by xtest.
@cataphract
cataphract requested a review from a team as a code owner August 4, 2026 10:41

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0b551d7cf0

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread appsec/cmake/run_tests.cmake Outdated
Comment on lines +11 to +12
set(_DD_APPSEC_DDTRACE_MAKE_OPTIONS
"EXTRA_CFLAGS=${_DD_APPSEC_PCRE2_CPPFLAGS}")

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve configured flags when adding the PCRE include

When PCRE2 has an external include directory, passing EXTRA_CFLAGS=... as a make command-line variable propagates through the recursive $(MAKE) -C $(BUILD_DIR) invocation and overrides the generated build Makefile's EXTRA_CFLAGS rather than extending it. Consequently, flags selected by config.m4, including -fvisibility=hidden and sanitizer instrumentation such as -fsanitize=address, are dropped from the xtest tracer build; in an ASAN environment this can make the tests run against an uninstrumented tracer. Append the include path without overriding the configure-generated value.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to EXTRA_INCLUDES, which kind of has the same problem but is not being used at this point

@datadog-prod-us1-5

datadog-prod-us1-5 Bot commented Aug 4, 2026

Copy link
Copy Markdown

Pipelines  Tests

Unblock PR with BitsAI

⚠️ Warnings

🚦 12 Pipeline jobs failed

DataDog/apm-reliability/dd-trace-php | test_extension_ci: [8.0]   View in Datadog   GitLab

DataDog/apm-reliability/dd-trace-php | test_extension_ci: [8.1]   View in Datadog   GitLab

DataDog/apm-reliability/dd-trace-php | test_extension_ci: [8.2]   View in Datadog   GitLab

View all 12 failed jobs.

ℹ️ Info

No other issues found (see more)

🧪 All tests passed
❄️ No new flaky tests detected

🔄 Datadog auto-retried 26 jobs - 25 passed on retry View in Datadog

🎯 Code Coverage (details)
Patch Coverage: 100.00%
Overall Coverage: 60.63% (-0.03%)

Useful? React with 👍 / 👎

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: 4df284a | Docs | Datadog PR Page | Give us feedback!

@cataphract
cataphract merged commit 194efce into master Aug 7, 2026
2145 of 2158 checks passed
@cataphract
cataphract deleted the glopes/tracer-build-macos branch August 7, 2026 09:45
@github-actions github-actions Bot added this to the 1.24.0 milestone Aug 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants