Skip to content

Commit becd68a

Browse files
committed
RUM-10392: Add AP2 datacenter support
1 parent db25ca2 commit becd68a

File tree

8 files changed

+20
-3
lines changed

8 files changed

+20
-3
lines changed

dd-sdk-android-core/api/apiSurface

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ enum com.datadog.android.DatadogSite
2121
- US5
2222
- EU1
2323
- AP1
24+
- AP2
2425
- US1_FED
2526
- STAGING
2627
val intakeEndpoint: String

dd-sdk-android-core/api/dd-sdk-android-core.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public final class com/datadog/android/Datadog {
6363

6464
public final class com/datadog/android/DatadogSite : java/lang/Enum {
6565
public static final field AP1 Lcom/datadog/android/DatadogSite;
66+
public static final field AP2 Lcom/datadog/android/DatadogSite;
6667
public static final field EU1 Lcom/datadog/android/DatadogSite;
6768
public static final field STAGING Lcom/datadog/android/DatadogSite;
6869
public static final field US1 Lcom/datadog/android/DatadogSite;

dd-sdk-android-core/src/main/kotlin/com/datadog/android/DatadogSite.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ enum class DatadogSite private constructor(internal val siteName: String, privat
4040
*/
4141
AP1("ap1"),
4242

43+
/**
44+
* The AP2 site: [ap2.datadoghq.com](https://ap2.datadoghq.com).
45+
*/
46+
AP2("ap2"),
47+
4348
/**
4449
* The US1_FED site (FedRAMP compatible): [app.ddog-gov.com](https://app.ddog-gov.com).
4550
*/

dd-sdk-android-core/src/test/kotlin/com/datadog/android/DatadogSiteTest.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ internal class DatadogSiteTest {
5555
assertThat(DatadogSite.AP1.intakeEndpoint).isEqualTo("https://browser-intake-ap1-datadoghq.com")
5656
}
5757

58+
@Test
59+
fun `M return intake endpoint W intakeEndpoint {AP2}`() {
60+
assertThat(DatadogSite.AP2.intakeEndpoint).isEqualTo("https://browser-intake-ap2-datadoghq.com")
61+
}
62+
5863
@Test
5964
fun `M return intake endpoint W intakeEndpoint {STAGING}`() {
6065
assertThat(DatadogSite.STAGING.intakeEndpoint).isEqualTo("https://browser-intake-datad0g.com")

sample/kotlin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ android {
7979

8080
flavorDimensions += listOf("site")
8181
productFlavors {
82-
val regions = arrayOf("us1", "us3", "us5", "us1_fed", "eu1", "ap1", "staging")
82+
val regions = arrayOf("us1", "us3", "us5", "us1_fed", "eu1", "ap1", "ap2", "staging")
8383

8484
regions.forEachIndexed { index, region ->
8585
register(region) {

sample/kotlin/src/main/kotlin/com/datadog/android/sample/webview/DatadogSiteExt.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ private fun DatadogSite?.browserSite(): String {
3030
DatadogSite.US5 -> "us5.datadoghq.com"
3131
DatadogSite.EU1 -> "datadoghq.eu"
3232
DatadogSite.AP1 -> "ap1.datadoghq.com"
33+
DatadogSite.AP2 -> "ap2.datadoghq.com"
3334
DatadogSite.US1_FED -> "ddog-gov.com"
3435
}
3536
}

sample/wear/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838

3939
flavorDimensions += listOf("site")
4040
productFlavors {
41-
val regions = arrayOf("us1", "us3", "us5", "us1_fed", "eu1", "ap1", "staging")
41+
val regions = arrayOf("us1", "us3", "us5", "us1_fed", "eu1", "ap1", "ap2", "staging")
4242

4343
regions.forEachIndexed { index, region ->
4444
register(region) {

tools/benchmark/src/main/java/com/datadog/benchmark/EndPoint.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,12 @@ enum class EndPoint(
3131
traces = "https://public-trace-http-intake.logs.datadoghq.eu/"
3232
),
3333
AP1(
34-
metrics = "https://ap1.datadoghq.com/",
34+
metrics = "https://api.ap1.datadoghq.com/",
3535
traces = "https://browser-intake-ap1-datadoghq.com/"
36+
),
37+
AP2(
38+
metrics = "https://api.ap2.datadoghq.com/",
39+
traces = "https://browser-intake-ap2-datadoghq.com/"
3640
);
3741

3842
/**

0 commit comments

Comments
 (0)