Improve GitLab codeowners parsing by daniel-mohedano · Pull Request #11999 · DataDog/dd-trace-java

daniel-mohedano · 2026-07-20T10:06:23Z

What Does This Do

Extends CODEOWNERS parsing to support GitLab section syntax.
- Section default owners are inherited by entries that don't declare their own.
- Owners are combined across all matching sections, including the unnamed section before the first header.
- Duplicate section names are merged into one single section.
- Optional-section markers and required approval counts are accepted.
- Malformed lines are skipped with a warning instead of aborting the parse.
GitHub CODEOWNERS behavior is unchanged.

Motivation

CODEOWNERS files using GitLab section syntax did not produce proper ownership for Test Optimization.

Additional Notes

CodeownersTest has been migrated to JUnit5.

test-environment-trigger: skip

Contributor Checklist

Format the title according to the contribution guidelines
Assign the type: and (comp: or inst:) labels in addition to any other useful labels
Avoid using close, fix, or any linking keywords when referencing an issue
Use solves instead, and assign the PR milestone to the issue
Update the CODEOWNERS file on source file addition, migration, or deletion
Update public documentation with any new configuration flags or behaviors
Once approved, use merge queue to merge the PR

Jira ticket: SDCT-690

daniel-mohedano · 2026-07-20T10:17:54Z

@codex review

daniel-mohedano · 2026-07-20T10:18:00Z

@autotest review

datadog-official · 2026-07-20T10:22:07Z

🎯 Code Coverage (details)
• Patch Coverage: 89.04%
• Overall Coverage: 57.21% (-0.09%)

_{This comment will be updated automatically if new data arrives.

🔗 Commit SHA: 8bbf56a | Docs | Datadog PR Page | Give us feedback!}

datadog-official

More details

GitLab section support correctly combines owners across all matching sections while preserving GitHub CODEOWNERS "last-match-wins" behavior within sections. Section name merging (case-insensitive), owner inheritance from defaults, and malformed line handling all work as intended. GitHub-style CODEOWNERS files remain unaffected.

Was this helpful? React 👍 or 👎

_{📊 Validated against 9 scenarios · Open Bits AI session}

