Merge pull request #2685 from DataDog/xgouchet/RUM-9923/custom_endpoint

RUM-9923 Custom endpoint URL are taken as is

Author: xgouchet

features/dd-sdk-android-logs/src/main/kotlin/com/datadog/android/log/LogsConfiguration.kt

@@ -27,6 +27,7 @@ data class LogsConfiguration internal constructor(
 
         /**
          * Let the Logs feature target a custom server.
+         * The provided url should be the full endpoint url, e.g.: https://example.com/logs/upload
          */
         fun useCustomEndpoint(endpoint: String): Builder {
             customEndpointUrl = endpoint

features/dd-sdk-android-logs/src/main/kotlin/com/datadog/android/log/internal/net/LogsRequestFactory.kt

@@ -57,10 +57,11 @@ internal class LogsRequestFactory(
     }
 
     private fun buildUrl(source: String, context: DatadogContext): String {
-        return "%s/api/v2/logs?%s=%s"
+        val baseUrl = customEndpointUrl ?: (context.site.intakeEndpoint + "/api/v2/logs")
+        return "%s?%s=%s"
             .format(
                 Locale.US,
-                customEndpointUrl ?: context.site.intakeEndpoint,
+                baseUrl,
                 RequestFactory.QUERY_PARAM_SOURCE,
                 source
             )

features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/log/LogsConfigurationBuilderTest.kt

@@ -44,7 +44,7 @@ internal class LogsConfigurationBuilderTest {
 
     @Test
     fun `M build configuration with custom site W useCustomEndpoint() and build()`(
-        @StringForgery(regex = "https://[a-z]+\\.com") logsEndpointUrl: String
+        @StringForgery(regex = "https://[a-z]+\\.com(/[a-z]+)+") logsEndpointUrl: String
     ) {
         // When
         val logsConfiguration = testedBuilder.useCustomEndpoint(logsEndpointUrl).build()

features/dd-sdk-android-logs/src/test/kotlin/com/datadog/android/log/internal/net/LogsRequestFactoryTest.kt

@@ -93,7 +93,7 @@ internal class LogsRequestFactoryTest {
     @Suppress("NAME_SHADOWING")
     @Test
     fun `M create a proper request W create() { custom endpoint }`(
-        @StringForgery(regex = "https://[a-z]+\\.com") fakeEndpoint: String,
+        @StringForgery(regex = "https://[a-z]+\\.com(/[a-z]+)+") fakeEndpoint: String,
         @Forgery batchData: List<RawBatchEvent>,
         @StringForgery batchMetadata: String,
         @Forgery executionContext: RequestExecutionContext,
@@ -111,10 +111,7 @@ internal class LogsRequestFactoryTest {
 
         // Then
         requireNotNull(request)
-        assertThat(request.url).isEqualTo(
-            "$fakeEndpoint/api/v2/logs?" +
-                "ddsource=${fakeDatadogContext.source}"
-        )
+        assertThat(request.url).isEqualTo("$fakeEndpoint?ddsource=${fakeDatadogContext.source}")
         assertThat(request.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_JSON)
         assertThat(request.headers.minus(RequestFactory.HEADER_REQUEST_ID)).isEqualTo(
             mapOf(

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/RumConfiguration.kt

@@ -247,6 +247,7 @@ data class RumConfiguration internal constructor(
 
         /**
          * Let the RUM feature target a custom server.
+         * The provided url should be the full endpoint url, e.g.: https://example.com/rum/upload
          */
         fun useCustomEndpoint(endpoint: String): Builder {
             rumConfig = rumConfig.copy(customEndpointUrl = endpoint)

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/net/RumRequestFactory.kt

@@ -19,7 +19,6 @@ import com.datadog.android.rum.internal.domain.event.RumViewEventFilter
 import java.security.DigestException
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
-import java.util.Locale
 import java.util.UUID
 
 internal class RumRequestFactory(
@@ -70,13 +69,9 @@ internal class RumRequestFactory(
 
         )
 
-        val intakeUrl = "%s/api/v2/rum".format(
-            Locale.US,
-            customEndpointUrl ?: context.site.intakeEndpoint
-        )
-
-        return intakeUrl + queryParams.map { "${it.key}=${it.value}" }
-            .joinToString("&", prefix = "?")
+        val intakeUrl = customEndpointUrl ?: (context.site.intakeEndpoint + "/api/v2/rum")
+        val queryParameters = queryParams.map { "${it.key}=${it.value}" }.joinToString("&", prefix = "?")
+        return intakeUrl + queryParameters
     }
 
     private fun buildHeaders(

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/RumConfigurationBuilderTest.kt

@@ -131,7 +131,7 @@ internal class RumConfigurationBuilderTest {
 
     @Test
     fun `M build config with custom endpoint W useCustomEndpoint() and build()`(
-        @StringForgery(regex = "https://[a-z]+\\.com") rumUrl: String
+        @StringForgery(regex = "https://[a-z]+\\.com(/[a-z]+)+") rumUrl: String
     ) {
         // When
         val rumConfiguration = testedBuilder

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/net/RumRequestFactoryTest.kt

@@ -80,7 +80,8 @@ internal class RumRequestFactoryTest {
 
         // Then
         requireNotNull(request)
-        assertThat(request.url).isEqualTo(expectedUrl(fakeDatadogContext.site.intakeEndpoint))
+        val expectedUrl = expectedUrl(fakeDatadogContext.site.intakeEndpoint + "/api/v2/rum")
+        assertThat(request.url).isEqualTo(expectedUrl)
         assertThat(request.contentType).isEqualTo(RequestFactory.CONTENT_TYPE_TEXT_UTF8)
         assertThat(
             request.headers.minus(
@@ -111,7 +112,7 @@ internal class RumRequestFactoryTest {
     @Suppress("NAME_SHADOWING")
     @Test
     fun `M create a proper request W create() { custom endpoint }`(
-        @StringForgery(regex = "https://[a-z]+\\.com") fakeEndpoint: String,
+        @StringForgery(regex = "https://[a-z]+\\.com(/[a-z]+)+") fakeEndpoint: String,
         @Forgery batchData: List<RawBatchEvent>,
         @StringForgery batchMetadata: String,
         forge: Forge
@@ -173,7 +174,7 @@ internal class RumRequestFactoryTest {
             queryTags.add("${RumRequestFactory.LAST_FAILURE_STATUS_KEY}:${fakeExecutionContext.previousResponseCode}")
         }
 
-        return "$endpointUrl/api/v2/rum?ddsource=${fakeDatadogContext.source}" +
+        return "$endpointUrl?ddsource=${fakeDatadogContext.source}" +
             "&ddtags=${queryTags.joinToString(",")}"
     }
 }

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/SessionReplayConfiguration.kt

@@ -99,6 +99,7 @@ data class SessionReplayConfiguration internal constructor(
 
         /**
          * Let the Session Replay target a custom server.
+         * The provided url should be the full endpoint url, e.g.: https://example.com/replay/upload
          */
         fun useCustomEndpoint(endpoint: String): Builder {
             customEndpointUrl = endpoint

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/net/ResourcesRequestFactory.kt

@@ -16,7 +16,6 @@ import okhttp3.RequestBody
 import okio.Buffer
 import java.io.EOFException
 import java.io.IOException
-import java.util.Locale
 import java.util.UUID
 
 internal class ResourcesRequestFactory(
@@ -94,16 +93,10 @@ internal class ResourcesRequestFactory(
     }
 
     private fun buildUrl(datadogContext: DatadogContext): String {
-        return String.format(
-            Locale.US,
-            UPLOAD_URL,
-            customEndpointUrl ?: datadogContext.site.intakeEndpoint,
-            "replay"
-        )
+        return customEndpointUrl ?: (datadogContext.site.intakeEndpoint + "/api/v2/replay")
     }
 
     companion object {
-        private const val UPLOAD_URL = "%s/api/v2/%s"
         internal const val APPLICATION_ID = "application_id"
         internal const val UPLOAD_DESCRIPTION = "Session Replay Resource Upload Request"
         internal const val ERROR_CONVERTING_BODY_TO_BYTEARRAY = "Error converting request body to bytearray"