From 7a15b03f97d5cdee58d8d74e40d85de0d7e52dc8 Mon Sep 17 00:00:00 2001
From: Marco Saia <marco.saia@datadoghq.com>
Date: Thu, 29 May 2025 16:24:30 +0200
Subject: [PATCH] Fixed 'site' and 'useAccessibilityLabel' not being picked up
 from FileBasedConfiguration

---
 .../FileBasedConfiguration/FileBasedConfiguration.ts   | 10 ++++++++--
 .../__tests__/FileBasedConfiguration.test.ts           |  9 ++++++---
 .../__fixtures__/configuration-all-fields.json         |  7 ++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/sdk/FileBasedConfiguration/FileBasedConfiguration.ts b/packages/core/src/sdk/FileBasedConfiguration/FileBasedConfiguration.ts
index a19d9b2d6..ddd1943aa 100644
--- a/packages/core/src/sdk/FileBasedConfiguration/FileBasedConfiguration.ts
+++ b/packages/core/src/sdk/FileBasedConfiguration/FileBasedConfiguration.ts
@@ -31,12 +31,14 @@ export class FileBasedConfiguration extends DatadogProviderConfiguration {
             configuration.trackInteractions,
             configuration.trackResources,
             configuration.trackErrors,
-            configuration.trackingConsent
+            configuration.trackingConsent,
+            configuration.useAccessibilityLabel
         );
         this.longTaskThresholdMs =
             configuration.longTaskThresholdMs || DEFAULTS.longTaskThresholdMs;
         this.verbosity = configuration.verbosity;
         this.actionNameAttribute = configuration.actionNameAttribute;
+        this.site = configuration.site || DEFAULTS.site;
         this.resourceTracingSamplingRate =
             configuration.resourceTracingSamplingRate ||
             DEFAULTS.resourceTracingSamplingRate;
@@ -123,6 +125,8 @@ export const getJSONConfiguration = (
     actionNameAttribute: string | undefined;
     resourceTracingSamplingRate: number | undefined;
     firstPartyHosts: FirstPartyHostsConfiguration | undefined;
+    site: string | undefined;
+    useAccessibilityLabel: boolean | undefined;
 } => {
     const configuration = resolveJSONConfiguration(userSpecifiedConfiguration);
 
@@ -138,7 +142,9 @@ export const getJSONConfiguration = (
         verbosity: buildSdkVerbosity(configuration.verbosity),
         actionNameAttribute: configuration.actionNameAttribute,
         resourceTracingSamplingRate: configuration.resourceTracingSamplingRate,
-        firstPartyHosts: buildFirstPartyHosts(configuration.firstPartyHosts)
+        firstPartyHosts: buildFirstPartyHosts(configuration.firstPartyHosts),
+        site: configuration.site,
+        useAccessibilityLabel: configuration.useAccessibilityLabel
     };
 };
 
diff --git a/packages/core/src/sdk/FileBasedConfiguration/__tests__/FileBasedConfiguration.test.ts b/packages/core/src/sdk/FileBasedConfiguration/__tests__/FileBasedConfiguration.test.ts
index 514a01cfb..523cf67cc 100644
--- a/packages/core/src/sdk/FileBasedConfiguration/__tests__/FileBasedConfiguration.test.ts
+++ b/packages/core/src/sdk/FileBasedConfiguration/__tests__/FileBasedConfiguration.test.ts
@@ -28,9 +28,10 @@ describe('FileBasedConfiguration', () => {
                         trackErrors: true,
                         trackingConsent: 'NOT_GRANTED',
                         longTaskThresholdMs: 44,
+                        site: 'US5',
                         verbosity: 'WARN',
                         actionNameAttribute: 'action-name-attr',
-                        useAccessibilityLabel: true,
+                        useAccessibilityLabel: false,
                         resourceTracingSamplingRate: 33,
                         firstPartyHosts: [
                             {
@@ -83,7 +84,7 @@ describe('FileBasedConfiguration', () => {
                   "resourceTracingSamplingRate": 33,
                   "serviceName": undefined,
                   "sessionSamplingRate": 100,
-                  "site": "US1",
+                  "site": "US5",
                   "telemetrySampleRate": 20,
                   "trackBackgroundEvents": false,
                   "trackErrors": true,
@@ -93,7 +94,7 @@ describe('FileBasedConfiguration', () => {
                   "trackWatchdogTerminations": false,
                   "trackingConsent": "not_granted",
                   "uploadFrequency": "AVERAGE",
-                  "useAccessibilityLabel": true,
+                  "useAccessibilityLabel": false,
                   "verbosity": "warn",
                   "vitalsUpdateFrequency": "AVERAGE",
                 }
@@ -224,10 +225,12 @@ describe('FileBasedConfiguration', () => {
                   ],
                   "longTaskThresholdMs": 44,
                   "resourceTracingSamplingRate": 33,
+                  "site": "US5",
                   "trackErrors": true,
                   "trackInteractions": true,
                   "trackResources": true,
                   "trackingConsent": "not_granted",
+                  "useAccessibilityLabel": false,
                   "verbosity": "warn",
                 }
             `);
diff --git a/packages/core/src/sdk/FileBasedConfiguration/__tests__/__fixtures__/configuration-all-fields.json b/packages/core/src/sdk/FileBasedConfiguration/__tests__/__fixtures__/configuration-all-fields.json
index e4f01e27e..2e6fe9183 100644
--- a/packages/core/src/sdk/FileBasedConfiguration/__tests__/__fixtures__/configuration-all-fields.json
+++ b/packages/core/src/sdk/FileBasedConfiguration/__tests__/__fixtures__/configuration-all-fields.json
@@ -11,11 +11,16 @@
         "longTaskThresholdMs": 44,
         "verbosity": "WARN",
         "actionNameAttribute": "action-name-attr",
+        "useAccessibilityLabel": false,
         "resourceTracingSamplingRate": 33,
+        "site": "US5",
         "firstPartyHosts": [
             {
                 "match": "example.com",
-                "propagatorTypes": ["B3MULTI", "TRACECONTEXT"]
+                "propagatorTypes": [
+                    "B3MULTI",
+                    "TRACECONTEXT"
+                ]
             }
         ]
     }