Skip to content

RUM-15877: Add fed2 endpoint to DatadogSite - #542

Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
developfrom
aleksandr-gringauz/RUM-15877/add-fed2
Apr 22, 2026
Merged

RUM-15877: Add fed2 endpoint to DatadogSite#542
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit into
developfrom
aleksandr-gringauz/RUM-15877/add-fed2

Conversation

@aleksandr-gringauz

@aleksandr-gringauz aleksandr-gringauz commented Apr 22, 2026

Copy link
Copy Markdown
Contributor

What does this PR do?

Similar PR in the SDK DataDog/dd-sdk-android#3383

Motivation

What inspired you to submit this pull request?

Additional Notes

Anything else we should know when reviewing?

Review checklist (to be filled by reviewers)

  • Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
  • Make sure you discussed the feature or bugfix with the maintaining team in an Issue
  • Make sure each commit and the PR mention the Issue number (cf the CONTRIBUTING doc)

@codecov-commenter

codecov-commenter commented Apr 22, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 74.42%. Comparing base (c9b40fb) to head (fa922a2).

Additional details and impacted files
@@              Coverage Diff              @@
##             develop     #542      +/-   ##
=============================================
- Coverage      74.49%   74.42%   -0.06%     
+ Complexity       291      289       -2     
=============================================
  Files             40       40              
  Lines           1172     1173       +1     
  Branches         139      139              
=============================================
  Hits             873      873              
  Misses           233      233              
- Partials          66       67       +1     
Files with missing lines Coverage Δ
...in/kotlin/com/datadog/gradle/plugin/DatadogSite.kt 88.24% <100.00%> (+0.74%) ⬆️
...kotlin/com/datadog/gradle/plugin/FileUploadTask.kt 81.61% <ø> (ø)

... and 1 file with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@aleksandr-gringauz

Copy link
Copy Markdown
Contributor Author

@codex review

@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: 80ce7f14c0

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

/**
* The US2_FED site (FedRAMP compatible): [fed2.ddog-gov.com](https://fed2.ddog-gov.com).
*/
US2_FED("us2.ddog-gov.com"),

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 Use the fed2 domain for US2_FED

When users configure the new site through DATADOG_SITE or datadog-ci.json, resolveSite/siteFromDatadogCiConfig call DatadogSite.fromDomain, which only compares against this domain string. The new site is documented here and in the linked SDK change as fed2.ddog-gov.com (https://github.com/DataDog/dd-sdk-android/pull/3383/files#diff-...), but this value is us2.ddog-gov.com, so a user following that domain gets null and silently falls back to US1 instead of uploading to US2_FED. Please either store the fed2 domain here or add it as an accepted alias for fromDomain.

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.

fixed

@aleksandr-gringauz
aleksandr-gringauz force-pushed the aleksandr-gringauz/RUM-15877/add-fed2 branch from 80ce7f1 to fa922a2 Compare April 22, 2026 15:43
@aleksandr-gringauz
aleksandr-gringauz marked this pull request as ready for review April 22, 2026 15:53
@aleksandr-gringauz
aleksandr-gringauz requested review from a team as code owners April 22, 2026 15:53
@aleksandr-gringauz

Copy link
Copy Markdown
Contributor Author

/merge

@gh-worker-devflow-routing-ef8351

gh-worker-devflow-routing-ef8351 Bot commented Apr 22, 2026

Copy link
Copy Markdown

View all feedbacks in Devflow UI.

2026-04-22 15:57:43 UTC ℹ️ Start processing command /merge


2026-04-22 15:57:49 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-04-22 16:44:08 UTC ℹ️ MergeQueue: merge request added to the queue

The expected merge time in develop is approximately 0s (p90).


2026-04-22 17:08:53 UTC ℹ️ MergeQueue: This merge request was merged

@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: fa922a2d03

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

/**
* The US2_FED site (FedRAMP compatible): [us2.ddog-gov.com](https://us2.ddog-gov.com).
*/
US2_FED("us2.ddog-gov.com"),

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 Use the fed2 domain for US2_FED

Fresh evidence: this revision still sets US2_FED to us2.ddog-gov.com, while the companion Android SDK change for RUM-15877 documents the US2_FED site as fed2.ddog-gov.com. resolveSite/siteFromDatadogCiConfig accept DATADOG_SITE and datadog-ci.json values only through DatadogSite.fromDomain, so customers using the documented fed2.ddog-gov.com value are treated as unknown and fall back to US1 instead of uploading to US2_FED; please accept fed2.ddog-gov.com as the config domain or add it as an alias.

Useful? React with 👍 / 👎.

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