Skip to content

fix(aiguard): resolve endpoint host correctly for regional Datadog sites #9040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avara1986 merged 2 commits into from
Jun 24, 2026
Merged

fix(aiguard): resolve endpoint host correctly for regional Datadog sites #9040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18490ac
fix(aiguard): resolve endpoint host correctly for regional Datadog sites
avara1986 Jun 23, 2026
4db2ec1
Merge branch 'master' into avara/aiguard-endpoint-regional-sites
avara1986 Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion packages/dd-trace/src/aiguard/sdk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@ class AIGuardClientError extends Error {
}
}

/**
* Resolves the AI Guard host for a given Datadog site. Sites with a single subdomain level
* (e.g. `datadoghq.com`, `ddog-gov.com`) are served from the `app.` subdomain, while regional
* sites (e.g. `us3.datadoghq.com`, `ap1.datadoghq.com`) are used as-is.
*
* @param {string} site - Datadog site (e.g. `datadoghq.com`, `us3.datadoghq.com`)
* @returns {string} The host to use for the AI Guard endpoint
*/
function aiGuardHost (site) {
return site.split('.').length === 2 ? `app.${site}` : site
}

class AIGuard extends NoopAIGuard {
#initialized
#tracer
Expand Down Expand Up @@ -94,7 +106,7 @@ class AIGuard extends NoopAIGuard {
'DD-AI-GUARD-SOURCE': 'SDK',
'DD-AI-GUARD-LANGUAGE': 'nodejs',
}
const endpoint = config.experimental.aiguard.endpoint || `https://app.${config.site}/api/v2/ai-guard`
const endpoint = config.experimental.aiguard.endpoint || `https://${aiGuardHost(config.site)}/api/v2/ai-guard`
this.#evaluateUrl = `${endpoint}/evaluate`
this.#timeout = config.experimental.aiguard.timeout
this.#maxMessagesLength = config.experimental.aiguard.maxMessagesLength
Expand Down
7 changes: 5 additions & 2 deletions packages/dd-trace/test/aiguard/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,11 +523,14 @@ describe('AIGuard SDK', () => {
const sites = [
{ site: 'datad0g.com', endpoint: 'https://app.datad0g.com/api/v2/ai-guard' },
{ site: 'datadoghq.com', endpoint: 'https://app.datadoghq.com/api/v2/ai-guard' },
{ site: 'ddog-gov.com', endpoint: 'https://app.ddog-gov.com/api/v2/ai-guard' },
{ site: 'us3.datadoghq.com', endpoint: 'https://us3.datadoghq.com/api/v2/ai-guard' },
{ site: 'ap1.datadoghq.com', endpoint: 'https://ap1.datadoghq.com/api/v2/ai-guard' },
]
for (const { site, endpoint } of sites) {
it(`test endpoint discovery: ${site}`, async () => {
const newConfig = { site, ...config }
delete newConfig.experimental.aiguard.endpoint
const { endpoint: _discardedEndpoint, ...aiguard } = config.experimental.aiguard
const newConfig = { ...config, site, experimental: { ...config.experimental, aiguard } }
const client = new AIGuard(tracer, newConfig)
mockFetch({
body: { data: { attributes: { action: 'ALLOW', reason: 'OK', is_blocking_enabled: false } } },
Expand Down
Loading