[FFL-2929] Add composable assignment request transport

Add opt-in assignment request timeout and retry controls plus an OkHttp Call.Factory transport seam. Preserve upgrade behavior with zero SDK timeout and zero retries by default.

Environment: Datadog workspace

Author: leoromanovsky

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Unreleased
+
+* [IMPROVEMENT] Add an assignment-only HTTP call factory plus optional per-attempt timeout and retry-count configuration for Flags assignment requests. Timeouts and retries are opt-in; the default remains one request with no SDK-added timeout.
+
 # 3.13.1 / 2026-08-27
 
 * [BUGFIX] Make `view` required again in RUM events. See [#3783](https://github.com/DataDog/dd-sdk-android/pull/3783)

features/dd-sdk-android-flags-openfeature/transitiveDependencies

@@ -1,12 +1,14 @@
 Dependencies List
 
 androidx.annotation:annotation-jvm:1.9.1                        :   59 Kb
+com.squareup.okhttp3:okhttp:4.12.0                              :  771 Kb
+com.squareup.okio:okio-jvm:3.6.0                                :  351 Kb
 dev.openfeature:kotlin-sdk-android:0.6.2                        :  118 Kb
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20                  :  963 b 
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20                  :  969 b 
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10                  :  959 b 
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10                  :  965 b 
 org.jetbrains.kotlin:kotlin-stdlib:2.1.21                       : 1683 Kb
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3         : 1514 Kb
 org.jetbrains:annotations:23.0.0                                :   28 Kb
 
-Total transitive dependencies size                              :    3 Mb
+Total transitive dependencies size                              :    4 Mb
 

features/dd-sdk-android-flags/README.md

@@ -93,6 +93,40 @@ val flagsConfig = FlagsConfiguration.Builder()
     .build()
 ```
 
+#### Configure assignment request limits
+
+Precomputed assignment requests make one attempt and have no SDK-added timeout by default. Set an explicit timeout to
+include both receiving the response and downloading its body. A zero timeout keeps the SDK timeout disabled and preserves
+any timeout already configured on the HTTP client. The retry count accepts values from zero to ten; zero disables retries.
+
+```kotlin
+val flagsConfig = FlagsConfiguration.Builder()
+    .assignmentRequestTimeout(2_000)
+    .assignmentRequestRetryCount(2)
+    .build()
+```
+
+#### Customize the assignment request transport
+
+Supply an OkHttp `Call.Factory` to customize only precomputed assignment requests. The SDK still constructs the
+request URL, method, body, and authentication headers; the factory must preserve them. Exposure and evaluation
+uploads continue to use the SDK transport. Timeout and retry policies compose independently on top of the supplied
+factory.
+
+```kotlin
+val customOkHttpClient = OkHttpClient.Builder()
+    // Add assignment-specific proxy, TLS, or interceptors here.
+    .build()
+
+val flagsConfig = FlagsConfiguration.Builder()
+    .assignmentRequestCallFactory(customOkHttpClient)
+    .assignmentRequestTimeout(2_000)
+    .assignmentRequestRetryCount(2)
+    .build()
+```
+
+The SDK does not own or shut down a supplied call factory or its resources.
+
 ## Use the Feature Flags SDK
 
 ### Create a Flags client

features/dd-sdk-android-flags/api/apiSurface

@@ -19,13 +19,17 @@ interface com.datadog.android.flags.FlagsClient
   companion object 
     fun get(String = DEFAULT_CLIENT_NAME, com.datadog.android.api.SdkCore = Datadog.getInstance()): FlagsClient
 data class com.datadog.android.flags.FlagsConfiguration
+  fun copy(Boolean = this.trackExposures, Boolean = this.trackEvaluations, String? = this.customExposureEndpoint, String? = this.customEvaluationEndpoint, String? = this.customFlagEndpoint, Long = this.evaluationFlushIntervalMs, Boolean = this.rumIntegrationEnabled, Boolean = this.gracefulModeEnabled): FlagsConfiguration
   class Builder
     fun trackExposures(Boolean): Builder
     fun trackEvaluations(Boolean): Builder
     fun useCustomExposureEndpoint(String): Builder
     fun useCustomEvaluationEndpoint(String): Builder
     fun evaluationFlushInterval(Long): Builder
     fun useCustomFlagEndpoint(String): Builder
+    fun assignmentRequestCallFactory(okhttp3.Call.Factory): Builder
+    fun assignmentRequestTimeout(Long): Builder
+    fun assignmentRequestRetryCount(Int): Builder
     fun rumIntegrationEnabled(Boolean): Builder
     fun gracefulModeEnabled(Boolean): Builder
     fun build(): FlagsConfiguration

features/dd-sdk-android-flags/api/dd-sdk-android-flags.api

@@ -46,14 +46,19 @@ public final class com/datadog/android/flags/FlagsClient$DefaultImpls {
 
 public final class com/datadog/android/flags/FlagsConfiguration {
 	public final fun copy (ZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;JZZ)Lcom/datadog/android/flags/FlagsConfiguration;
+	public final fun copy (ZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;JZZLokhttp3/Call$Factory;JI)Lcom/datadog/android/flags/FlagsConfiguration;
 	public static synthetic fun copy$default (Lcom/datadog/android/flags/FlagsConfiguration;ZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;JZZILjava/lang/Object;)Lcom/datadog/android/flags/FlagsConfiguration;
+	public static synthetic fun copy$default (Lcom/datadog/android/flags/FlagsConfiguration;ZZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;JZZLokhttp3/Call$Factory;JIILjava/lang/Object;)Lcom/datadog/android/flags/FlagsConfiguration;
 	public fun equals (Ljava/lang/Object;)Z
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/datadog/android/flags/FlagsConfiguration$Builder {
 	public fun <init> ()V
+	public final fun assignmentRequestCallFactory (Lokhttp3/Call$Factory;)Lcom/datadog/android/flags/FlagsConfiguration$Builder;
+	public final fun assignmentRequestRetryCount (I)Lcom/datadog/android/flags/FlagsConfiguration$Builder;
+	public final fun assignmentRequestTimeout (J)Lcom/datadog/android/flags/FlagsConfiguration$Builder;
 	public final fun build ()Lcom/datadog/android/flags/FlagsConfiguration;
 	public final fun evaluationFlushInterval (J)Lcom/datadog/android/flags/FlagsConfiguration$Builder;
 	public final fun gracefulModeEnabled (Z)Lcom/datadog/android/flags/FlagsConfiguration$Builder;

features/dd-sdk-android-flags/build.gradle.kts

@@ -57,7 +57,8 @@ dependencies {
 
     implementation(libs.gson)
     implementation(libs.kotlin)
-    implementation(libs.okHttp)
+    // Public API: FlagsConfiguration.Builder.assignmentRequestCallFactory(Call.Factory)
+    api(libs.okHttp)
     implementation(libs.androidXAnnotation)
     implementation(libs.androidXCollection)
 

features/dd-sdk-android-flags/src/main/kotlin/com/datadog/android/flags/FlagsClient.kt

@@ -31,6 +31,7 @@ import com.datadog.android.flags.model.EvaluationContext
 import com.datadog.android.flags.model.FlagsClientState
 import com.datadog.android.flags.model.ResolutionDetails
 import com.datadog.android.internal.utils.DDCoreStateHolder
+import okhttp3.Call
 import org.json.JSONObject
 
 /**
@@ -408,11 +409,14 @@ interface FlagsClient {
                 NoOpFlagsRepository()
             }
 
-            val callFactory = featureSdkCore.createOkHttpCallFactory()
+            val callFactory = resolveAssignmentRequestCallFactory(configuration, featureSdkCore)
             val assignmentsDownloader = PrecomputedAssignmentsDownloader(
                 internalLogger = featureSdkCore.internalLogger,
                 callFactory = callFactory,
-                requestFactory = flagsFeature.precomputedRequestFactory
+                requestFactory = flagsFeature.precomputedRequestFactory,
+                requestTimeoutMs = configuration.assignmentRequestTimeoutMs,
+                requestRetryCount = configuration.assignmentRequestRetryCount,
+                timeProvider = featureSdkCore.timeProvider
             )
 
             val precomputeMapper = PrecomputeMapper(featureSdkCore.internalLogger)
@@ -448,6 +452,12 @@ interface FlagsClient {
             )
         }
 
+        internal fun resolveAssignmentRequestCallFactory(
+            configuration: FlagsConfiguration,
+            featureSdkCore: FeatureSdkCore
+        ): Call.Factory = configuration.assignmentRequestCallFactory
+            ?: featureSdkCore.createOkHttpCallFactory()
+
         private fun createRumEvaluationLogger(featureSdkCore: FeatureSdkCore): RumEvaluationLogger {
             val rumFeatureScope = featureSdkCore.getFeature(RUM_FEATURE_NAME)
 

features/dd-sdk-android-flags/src/main/kotlin/com/datadog/android/flags/FlagsConfiguration.kt

@@ -6,6 +6,12 @@
 
 package com.datadog.android.flags
 
+import okhttp3.Call
+
+private const val DEFAULT_ASSIGNMENT_REQUEST_TIMEOUT_MS = 0L
+private const val DEFAULT_ASSIGNMENT_REQUEST_RETRY_COUNT = 0
+private const val MAX_ASSIGNMENT_REQUEST_RETRY_COUNT = 10
+
 /**
  * Describes configuration to be used for the Flags feature.
  */
@@ -18,17 +24,54 @@ data class FlagsConfiguration internal constructor(
     internal val customFlagEndpoint: String?,
     internal val evaluationFlushIntervalMs: Long,
     internal val rumIntegrationEnabled: Boolean,
-    internal val gracefulModeEnabled: Boolean
+    internal val gracefulModeEnabled: Boolean,
+    internal val assignmentRequestCallFactory: Call.Factory?,
+    internal val assignmentRequestTimeoutMs: Long,
+    internal val assignmentRequestRetryCount: Int
 ) {
+    /**
+     * Copies this configuration while preserving assignment request transport policies.
+     *
+     * This overload retains the public JVM signature generated before assignment request settings were added to the
+     * primary constructor. Keep its parameter list stable for binary compatibility.
+     */
+    @Suppress("LongParameterList")
+    fun copy(
+        trackExposures: Boolean = this.trackExposures,
+        trackEvaluations: Boolean = this.trackEvaluations,
+        customExposureEndpoint: String? = this.customExposureEndpoint,
+        customEvaluationEndpoint: String? = this.customEvaluationEndpoint,
+        customFlagEndpoint: String? = this.customFlagEndpoint,
+        evaluationFlushIntervalMs: Long = this.evaluationFlushIntervalMs,
+        rumIntegrationEnabled: Boolean = this.rumIntegrationEnabled,
+        gracefulModeEnabled: Boolean = this.gracefulModeEnabled
+    ): FlagsConfiguration = FlagsConfiguration(
+        trackExposures = trackExposures,
+        trackEvaluations = trackEvaluations,
+        customExposureEndpoint = customExposureEndpoint,
+        customEvaluationEndpoint = customEvaluationEndpoint,
+        customFlagEndpoint = customFlagEndpoint,
+        evaluationFlushIntervalMs = evaluationFlushIntervalMs,
+        rumIntegrationEnabled = rumIntegrationEnabled,
+        gracefulModeEnabled = gracefulModeEnabled,
+        assignmentRequestCallFactory = assignmentRequestCallFactory,
+        assignmentRequestTimeoutMs = assignmentRequestTimeoutMs,
+        assignmentRequestRetryCount = assignmentRequestRetryCount
+    )
+
     /**
      * A Builder class for a [FlagsConfiguration].
      */
+    @Suppress("TooManyFunctions")
     class Builder {
         private var trackExposures: Boolean = true
         private var trackEvaluations: Boolean = true
         private var customExposureEndpoint: String? = null
         private var customEvaluationEndpoint: String? = null
         private var customFlagEndpoint: String? = null
+        private var assignmentRequestCallFactory: Call.Factory? = null
+        private var assignmentRequestTimeoutMs: Long = DEFAULT_ASSIGNMENT_REQUEST_TIMEOUT_MS
+        private var assignmentRequestRetryCount: Int = DEFAULT_ASSIGNMENT_REQUEST_RETRY_COUNT
         private var evaluationFlushIntervalMs: Long = DEFAULT_EVALUATION_FLUSH_INTERVAL_MS
         private var rumIntegrationEnabled: Boolean = true
         private var gracefulModeEnabled: Boolean = true
@@ -116,6 +159,57 @@ data class FlagsConfiguration internal constructor(
             return this
         }
 
+        /**
+         * Sets the HTTP call factory used only for precomputed assignment requests.
+         *
+         * The SDK constructs each request, including its URL, method, body, and authentication headers, before passing
+         * it to [Call.Factory.newCall]. The factory must preserve those request properties. Exposure and evaluation
+         * uploads continue to use the SDK's own HTTP transport.
+         *
+         * The SDK does not take ownership of the factory or its resources. The configured assignment timeout and retry
+         * policies are applied on top of calls created by this factory.
+         *
+         * @param callFactory Factory used to create precomputed assignment calls.
+         * @return this [Builder] instance for method chaining.
+         */
+        fun assignmentRequestCallFactory(callFactory: Call.Factory): Builder {
+            assignmentRequestCallFactory = callFactory
+            return this
+        }
+
+        /**
+         * Sets the timeout for each precomputed assignment request.
+         * The timeout includes downloading the response body. A value of zero disables the SDK timeout and preserves
+         * any timeout already configured on the HTTP client.
+         *
+         * @param timeoutMs The timeout for each request, in milliseconds.
+         * @return this [Builder] instance for method chaining.
+         * @throws IllegalArgumentException if [timeoutMs] is negative.
+         */
+        fun assignmentRequestTimeout(timeoutMs: Long): Builder {
+            @Suppress("UnsafeThirdPartyFunctionCall") // Intentional public argument validation.
+            require(timeoutMs >= 0) { "timeoutMs must be greater than or equal to 0" }
+            assignmentRequestTimeoutMs = timeoutMs
+            return this
+        }
+
+        /**
+         * Sets the number of retries after a transient precomputed assignment request failure.
+         * The default is zero (no retries). The retry count must be between zero and ten, inclusive.
+         *
+         * @param retryCount The number of retries after the first attempt.
+         * @return this [Builder] instance for method chaining.
+         * @throws IllegalArgumentException if [retryCount] is outside the supported range.
+         */
+        fun assignmentRequestRetryCount(retryCount: Int): Builder {
+            @Suppress("UnsafeThirdPartyFunctionCall") // Intentional public argument validation.
+            require(retryCount in 0..MAX_ASSIGNMENT_REQUEST_RETRY_COUNT) {
+                "retryCount must be between 0 and $MAX_ASSIGNMENT_REQUEST_RETRY_COUNT"
+            }
+            assignmentRequestRetryCount = retryCount
+            return this
+        }
+
         /**
          * Sets whether RUM evaluation logging is enabled.
          * This adds the result of evaluating a feature flag to the view.
@@ -160,7 +254,10 @@ data class FlagsConfiguration internal constructor(
             customFlagEndpoint = customFlagEndpoint,
             evaluationFlushIntervalMs = evaluationFlushIntervalMs,
             rumIntegrationEnabled = rumIntegrationEnabled,
-            gracefulModeEnabled = gracefulModeEnabled
+            gracefulModeEnabled = gracefulModeEnabled,
+            assignmentRequestCallFactory = assignmentRequestCallFactory,
+            assignmentRequestTimeoutMs = assignmentRequestTimeoutMs,
+            assignmentRequestRetryCount = assignmentRequestRetryCount
         )
 
         internal companion object {