Skip to content

Use canonical FFE fixtures#11355

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 14 commits into
masterfrom
leo.romanovsky/ffe-canonical-fixtures-20260512
Jul 6, 2026
Merged

Use canonical FFE fixtures#11355
gh-worker-dd-mergequeue-cf854d[bot] merged 14 commits into
masterfrom
leo.romanovsky/ffe-canonical-fixtures-20260512

Conversation

@leoromanovsky

@leoromanovsky leoromanovsky commented May 12, 2026

Copy link
Copy Markdown
Contributor

Motivation

Make DataDog/ffe-system-test-data the canonical source for FFE/OpenFeature JSON fixtures in dd-trace-java. This removes copied smoke-test fixtures and moves evaluator behavior coverage to the shared corpus. Depends on DataDog/ffe-system-test-data#9.

Changes

  • Add dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data as a git submodule pinned to the canonical fixture update.
  • Remove copied OpenFeature fixture JSON resources.
  • Update the smoke test to load canonical ufc-config.json and all sorted evaluation-cases/*.json files.
  • Assert canonical result values and reasons from the JSON corpus.
  • Remove the stale programmatic evaluator fixture set in favor of the canonical JSON-driven loop.
  • Fix the OpenFeature smoke CodeNarc violation by removing an unnecessary Groovy import.
  • Add weekly Dependabot gitsubmodule updates.

📖 https://datadoghq.atlassian.net/wiki/spaces/PANA/pages/6713639211/FFE+SDK+Fixture+Contribution+Guide

Decisions

  • Shared evaluator behavior must come from JSON fixtures in ffe-system-test-data, not programmatic or copied fixture sets.
  • dd-trace-java already supports submodules and recursive checkout in CI; this PR uses the same pattern for the OpenFeature fixture corpus.
  • PHP is intentionally excluded until its OpenFeature client lands.

Validation

  • JAVA_HOME=/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home PATH=/opt/homebrew/opt/openjdk@17/bin:$PATH ./gradlew :dd-smoke-tests:openfeature:codenarcTest
  • JAVA_HOME=/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home PATH=/opt/homebrew/opt/openjdk@17/bin:$PATH ./gradlew :products:feature-flagging:feature-flagging-api:test --tests datadog.trace.api.openfeature.DDEvaluatorTest

@leoromanovsky leoromanovsky marked this pull request as ready for review May 18, 2026 12:21
@leoromanovsky leoromanovsky requested review from a team as code owners May 18, 2026 12:21
@leoromanovsky leoromanovsky requested review from dougqh, sameerank and typotter and removed request for a team May 18, 2026 12:21
@dd-octo-sts

dd-octo-sts Bot commented May 18, 2026

Copy link
Copy Markdown
Contributor

Hi! 👋 Thanks for your pull request! 🎉

To help us review it, please make sure to:

  • Add at least one type, and one component or instrumentation label to the pull request

If you need help, please check our contributing guidelines.

@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: 057cdefcb8

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

@datadog-datadog-prod-us1

datadog-datadog-prod-us1 Bot commented May 20, 2026

Copy link
Copy Markdown
Contributor

🎯 Code Coverage (details)
Patch Coverage: 100.00%
Overall Coverage: 56.93% (-0.04%)

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

@dougqh dougqh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Two review comments authored by Claude (Opus 4.7), posted on @dougqh's behalf.

@dougqh dougqh left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Claude detected a couple behavioral changes that I'm uncertain are intentional.
I'll leave those to your discretion.
Otherwise, looks good to me.

@leoromanovsky leoromanovsky added the comp: openfeature OpenFeature label May 26, 2026
@leoromanovsky

Copy link
Copy Markdown
Contributor Author

Claude detected a couple behavioral changes that I'm uncertain are intentional. I'll leave those to your discretion. Otherwise, looks good to me.

@dougqh Thanks for the review; agreed with the assessment to take a closer look and remediate. I'll merge after someone on FFE reviews.

@sameerank sameerank left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Maybe one documentation thing, not strictly required

> This will keep the submodule in `dd-java-agent/agent-jmxfetch/integrations-core` up-to-date.

could mention both submodules: This will keep the submodules in `dd-java-agent/agent-jmxfetch/integrations-core` and `dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data` up-to-date.

@leoromanovsky

Copy link
Copy Markdown
Contributor Author

Maybe one documentation thing, not strictly required

> This will keep the submodule in `dd-java-agent/agent-jmxfetch/integrations-core` up-to-date.

could mention both submodules: This will keep the submodules in `dd-java-agent/agent-jmxfetch/integrations-core` and `dd-smoke-tests/openfeature/src/test/resources/ffe-system-test-data` up-to-date.

@sameerank Good idea!

@leoromanovsky leoromanovsky enabled auto-merge May 26, 2026 18:43
@leoromanovsky leoromanovsky added this pull request to the merge queue May 29, 2026
@dd-octo-sts

dd-octo-sts Bot commented May 29, 2026

Copy link
Copy Markdown
Contributor

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented May 29, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-05-29 01:28:45 UTC ℹ️ Start processing command /merge


2026-05-29 01:28:50 UTC ℹ️ MergeQueue: pull request added to the queue

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


2026-05-29 02:06:08 UTCMergeQueue: This merge request was updated

This PR is rejected because it was updated

@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 29, 2026
@leoromanovsky leoromanovsky added this pull request to the merge queue May 29, 2026
@dd-octo-sts

dd-octo-sts Bot commented May 29, 2026

Copy link
Copy Markdown
Contributor

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented May 29, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-05-29 01:41:02 UTC ℹ️ Start processing command /merge


2026-05-29 01:41:05 UTC ❌ MergeQueue

PR already in the queue with status in_progress

@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 29, 2026
@leoromanovsky

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented May 29, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-05-29 02:09:24 UTC ℹ️ Start processing command /merge


2026-05-29 02:09:29 UTC ℹ️ MergeQueue: waiting for PR to be ready

This pull request is not mergeable according to GitHub. Common reasons include pending required checks, missing approvals, or merge conflicts — but it could also be blocked by other repository rules or settings.
It will be added to the queue as soon as checks pass and/or get approvals. View in MergeQueue UI.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2026-05-29 06:55:14 UTC ⚠️ MergeQueue: This merge request was unqueued

devflow unqueued this merge request: It did not become mergeable within the expected time

@dd-octo-sts

dd-octo-sts Bot commented May 29, 2026

Copy link
Copy Markdown
Contributor

🟢 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 14.01 s 13.90 s [-0.0%; +1.6%] (no difference)
startup:insecure-bank:tracing:Agent 12.94 s 12.99 s [-1.2%; +0.4%] (no difference)
startup:petclinic:appsec:Agent 16.94 s 16.74 s [+0.3%; +2.1%] (maybe worse)
startup:petclinic:iast:Agent 16.95 s 16.89 s [-0.5%; +1.2%] (no difference)
startup:petclinic:profiling:Agent 16.88 s 16.98 s [-1.7%; +0.4%] (no difference)
startup:petclinic:sca:Agent 16.99 s 16.84 s [-0.2%; +2.0%] (no difference)
startup:petclinic:tracing:Agent 16.06 s 16.08 s [-1.2%; +1.0%] (no difference)

Commit: f27c2436 · 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.

…canonical-fixtures-20260512

# Conflicts:
#	products/feature-flagging/feature-flagging-api/src/test/java/datadog/trace/api/openfeature/DDEvaluatorTest.java
@leoromanovsky leoromanovsky enabled auto-merge July 6, 2026 04:15
@leoromanovsky leoromanovsky added this pull request to the merge queue Jul 6, 2026
@dd-octo-sts

dd-octo-sts Bot commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Jul 6, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-07-06 04:58:41 UTC ℹ️ Start processing command /merge


2026-07-06 04:58:46 UTC ℹ️ MergeQueue: pull request added to the queue

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


2026-07-06 06:02:47 UTC ℹ️ MergeQueue: This merge request was merged

@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jul 6, 2026
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot merged commit 936282c into master Jul 6, 2026
588 checks passed
@gh-worker-dd-mergequeue-cf854d gh-worker-dd-mergequeue-cf854d Bot deleted the leo.romanovsky/ffe-canonical-fixtures-20260512 branch July 6, 2026 06:02
@github-actions github-actions Bot added this to the 1.64.0 milestone Jul 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants