From 0dbeb6622c71a7fb6c6dcb78b09f6e1c44a7804e Mon Sep 17 00:00:00 2001
From: Bastien Caudan <bastien.caudan@gmail.com>
Date: Fri, 7 Aug 2020 10:55:07 +0200
Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=A8=20add=20gov=20DC=20configuration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/configuration.ts |  5 ++---
 packages/core/src/init.ts          | 10 ++++++++++
 packages/logs/README.md            |  2 +-
 packages/rum/README.md             |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/packages/core/src/configuration.ts b/packages/core/src/configuration.ts
index 2bcc5fa3d6..bcac54d37b 100644
--- a/packages/core/src/configuration.ts
+++ b/packages/core/src/configuration.ts
@@ -1,4 +1,4 @@
-import { BuildEnv, BuildMode, Datacenter, SdkEnv } from './init'
+import { BuildEnv, BuildMode, Datacenter, INTAKE_DOMAINS, SdkEnv } from './init'
 import { includes, ONE_KILO_BYTE, ONE_SECOND } from './utils'
 
 export const DEFAULT_CONFIGURATION = {
@@ -187,8 +187,7 @@ export function buildConfiguration(userConfiguration: UserConfiguration, buildEn
 }
 
 function getEndpoint(type: string, conf: TransportConfiguration, source?: string) {
-  const tld = conf.datacenter === Datacenter.US ? 'com' : 'eu'
-  const domain = conf.sdkEnv === SdkEnv.PRODUCTION ? `datadoghq.${tld}` : `datad0g.${tld}`
+  const domain = conf.sdkEnv === SdkEnv.STAGING ? INTAKE_DOMAINS[SdkEnv.STAGING] : INTAKE_DOMAINS[conf.datacenter]
   const tags =
     `sdk_version:${conf.sdkVersion}` +
     `${conf.env ? `,env:${conf.env}` : ''}` +
diff --git a/packages/core/src/init.ts b/packages/core/src/init.ts
index 0cd227aad3..caae0449ca 100644
--- a/packages/core/src/init.ts
+++ b/packages/core/src/init.ts
@@ -25,11 +25,21 @@ export function makeGlobal<T>(stub: T): T {
 export enum Datacenter {
   US = 'us',
   EU = 'eu',
+  GOV = 'gov',
 }
+
 export enum SdkEnv {
   PRODUCTION = 'production',
   STAGING = 'staging',
 }
+
+export const INTAKE_DOMAINS = {
+  [Datacenter.EU]: 'datadoghq.eu',
+  [Datacenter.US]: 'datadoghq.com',
+  [Datacenter.GOV]: 'ddog-gov.com',
+  [SdkEnv.STAGING]: 'datad0g.com',
+}
+
 export enum BuildMode {
   RELEASE = 'release',
   STAGING = 'staging',
diff --git a/packages/logs/README.md b/packages/logs/README.md
index 49f7096c91..6b70e130be 100644
--- a/packages/logs/README.md
+++ b/packages/logs/README.md
@@ -40,7 +40,7 @@ What we call `Context` is a map `{key: value}` that will be added to the message
 
   - `isCollectingError`: when truthy, we'll automatically forward `console.error` logs, uncaught exceptions and network errors.
   - `sampleRate`: percentage of sessions to track. Only tracked sessions send logs.
-  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu')
+  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu' | 'gov')
   - `silentMultipleInit`: prevent logging errors while having multiple Init
   - `service`: name of the corresponding service
   - `env`: environment of the service
diff --git a/packages/rum/README.md b/packages/rum/README.md
index e32f42a197..82d94c2f17 100644
--- a/packages/rum/README.md
+++ b/packages/rum/README.md
@@ -38,7 +38,7 @@ datadogRum.init({
 
   - `sampleRate`: percentage of sessions to track. Only tracked sessions send rum events.
   - `resourceSampleRate`: percentage of tracked sessions with resources collection.
-  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu')
+  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu' | 'gov')
   - `silentMultipleInit`: prevent logging errors while having multiple Init
   - `trackInteractions`: collect actions initiated by user interactions
   - `service`: name of the corresponding service

From c4c29032a52924a33dc3c13fa3f0f14d77acf265 Mon Sep 17 00:00:00 2001
From: Bastien Caudan <bastien.caudan@gmail.com>
Date: Fri, 7 Aug 2020 11:29:16 +0200
Subject: [PATCH 2/5] =?UTF-8?q?=E2=9C=A8=20build=20and=20deploy=20file=20w?=
 =?UTF-8?q?ithout=20DC=20suffix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml                   | 12 ++++++++----
 README.md                        | 16 +++++++---------
 packages/logs/README.md          |  4 ++--
 packages/logs/webpack.config.js  |  5 ++++-
 packages/rum/README.md           |  4 ++--
 packages/rum/webpack.config.js   |  5 ++++-
 scripts/deploy.sh                |  8 ++++++--
 test/static/async-e2e-page.html  |  4 ++--
 test/static/bundle-e2e-page.html |  4 ++--
 9 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdb0982487..d49c823f6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,10 +168,12 @@ deploy-staging:
   image: $CI_IMAGE
   script:
     - yarn
-    - TARGET_DATACENTER=eu TARGET_ENV=staging BUILD_MODE=staging yarn build:bundle
+    - WITH_SUFFIX=true TARGET_DATACENTER=eu TARGET_ENV=staging BUILD_MODE=staging yarn build:bundle
     - ./scripts/deploy.sh staging eu
-    - TARGET_DATACENTER=us TARGET_ENV=staging BUILD_MODE=staging yarn build:bundle
+    - WITH_SUFFIX=true TARGET_DATACENTER=us TARGET_ENV=staging BUILD_MODE=staging yarn build:bundle
     - ./scripts/deploy.sh staging us
+    - TARGET_DATACENTER=us TARGET_ENV=staging BUILD_MODE=staging yarn build:bundle
+    - ./scripts/deploy.sh staging
 
 deploy-release:
   only:
@@ -184,10 +186,12 @@ deploy-release:
   image: $CI_IMAGE
   script:
     - yarn
-    - TARGET_DATACENTER=us TARGET_ENV=production BUILD_MODE=release yarn build:bundle
+    - WITH_SUFFIX=true TARGET_DATACENTER=us TARGET_ENV=production BUILD_MODE=release yarn build:bundle
     - ./scripts/deploy.sh prod us
-    - TARGET_DATACENTER=eu TARGET_ENV=production BUILD_MODE=release yarn build:bundle
+    - WITH_SUFFIX=true TARGET_DATACENTER=eu TARGET_ENV=production BUILD_MODE=release yarn build:bundle
     - ./scripts/deploy.sh prod eu
+    - TARGET_DATACENTER=us TARGET_ENV=production BUILD_MODE=release yarn build:bundle
+    - ./scripts/deploy.sh prod
 
 ########################################################################################################################
 # Notify
diff --git a/README.md b/README.md
index 688103e99d..f2e2ee7fa7 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@ The browser SDK is used to collect logs and RUM data from the browser.
 
 This repository contains several packages:
 
-| Package      | npm                      | size                     | cdn               | doc                                 |
-| ------------ | ------------------------ | ------------------------ | ----------------- | ----------------------------------- |
-| browser-logs | [![npm version][01]][02] | [![bundle size][03]][04] | [us][05] [eu][06] | [![API][1]][07] [![product][2]][08] |
-| browser-rum  | [![npm version][11]][12] | [![bundle size][13]][14] | [us][15] [eu][16] | [![API][1]][17] [![product][2]][18] |
-| browser-core | [![npm version][21]][22] | [![bundle size][23]][24] |                   |
+| Package      | npm                      | size                     | cdn                | doc                                 |
+| ------------ | ------------------------ | ------------------------ | ------------------ | ----------------------------------- |
+| browser-logs | [![npm version][01]][02] | [![bundle size][03]][04] | [datadog-logs][05] | [![API][1]][07] [![product][2]][08] |
+| browser-rum  | [![npm version][11]][12] | [![bundle size][13]][14] | [datadog-rum][15]  | [![API][1]][17] [![product][2]][18] |
+| browser-core | [![npm version][21]][22] | [![bundle size][23]][24] |                    |
 
 [1]: https://github.githubassets.com/favicons/favicon.png
 [2]: https://imgix.datadoghq.com/img/favicons/favicon-32x32.png
@@ -18,16 +18,14 @@ This repository contains several packages:
 [02]: https://badge.fury.io/js/%40datadog%2Fbrowser-logs
 [03]: https://badgen.net/bundlephobia/minzip/@datadog/browser-logs
 [04]: https://bundlephobia.com/result?p=@datadog/browser-logs
-[05]: https://www.datadoghq-browser-agent.com/datadog-logs-us.js
-[06]: https://www.datadoghq-browser-agent.com/datadog-logs-eu.js
+[05]: https://www.datadoghq-browser-agent.com/datadog-logs.js
 [07]: ./packages/logs/README.md
 [08]: https://docs.datadoghq.com/logs/log_collection/javascript/?tab=npm
 [11]: https://badge.fury.io/js/%40datadog%2Fbrowser-rum.svg
 [12]: https://badge.fury.io/js/%40datadog%2Fbrowser-rum
 [13]: https://badgen.net/bundlephobia/minzip/@datadog/browser-rum
 [14]: https://bundlephobia.com/result?p=@datadog/browser-rum
-[15]: https://www.datadoghq-browser-agent.com/datadog-rum-us.js
-[16]: https://www.datadoghq-browser-agent.com/datadog-rum-eu.js
+[15]: https://www.datadoghq-browser-agent.com/datadog-rum.js
 [17]: ./packages/rum/README.md
 [18]: https://docs.datadoghq.com/real_user_monitoring/
 [21]: https://badge.fury.io/js/%40datadog%2Fbrowser-core.svg
diff --git a/packages/logs/README.md b/packages/logs/README.md
index 6b70e130be..526c9321ef 100644
--- a/packages/logs/README.md
+++ b/packages/logs/README.md
@@ -21,7 +21,7 @@ datadogLogs.init({
 ### Bundle
 
 ```
-<script src = 'https://www.datadoghq-browser-agent.com/datadog-logs-us.js'>
+<script src = 'https://www.datadoghq-browser-agent.com/datadog-logs.js'>
 <script>
   window.DD_LOGS.init({
     clientToken: 'XXX',
@@ -95,7 +95,7 @@ Types are compatible with TypeScript >= 3.0.
 For earlier version, you can import js sources and use global variable to avoid any compilation issue:
 
 ```
-import '@datadog/browser-logs/bundle/datadog-logs-us';
+import '@datadog/browser-logs/bundle/datadog-logs';
 
 window.DD_LOGS.init({
   clientToken: 'XXX',
diff --git a/packages/logs/webpack.config.js b/packages/logs/webpack.config.js
index 7b03179776..96d7f00f3d 100644
--- a/packages/logs/webpack.config.js
+++ b/packages/logs/webpack.config.js
@@ -3,6 +3,9 @@ const path = require('path')
 const webpackBase = require('../../webpack.base')
 
 const datacenter = process.env.TARGET_DATACENTER || 'us'
+const withSuffix = process.env.WITH_SUFFIX || false
+
+const suffix = withSuffix ? `-${datacenter}` : ''
 
 module.exports = (env, argv) => ({
   entry: {
@@ -10,7 +13,7 @@ module.exports = (env, argv) => ({
   },
   ...webpackBase(argv.mode),
   output: {
-    filename: `datadog-logs-${datacenter}.js`,
+    filename: `datadog-logs${suffix}.js`,
     path: path.resolve(__dirname, 'bundle'),
   },
 })
diff --git a/packages/rum/README.md b/packages/rum/README.md
index 82d94c2f17..ca8d60d1aa 100644
--- a/packages/rum/README.md
+++ b/packages/rum/README.md
@@ -20,7 +20,7 @@ datadogRum.init({
 ### Bundle
 
 ```
-<script src = 'https://www.datadoghq-browser-agent.com/datadog-rum-us.js'>
+<script src = 'https://www.datadoghq-browser-agent.com/datadog-rum.js'>
 <script>
   window.DD_RUM.init({
     applicationId: 'XXX',
@@ -99,7 +99,7 @@ Types are compatible with TypeScript >= 3.0.
 For earlier version, you can import js sources and use global variable to avoid any compilation issue:
 
 ```
-import '@datadog/browser-rum/bundle/datadog-rum-us';
+import '@datadog/browser-rum/bundle/datadog-rum';
 
 window.DD_RUM.init({
   applicationId: 'XXX',
diff --git a/packages/rum/webpack.config.js b/packages/rum/webpack.config.js
index 3767736ecc..651cdc9e55 100644
--- a/packages/rum/webpack.config.js
+++ b/packages/rum/webpack.config.js
@@ -3,6 +3,9 @@ const path = require('path')
 const webpackBase = require('../../webpack.base')
 
 const datacenter = process.env.TARGET_DATACENTER || 'us'
+const withSuffix = process.env.WITH_SUFFIX || false
+
+const suffix = withSuffix ? `-${datacenter}` : ''
 
 module.exports = (env, argv) => ({
   entry: {
@@ -10,7 +13,7 @@ module.exports = (env, argv) => ({
   },
   ...webpackBase(argv.mode),
   output: {
-    filename: `datadog-rum-${datacenter}.js`,
+    filename: `datadog-rum${suffix}.js`,
     path: path.resolve(__dirname, 'bundle'),
   },
 })
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 5ad6093fbf..fbf741ea6f 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -17,7 +17,7 @@ case "${env}" in
     DISTRIBUTION_ID="E2FP11ZSCFD3EU"
     ;;
 * )
-    echo "Usage: ./deploy.sh staging|prod eu|us"
+    echo "Usage: ./deploy.sh staging|prod [eu|us]"
     exit 1
     ;;
 esac
@@ -31,8 +31,12 @@ case "${datacenter}" in
     LOGS_FILE_NAME="datadog-logs-us.js"
     RUM_FILE_NAME="datadog-rum-us.js"
     ;;
+"")
+    LOGS_FILE_NAME="datadog-logs.js"
+    RUM_FILE_NAME="datadog-rum.js"
+    ;;
 * )
-    echo "Usage: ./deploy.sh staging|prod eu|us"
+    echo "Usage: ./deploy.sh staging|prod [eu|us]"
     exit 1
     ;;
 esac
diff --git a/test/static/async-e2e-page.html b/test/static/async-e2e-page.html
index 0fd6dec29a..2e7224b42d 100644
--- a/test/static/async-e2e-page.html
+++ b/test/static/async-e2e-page.html
@@ -17,7 +17,7 @@
         const intakeOrigin = `http://${window.location.hostname}:4000`
         const specIdParam = /spec-id=\d+/.exec(window.location.search) && /spec-id=\d+/.exec(window.location.search)[0]
         const logs = document.createElement('script')
-        logs.src = './datadog-logs-us.js'
+        logs.src = './datadog-logs.js'
         logs.onload = () => {
           window.DD_LOGS &&
             window.DD_LOGS.init({
@@ -31,7 +31,7 @@
         document.getElementsByTagName('head')[0].appendChild(logs)
 
         const rum = document.createElement('script')
-        rum.src = './datadog-rum-us.js'
+        rum.src = './datadog-rum.js'
         rum.onload = () => {
           window.DD_RUM &&
             window.DD_RUM.init({
diff --git a/test/static/bundle-e2e-page.html b/test/static/bundle-e2e-page.html
index d537a1ffc5..78ad35ee16 100644
--- a/test/static/bundle-e2e-page.html
+++ b/test/static/bundle-e2e-page.html
@@ -6,7 +6,7 @@
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />
     <link rel="stylesheet" href="/empty.css" />
     <title>bundle tests page</title>
-    <script type="text/javascript" src="./datadog-logs-us.js"></script>
+    <script type="text/javascript" src="./datadog-logs.js"></script>
     <script type="text/javascript">
       const intakeOrigin = `http://${window.location.hostname}:4000`
       const specIdParam = /spec-id=\d+/.exec(window.location.search) && /spec-id=\d+/.exec(window.location.search)[0]
@@ -20,7 +20,7 @@
           enableExperimentalFeatures: [],
         })
     </script>
-    <script type="text/javascript" src="./datadog-rum-us.js"></script>
+    <script type="text/javascript" src="./datadog-rum.js"></script>
     <script type="text/javascript">
       window.DD_RUM &&
         window.DD_RUM.init({

From e85b1f14c61506ba2e925304fe5d1078c38d5a37 Mon Sep 17 00:00:00 2001
From: Bastien Caudan <bastien.caudan@gmail.com>
Date: Fri, 7 Aug 2020 12:25:36 +0200
Subject: [PATCH 3/5] add deprecation comment on suffixed files

---
 scripts/build-env.js         |  1 +
 scripts/replace-build-env.js | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/scripts/build-env.js b/scripts/build-env.js
index 0ec4b35722..f92d7d38e9 100644
--- a/scripts/build-env.js
+++ b/scripts/build-env.js
@@ -22,4 +22,5 @@ module.exports = {
   TARGET_ENV: process.env.TARGET_ENV || 'staging',
   BUILD_MODE: process.env.BUILD_MODE,
   SDK_VERSION: sdkVersion,
+  WITH_SUFFIX: process.env.WITH_SUFFIX || false,
 }
diff --git a/scripts/replace-build-env.js b/scripts/replace-build-env.js
index 9899cd0423..910a871d13 100644
--- a/scripts/replace-build-env.js
+++ b/scripts/replace-build-env.js
@@ -18,9 +18,27 @@ try {
     from: Object.keys(buildEnv).map((entry) => `<<< ${entry} >>>`),
     to: Object.values(buildEnv),
   })
+  if (buildEnv.WITH_SUFFIX) {
+    replace.sync({
+      files: `${buildDirectory}/**/*.js`,
+      from: /.*/,
+      to: (...args) =>
+        `${makeDeprecatedSuffixComment(args[args.length - 1])}\n${args[0]}\n${makeDeprecatedSuffixComment(
+          args[args.length - 1]
+        )}`,
+    })
+  }
   console.log('Changed files:', results.filter((entry) => entry.hasChanged).map((entry) => entry.file))
   process.exit(0)
 } catch (error) {
   console.error('Error occurred:', error)
   process.exit(1)
 }
+
+function makeDeprecatedSuffixComment(filePath) {
+  const fileName = filePath.split('/').pop()
+  const suffixRegExp = /-(us|eu)/
+  const env = fileName.match(suffixRegExp)[1]
+  const newFileName = fileName.replace(suffixRegExp, '')
+  return `/**\n * ${fileName} IS DEPRECATED, USE ${newFileName} WITH { datacenter: '${env}' } INIT CONFIGURATION INSTEAD\n */`
+}

From e57791a872be2c73ca8e6b6655b0b40903e579a9 Mon Sep 17 00:00:00 2001
From: Bastien Caudan <bastien.caudan@gmail.com>
Date: Wed, 12 Aug 2020 10:34:47 +0200
Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=91=8C=20remove=20gov=20mention=20in?=
 =?UTF-8?q?=20doc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/logs/README.md | 2 +-
 packages/rum/README.md  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/logs/README.md b/packages/logs/README.md
index d09a4d1a5f..25be5eaf1b 100644
--- a/packages/logs/README.md
+++ b/packages/logs/README.md
@@ -40,7 +40,7 @@ What we call `Context` is a map `{key: value}` that will be added to the message
 
   - `isCollectingError`: when truthy, we'll automatically forward `console.error` logs, uncaught exceptions and network errors.
   - `sampleRate`: percentage of sessions to track. Only tracked sessions send logs.
-  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu' | 'gov')
+  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu')
   - `silentMultipleInit`: prevent logging errors while having multiple Init
   - `service`: name of the corresponding service
   - `env`: environment of the service
diff --git a/packages/rum/README.md b/packages/rum/README.md
index ca8d60d1aa..3949670df0 100644
--- a/packages/rum/README.md
+++ b/packages/rum/README.md
@@ -38,7 +38,7 @@ datadogRum.init({
 
   - `sampleRate`: percentage of sessions to track. Only tracked sessions send rum events.
   - `resourceSampleRate`: percentage of tracked sessions with resources collection.
-  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu' | 'gov')
+  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu')
   - `silentMultipleInit`: prevent logging errors while having multiple Init
   - `trackInteractions`: collect actions initiated by user interactions
   - `service`: name of the corresponding service

From 14365f9d9dd7670d9bb48e07d732d57df988ab1b Mon Sep 17 00:00:00 2001
From: Bastien Caudan <bastien.caudan@gmail.com>
Date: Wed, 12 Aug 2020 12:07:44 +0200
Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=91=8C=20use=20site=20config=20parame?=
 =?UTF-8?q?ter=20instead=20of=20datacenter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

consistent with other dd libraries
remove target env notion, staging file will point to prod by default, site configuration will be used to send data to the right intake
---
 .gitlab-ci.yml                           | 12 +++----
 package.json                             |  2 +-
 packages/core/src/configuration.ts       | 18 +++++------
 packages/core/src/index.ts               |  1 -
 packages/core/src/init.ts                | 11 +------
 packages/core/test/configuration.spec.ts | 41 +++++++++++++-----------
 packages/logs/README.md                  | 12 +++----
 packages/logs/src/buildEnv.ts            |  3 +-
 packages/rum/README.md                   | 12 +++----
 packages/rum/src/buildEnv.ts             |  7 ++--
 scripts/build-env.js                     |  1 -
 scripts/replace-build-env.js             |  6 ++--
 12 files changed, 58 insertions(+), 68 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d49c823f6e..7d430b52a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -168,11 +168,11 @@ deploy-staging:
   image: $CI_IMAGE
   script:
     - yarn
-    - WITH_SUFFIX=true TARGET_DATACENTER=eu TARGET_ENV=staging BUILD_MODE=staging yarn build:bundle
+    - WITH_SUFFIX=true TARGET_DATACENTER=eu BUILD_MODE=staging yarn build:bundle
     - ./scripts/deploy.sh staging eu
-    - WITH_SUFFIX=true TARGET_DATACENTER=us TARGET_ENV=staging BUILD_MODE=staging yarn build:bundle
+    - WITH_SUFFIX=true TARGET_DATACENTER=us BUILD_MODE=staging yarn build:bundle
     - ./scripts/deploy.sh staging us
-    - TARGET_DATACENTER=us TARGET_ENV=staging BUILD_MODE=staging yarn build:bundle
+    - TARGET_DATACENTER=us BUILD_MODE=staging yarn build:bundle
     - ./scripts/deploy.sh staging
 
 deploy-release:
@@ -186,11 +186,11 @@ deploy-release:
   image: $CI_IMAGE
   script:
     - yarn
-    - WITH_SUFFIX=true TARGET_DATACENTER=us TARGET_ENV=production BUILD_MODE=release yarn build:bundle
+    - WITH_SUFFIX=true TARGET_DATACENTER=us BUILD_MODE=release yarn build:bundle
     - ./scripts/deploy.sh prod us
-    - WITH_SUFFIX=true TARGET_DATACENTER=eu TARGET_ENV=production BUILD_MODE=release yarn build:bundle
+    - WITH_SUFFIX=true TARGET_DATACENTER=eu BUILD_MODE=release yarn build:bundle
     - ./scripts/deploy.sh prod eu
-    - TARGET_DATACENTER=us TARGET_ENV=production BUILD_MODE=release yarn build:bundle
+    - TARGET_DATACENTER=us BUILD_MODE=release yarn build:bundle
     - ./scripts/deploy.sh prod
 
 ########################################################################################################################
diff --git a/package.json b/package.json
index 1e9feff248..c890763140 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "dev": "ENV=development node test/server/server.js",
     "release": "lerna version --exact",
     "version": "node ./scripts/generate-changelog.js",
-    "publish:npm": "TARGET_DATACENTER=us TARGET_ENV=production BUILD_MODE=release yarn build && lerna publish from-package",
+    "publish:npm": "TARGET_DATACENTER=us BUILD_MODE=release yarn build && lerna publish from-package",
     "fail": "./scripts/fail.sh",
     "test": "yarn test:unit",
     "test:unit": "karma start ./test/unit/karma.local.conf.js",
diff --git a/packages/core/src/configuration.ts b/packages/core/src/configuration.ts
index bcac54d37b..f4267df579 100644
--- a/packages/core/src/configuration.ts
+++ b/packages/core/src/configuration.ts
@@ -1,4 +1,4 @@
-import { BuildEnv, BuildMode, Datacenter, INTAKE_DOMAINS, SdkEnv } from './init'
+import { BuildEnv, BuildMode, Datacenter, INTAKE_SITE } from './init'
 import { includes, ONE_KILO_BYTE, ONE_SECOND } from './utils'
 
 export const DEFAULT_CONFIGURATION = {
@@ -42,7 +42,8 @@ export interface UserConfiguration {
   isCollectingError?: boolean
   sampleRate?: number
   resourceSampleRate?: number
-  datacenter?: Datacenter
+  datacenter?: Datacenter // deprecated
+  site?: string
   enableExperimentalFeatures?: string[]
   silentMultipleInit?: boolean
   trackInteractions?: boolean
@@ -87,8 +88,7 @@ interface ReplicaConfiguration {
 
 interface TransportConfiguration {
   clientToken: string
-  datacenter: Datacenter
-  sdkEnv: SdkEnv
+  site: string
   buildMode: BuildMode
   sdkVersion: string
   applicationId?: string
@@ -104,12 +104,11 @@ export function buildConfiguration(userConfiguration: UserConfiguration, buildEn
     applicationId: userConfiguration.applicationId,
     buildMode: buildEnv.buildMode,
     clientToken: userConfiguration.clientToken,
-    datacenter: userConfiguration.datacenter || buildEnv.datacenter,
     env: userConfiguration.env,
     proxyHost: userConfiguration.proxyHost,
-    sdkEnv: buildEnv.sdkEnv,
     sdkVersion: buildEnv.sdkVersion,
     service: userConfiguration.service,
+    site: userConfiguration.site || INTAKE_SITE[userConfiguration.datacenter || buildEnv.datacenter],
     version: userConfiguration.version,
   }
 
@@ -164,11 +163,11 @@ export function buildConfiguration(userConfiguration: UserConfiguration, buildEn
 
   if (transportConfiguration.buildMode === BuildMode.STAGING) {
     if (userConfiguration.replica !== undefined) {
-      const replicaTransportConfiguration = {
+      const replicaTransportConfiguration: TransportConfiguration = {
         ...transportConfiguration,
         applicationId: userConfiguration.replica.applicationId,
         clientToken: userConfiguration.replica.clientToken,
-        sdkEnv: SdkEnv.PRODUCTION,
+        site: INTAKE_SITE[Datacenter.US],
       }
       configuration.replica = {
         applicationId: userConfiguration.replica.applicationId,
@@ -187,13 +186,12 @@ export function buildConfiguration(userConfiguration: UserConfiguration, buildEn
 }
 
 function getEndpoint(type: string, conf: TransportConfiguration, source?: string) {
-  const domain = conf.sdkEnv === SdkEnv.STAGING ? INTAKE_DOMAINS[SdkEnv.STAGING] : INTAKE_DOMAINS[conf.datacenter]
   const tags =
     `sdk_version:${conf.sdkVersion}` +
     `${conf.env ? `,env:${conf.env}` : ''}` +
     `${conf.service ? `,service:${conf.service}` : ''}` +
     `${conf.version ? `,version:${conf.version}` : ''}`
-  const datadogHost = `${type}-http-intake.logs.${domain}`
+  const datadogHost = `${type}-http-intake.logs.${conf.site}`
   const host = conf.proxyHost ? conf.proxyHost : datadogHost
   const proxyParameter = conf.proxyHost ? `ddhost=${datadogHost}&` : ''
   const applicationIdParameter = conf.applicationId ? `_dd.application_id=${conf.applicationId}&` : ''
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index edaf7fbdaa..6cb7e5661f 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -4,7 +4,6 @@ export {
   BuildEnv,
   BuildMode,
   Datacenter,
-  SdkEnv,
   makeStub,
   makeGlobal,
   commonInit,
diff --git a/packages/core/src/init.ts b/packages/core/src/init.ts
index caae0449ca..0d89009bc2 100644
--- a/packages/core/src/init.ts
+++ b/packages/core/src/init.ts
@@ -25,19 +25,11 @@ export function makeGlobal<T>(stub: T): T {
 export enum Datacenter {
   US = 'us',
   EU = 'eu',
-  GOV = 'gov',
 }
 
-export enum SdkEnv {
-  PRODUCTION = 'production',
-  STAGING = 'staging',
-}
-
-export const INTAKE_DOMAINS = {
+export const INTAKE_SITE = {
   [Datacenter.EU]: 'datadoghq.eu',
   [Datacenter.US]: 'datadoghq.com',
-  [Datacenter.GOV]: 'ddog-gov.com',
-  [SdkEnv.STAGING]: 'datad0g.com',
 }
 
 export enum BuildMode {
@@ -48,7 +40,6 @@ export enum BuildMode {
 
 export interface BuildEnv {
   datacenter: Datacenter
-  sdkEnv: SdkEnv
   buildMode: BuildMode
   sdkVersion: string
 }
diff --git a/packages/core/test/configuration.spec.ts b/packages/core/test/configuration.spec.ts
index 28a63c0ef2..f07574c61d 100644
--- a/packages/core/test/configuration.spec.ts
+++ b/packages/core/test/configuration.spec.ts
@@ -1,21 +1,20 @@
-import { BuildMode, Datacenter, SdkEnv } from '../src'
+import { BuildEnv, BuildMode, Datacenter } from '../src'
 import { buildConfiguration } from '../src/configuration'
 
 describe('configuration', () => {
   const clientToken = 'some_client_token'
-  const prodEnv = {
+  const usEnv: BuildEnv = {
     buildMode: BuildMode.RELEASE,
     datacenter: Datacenter.US,
-    sdkEnv: SdkEnv.PRODUCTION,
     sdkVersion: 'some_version',
   }
 
   describe('internal monitoring endpoint', () => {
     it('should only be defined when api key is provided', () => {
-      let configuration = buildConfiguration({ clientToken }, prodEnv)
+      let configuration = buildConfiguration({ clientToken }, usEnv)
       expect(configuration.internalMonitoringEndpoint).toBeUndefined()
 
-      configuration = buildConfiguration({ clientToken, internalMonitoringApiKey: clientToken }, prodEnv)
+      configuration = buildConfiguration({ clientToken, internalMonitoringApiKey: clientToken }, usEnv)
       expect(configuration.internalMonitoringEndpoint).toContain(clientToken)
     })
   })
@@ -25,7 +24,7 @@ describe('configuration', () => {
       const endpoint = 'bbbbbbbbbbbbbbb'
       const configuration = buildConfiguration(
         { clientToken, rumEndpoint: endpoint, logsEndpoint: endpoint, internalMonitoringEndpoint: endpoint },
-        prodEnv
+        usEnv
       )
       expect(configuration.rumEndpoint).not.toEqual(endpoint)
       expect(configuration.logsEndpoint).not.toEqual(endpoint)
@@ -37,7 +36,6 @@ describe('configuration', () => {
       const e2eEnv = {
         buildMode: BuildMode.E2E_TEST,
         datacenter: Datacenter.US,
-        sdkEnv: SdkEnv.STAGING,
         sdkVersion: 'some_version',
       }
       const configuration = buildConfiguration(
@@ -52,31 +50,36 @@ describe('configuration', () => {
 
   describe('isCollectingError', () => {
     it('should be enabled by default', () => {
-      const configuration = buildConfiguration({ clientToken }, prodEnv)
+      const configuration = buildConfiguration({ clientToken }, usEnv)
       expect(configuration.isCollectingError).toEqual(true)
     })
 
     it('should be disabled when defined to false', () => {
-      const configuration = buildConfiguration({ clientToken, isCollectingError: false }, prodEnv)
+      const configuration = buildConfiguration({ clientToken, isCollectingError: false }, usEnv)
       expect(configuration.isCollectingError).toEqual(false)
     })
   })
 
-  describe('datacenter', () => {
+  describe('site', () => {
     it('should use buildEnv value by default', () => {
-      const configuration = buildConfiguration({ clientToken }, prodEnv)
+      const configuration = buildConfiguration({ clientToken }, usEnv)
       expect(configuration.rumEndpoint).toContain('datadoghq.com')
     })
 
-    it('should use user value when set', () => {
-      const configuration = buildConfiguration({ clientToken, datacenter: Datacenter.EU }, prodEnv)
+    it('should use datacenter value when set', () => {
+      const configuration = buildConfiguration({ clientToken, datacenter: Datacenter.EU }, usEnv)
       expect(configuration.rumEndpoint).toContain('datadoghq.eu')
     })
+
+    it('should use site value when set', () => {
+      const configuration = buildConfiguration({ clientToken, datacenter: Datacenter.EU, site: 'foo.com' }, usEnv)
+      expect(configuration.rumEndpoint).toContain('foo.com')
+    })
   })
 
   describe('proxyHost', () => {
     it('should replace endpoint host add set it as a query parameter', () => {
-      const configuration = buildConfiguration({ clientToken, proxyHost: 'proxy.io' }, prodEnv)
+      const configuration = buildConfiguration({ clientToken, proxyHost: 'proxy.io' }, usEnv)
       expect(configuration.rumEndpoint).toMatch(/^https:\/\/proxy\.io\//)
       expect(configuration.rumEndpoint).toContain('?ddhost=rum-http-intake.logs.datadoghq.com&')
     })
@@ -84,8 +87,8 @@ describe('configuration', () => {
 
   describe('sdk_version, env, version and service', () => {
     it('should not modify the logs and rum endpoints tags when not defined', () => {
-      const configuration = buildConfiguration({ clientToken }, prodEnv)
-      expect(configuration.rumEndpoint).toContain(`&ddtags=sdk_version:${prodEnv.sdkVersion}`)
+      const configuration = buildConfiguration({ clientToken }, usEnv)
+      expect(configuration.rumEndpoint).toContain(`&ddtags=sdk_version:${usEnv.sdkVersion}`)
 
       expect(configuration.rumEndpoint).not.toContain(',env:')
       expect(configuration.rumEndpoint).not.toContain(',service:')
@@ -96,12 +99,12 @@ describe('configuration', () => {
     })
 
     it('should be set as tags in the logs and rum endpoints', () => {
-      const configuration = buildConfiguration({ clientToken, env: 'foo', service: 'bar', version: 'baz' }, prodEnv)
+      const configuration = buildConfiguration({ clientToken, env: 'foo', service: 'bar', version: 'baz' }, usEnv)
       expect(configuration.rumEndpoint).toContain(
-        `&ddtags=sdk_version:${prodEnv.sdkVersion},env:foo,service:bar,version:baz`
+        `&ddtags=sdk_version:${usEnv.sdkVersion},env:foo,service:bar,version:baz`
       )
       expect(configuration.logsEndpoint).toContain(
-        `&ddtags=sdk_version:${prodEnv.sdkVersion},env:foo,service:bar,version:baz`
+        `&ddtags=sdk_version:${usEnv.sdkVersion},env:foo,service:bar,version:baz`
       )
     })
   })
diff --git a/packages/logs/README.md b/packages/logs/README.md
index 25be5eaf1b..760ae431e3 100644
--- a/packages/logs/README.md
+++ b/packages/logs/README.md
@@ -9,10 +9,10 @@ Datadog browser logs library.
 ### NPM
 
 ```
-import { Datacenter, datadogLogs } from '@datadog/browser-logs'
+import { datadogLogs } from '@datadog/browser-logs'
 datadogLogs.init({
   clientToken: 'XXX',
-  datacenter: Datacenter.US,
+  site: 'datadoghq.com',
   forwardErrorsToLogs: true,
   sampleRate: 100
 })
@@ -25,7 +25,7 @@ datadogLogs.init({
 <script>
   window.DD_LOGS.init({
     clientToken: 'XXX',
-    datacenter: 'us',
+    site: 'datadoghq.com',
     forwardErrorsToLogs: true,
     sampleRate: 100
   });
@@ -40,7 +40,7 @@ What we call `Context` is a map `{key: value}` that will be added to the message
 
   - `isCollectingError`: when truthy, we'll automatically forward `console.error` logs, uncaught exceptions and network errors.
   - `sampleRate`: percentage of sessions to track. Only tracked sessions send logs.
-  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu')
+  - `site`: The site of the Datadog intake to send SDK data to (default: 'datadoghq.com', set to 'datadoghq.eu' to send data to the EU site)
   - `silentMultipleInit`: prevent logging errors while having multiple Init
   - `service`: name of the corresponding service
   - `env`: environment of the service
@@ -49,7 +49,7 @@ What we call `Context` is a map `{key: value}` that will be added to the message
   ```
   init(configuration: {
       clientToken: string,
-      datacenter?: string,
+      site?: string,
       isCollectingError?: boolean,
       sampleRate?: number,
       silentMultipleInit?: boolean,
@@ -100,7 +100,7 @@ import '@datadog/browser-logs/bundle/datadog-logs';
 
 window.DD_LOGS.init({
   clientToken: 'XXX',
-  datacenter: 'us',
+  site: 'datadoghq.com',
   forwardErrorsToLogs: true,
   sampleRate: 100
 });
diff --git a/packages/logs/src/buildEnv.ts b/packages/logs/src/buildEnv.ts
index 4e112e39b4..3bf8167ad6 100644
--- a/packages/logs/src/buildEnv.ts
+++ b/packages/logs/src/buildEnv.ts
@@ -1,8 +1,7 @@
-import { BuildEnv, BuildMode, Datacenter, SdkEnv } from '@datadog/browser-core'
+import { BuildEnv, BuildMode, Datacenter } from '@datadog/browser-core'
 
 export const buildEnv: BuildEnv = {
   buildMode: '<<< BUILD_MODE >>>' as BuildMode,
   datacenter: '<<< TARGET_DATACENTER >>>' as Datacenter,
-  sdkEnv: '<<< TARGET_ENV >>>' as SdkEnv,
   sdkVersion: '<<< SDK_VERSION >>>',
 }
diff --git a/packages/rum/README.md b/packages/rum/README.md
index 3949670df0..c4564ac5a4 100644
--- a/packages/rum/README.md
+++ b/packages/rum/README.md
@@ -7,11 +7,11 @@ Datadog browser rum library.
 ### NPM
 
 ```
-import { Datacenter, datadogRum } from '@datadog/browser-rum'
+import { datadogRum } from '@datadog/browser-rum'
 datadogRum.init({
   applicationId: 'XXX',
   clientToken: 'XXX',
-  datacenter: Datacenter.US,
+  site: 'datadoghq.com',
   resourceSampleRate: 100,
   sampleRate: 100
 })
@@ -25,7 +25,7 @@ datadogRum.init({
   window.DD_RUM.init({
     applicationId: 'XXX',
     clientToken: 'XXX',
-    datacenter: 'us',
+    site: 'datadoghq.com',
     resourceSampleRate: 100,
     sampleRate: 100
   });
@@ -38,7 +38,7 @@ datadogRum.init({
 
   - `sampleRate`: percentage of sessions to track. Only tracked sessions send rum events.
   - `resourceSampleRate`: percentage of tracked sessions with resources collection.
-  - `datacenter`: defined to which datacenter we'll send collected data ('us' | 'eu')
+  - `site`: The site of the Datadog intake to send SDK data to (default: 'datadoghq.com', set to 'datadoghq.eu' to send data to the EU site)
   - `silentMultipleInit`: prevent logging errors while having multiple Init
   - `trackInteractions`: collect actions initiated by user interactions
   - `service`: name of the corresponding service
@@ -49,7 +49,7 @@ datadogRum.init({
   init(configuration: {
       applicationId: string,
       clientToken: string,
-      datacenter?: string,
+      site?: string,
       resourceSampleRate?: number
       sampleRate?: number,
       silentMultipleInit?: boolean,
@@ -104,7 +104,7 @@ import '@datadog/browser-rum/bundle/datadog-rum';
 window.DD_RUM.init({
   applicationId: 'XXX',
   clientToken: 'XXX',
-  datacenter: 'us',
+  site: 'datadoghq.com',
   resourceSampleRate: 100,
   sampleRate: 100
 });
diff --git a/packages/rum/src/buildEnv.ts b/packages/rum/src/buildEnv.ts
index c1c5c002a8..3bf8167ad6 100644
--- a/packages/rum/src/buildEnv.ts
+++ b/packages/rum/src/buildEnv.ts
@@ -1,8 +1,7 @@
-import { BuildEnv } from '@datadog/browser-core'
+import { BuildEnv, BuildMode, Datacenter } from '@datadog/browser-core'
 
 export const buildEnv: BuildEnv = {
-  buildMode: '<<< BUILD_MODE >>>' as BuildEnv['buildMode'],
-  datacenter: '<<< TARGET_DATACENTER >>>' as BuildEnv['datacenter'],
-  sdkEnv: '<<< TARGET_ENV >>>' as BuildEnv['sdkEnv'],
+  buildMode: '<<< BUILD_MODE >>>' as BuildMode,
+  datacenter: '<<< TARGET_DATACENTER >>>' as Datacenter,
   sdkVersion: '<<< SDK_VERSION >>>',
 }
diff --git a/scripts/build-env.js b/scripts/build-env.js
index f92d7d38e9..46e99757ec 100644
--- a/scripts/build-env.js
+++ b/scripts/build-env.js
@@ -19,7 +19,6 @@ switch (process.env.BUILD_MODE) {
 
 module.exports = {
   TARGET_DATACENTER: process.env.TARGET_DATACENTER || 'us',
-  TARGET_ENV: process.env.TARGET_ENV || 'staging',
   BUILD_MODE: process.env.BUILD_MODE,
   SDK_VERSION: sdkVersion,
   WITH_SUFFIX: process.env.WITH_SUFFIX || false,
diff --git a/scripts/replace-build-env.js b/scripts/replace-build-env.js
index 910a871d13..57dd1a0f92 100644
--- a/scripts/replace-build-env.js
+++ b/scripts/replace-build-env.js
@@ -4,7 +4,7 @@ const buildEnv = require('./build-env')
 /**
  * Replace BuildEnv in build files
  * Usage:
- * TARGET_DATACENTER=xxx TARGET_ENV=yyy BUILD_MODE=zzz node replace-build-env.js /path/to/build/directory
+ * TARGET_DATACENTER=xxx BUILD_MODE=zzz node replace-build-env.js /path/to/build/directory
  */
 
 const buildDirectory = process.argv[2]
@@ -40,5 +40,7 @@ function makeDeprecatedSuffixComment(filePath) {
   const suffixRegExp = /-(us|eu)/
   const env = fileName.match(suffixRegExp)[1]
   const newFileName = fileName.replace(suffixRegExp, '')
-  return `/**\n * ${fileName} IS DEPRECATED, USE ${newFileName} WITH { datacenter: '${env}' } INIT CONFIGURATION INSTEAD\n */`
+  return `/**\n * ${fileName} IS DEPRECATED, USE ${newFileName} WITH { site: 'datadoghq.${
+    env === 'eu' ? 'eu' : 'com'
+  }' } INIT CONFIGURATION INSTEAD\n */`
 }