_{🤖 Datadog Autotest · Commit 8bbf56a · What is Autotest? · Any feedback? Reach out in #autotest}

chatgpt-codex-connector · 2026-07-20T10:26:00Z

Codex Review: Didn't find any major issues. Another round soon, please!

Reviewed commit: 8bbf56a5c2

ℹ️ 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".

dd-octo-sts · 2026-07-20T10:29:47Z

🟢 Java Benchmark SLOs — All performance SLOs passed

Suite	Status
Startup	🟢 pass

SLO thresholds are defined here based on automatically generated metrics. A warning is raised when results are within 5% of the threshold.

PR vs. master results

Scenario	Candidate	master	Δ (95% CI of mean)
startup:insecure-bank:iast:Agent	13.98 s	13.97 s	[-0.7%; +0.7%] (no difference)
startup:insecure-bank:tracing:Agent	12.95 s	12.95 s	[-0.8%; +0.9%] (no difference)
startup:petclinic:appsec:Agent	16.78 s	16.73 s	[-0.7%; +1.4%] (no difference)
startup:petclinic:iast:Agent	16.77 s	16.91 s	[-1.6%; +0.1%] (no difference)
startup:petclinic:profiling:Agent	16.62 s	16.64 s	[-1.2%; +1.0%] (no difference)
startup:petclinic:sca:Agent	16.89 s	16.85 s	[-0.9%; +1.3%] (no difference)
startup:petclinic:tracing:Agent	15.95 s	16.17 s	[-2.2%; -0.5%] (maybe better)

Commit: 8bbf56a5 · CI Pipeline · Benchmarking Platform UI

Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion.

datadog-official

More details

PR extends CODEOWNERS parsing to support GitLab section syntax with proper owner inheritance and combination. Comprehensive code analysis and adversarial validation of critical scenarios—section merging, default owner inheritance, character-class pattern detection, and empty ownership handling—confirms implementation is correct. GitHub baseline behavior unchanged. No production defects detected.

Was this helpful? React 👍 or 👎

_{📊 Validated against 10 scenarios · Open Bits AI session}

_{🤖 Datadog Autotest · Commit 8bbf56a · What is Autotest? · Any feedback? Reach out in #autotest}

daniel-mohedano · 2026-07-20T12:43:59Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-07-20T12:44:03Z

View all feedbacks in Devflow UI.

2026-07-20 12:44:03 UTC ℹ️ Start processing command /merge

2026-07-20 12:44:08 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 2h (p90).

2026-07-20 13:44:03 UTC ℹ️ MergeQueue: This merge request was merged

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 8bbf56a5c2

ℹ️ 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".

chatgpt-codex-connector · 2026-07-20T12:51:23Z

+      SectionHeader header = entryBuilder.parseSectionHeader();
+      if (header != null) {
+        sectionDefaultOwners = header.getDefaultOwners();
+        String key = header.getName().trim().toLowerCase(Locale.ROOT);
+        currentSection = namedSections.computeIfAbsent(key, k -> new ArrayDeque<>());


Preserve flat precedence for GitHub headings

When CodeownersProvider.build feeds a .github/CODEOWNERS or GitHub-style root file through this parser, bracketed headings that were previously ignored now switch currentSection. Because getOwners combines one winning match from every section, a file like * @all before [Docs] and docs/ @docs after it now returns both owners instead of the later docs/ rule winning, which breaks the stated unchanged GitHub behavior for files that use bracketed headings as ignored labels.

Useful? React with 👍 / 👎.

although technically possible, the edge case is based on an incorrectly built github codeowners file while we don't have a good way of determining whether a file is intended for github or gitlab

chatgpt-codex-connector · 2026-07-20T12:51:23Z

+      if (owners.isEmpty()) {
+        owners = sectionDefaultOwners;


Do not inherit defaults for exclusion entries

In a GitLab section with default owners and an exclusion line, this turns an ownerless exclusion such as !generated.rb into a default-owned entry. Since the existing ! matcher matches every path except the excluded one, that entry wins over earlier rules for normal files, while the excluded file falls through to earlier owners instead of being exempt, so sections using exclusions produce incorrect code-owner tags.

Useful? React with 👍 / 👎.

addressing in a follow-up pr

feat: gitlab codeowners section owner parsing

8bbf56a

daniel-mohedano added type: feature Enhancements and improvements comp: ci visibility Continuous Integration Visibility labels Jul 20, 2026

daniel-mohedano changed the title ~~Improve Gitlab codeowners parsing~~ Improve GitLab codeowners parsing Jul 20, 2026

datadog-official Bot reviewed Jul 20, 2026

View reviewed changes

daniel-mohedano marked this pull request as ready for review July 20, 2026 12:37

daniel-mohedano requested a review from a team as a code owner July 20, 2026 12:37

datadog-official Bot reviewed Jul 20, 2026

View reviewed changes

juan-fernandez approved these changes Jul 20, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed Jul 20, 2026

View reviewed changes

gh-worker-dd-mergequeue-cf854d Bot merged commit b85908e into master Jul 20, 2026
593 of 602 checks passed

gh-worker-dd-mergequeue-cf854d Bot deleted the daniel.mohedano/codeowners-improvements branch July 20, 2026 13:44

github-actions Bot added this to the 1.65.0 milestone Jul 20, 2026

Uh oh!

Conversation

daniel-mohedano commented Jul 20, 2026 • edited by atlassian Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Does This Do

Motivation

Additional Notes

Contributor Checklist

Uh oh!

daniel-mohedano commented Jul 20, 2026

Uh oh!

daniel-mohedano commented Jul 20, 2026

Uh oh!

datadog-official Bot commented Jul 20, 2026 • edited by datadog-datadog-prod-us1 Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

datadog-official Bot left a comment

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot commented Jul 20, 2026

Uh oh!

dd-octo-sts Bot commented Jul 20, 2026

🟢 Java Benchmark SLOs — All performance SLOs passed

Uh oh!

datadog-official Bot left a comment

Choose a reason for hiding this comment

Uh oh!

daniel-mohedano commented Jul 20, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Jul 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jul 20, 2026

Choose a reason for hiding this comment

Uh oh!

daniel-mohedano Jul 21, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Jul 20, 2026

Choose a reason for hiding this comment

Uh oh!

daniel-mohedano Jul 21, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

daniel-mohedano commented Jul 20, 2026 •

edited by atlassian Bot

Loading

datadog-official Bot commented Jul 20, 2026 •

edited by datadog-datadog-prod-us1 Bot

Loading

gh-worker-devflow-routing-ef8351 Bot commented Jul 20, 2026 •

edited

Loading