address comments

Author: typotter

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

@@ -35,7 +35,6 @@ public final class com/datadog/android/flags/FlagsClient$Companion {
 
 public final class com/datadog/android/flags/FlagsConfiguration {
 	public static final field Companion Lcom/datadog/android/flags/FlagsConfiguration$Companion;
-	public fun <init> ()V
 	public final fun copy (ZLjava/lang/String;Ljava/lang/String;ZZ)Lcom/datadog/android/flags/FlagsConfiguration;
 	public static synthetic fun copy$default (Lcom/datadog/android/flags/FlagsConfiguration;ZLjava/lang/String;Ljava/lang/String;ZZILjava/lang/Object;)Lcom/datadog/android/flags/FlagsConfiguration;
 	public fun equals (Ljava/lang/Object;)Z

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

@@ -10,11 +10,11 @@ package com.datadog.android.flags
  * Describes configuration to be used for the Flags feature.
  */
 data class FlagsConfiguration internal constructor(
-    internal val trackExposures: Boolean = true,
-    internal val customExposureEndpoint: String? = null,
-    internal val customFlagEndpoint: String? = null,
-    internal val rumIntegrationEnabled: Boolean = true,
-    internal val gracefulModeEnabled: Boolean = true
+    internal val trackExposures: Boolean,
+    internal val customExposureEndpoint: String?,
+    internal val customFlagEndpoint: String?,
+    internal val rumIntegrationEnabled: Boolean,
+    internal val gracefulModeEnabled: Boolean
 ) {
     /**
      * A Builder class for a [FlagsConfiguration].
@@ -121,6 +121,6 @@ data class FlagsConfiguration internal constructor(
          * - No custom endpoint URL (uses standard Datadog intake)
          * - No custom flag endpoint URL (uses standard Datadog edge assignment endpoint)
          */
-        internal val default = FlagsConfiguration()
+        internal val default = Builder().build()
     }
 }

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

@@ -357,8 +357,7 @@ internal class DatadogFlagsClient(
         variant = null,
         reason = ResolutionReason.ERROR,
         errorCode = errorCode,
-        errorMessage = "Flag '$flagKey': $errorMessage",
-        flagMetadata = null
+        errorMessage = "Flag '$flagKey': $errorMessage"
     )
 
     private fun parseReason(reasonString: String): ResolutionReason? {

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

@@ -55,6 +55,12 @@ internal class FlagsFeature(private val sdkCore: FeatureSdkCore, internal val fl
     @Volatile
     private var isDebugBuild: Boolean = false
 
+    /**
+     * Registry of [FlagsClient] instances by name.
+     * This map stores all clients created for this feature instance.
+     */
+    private val registeredClients: MutableMap<String, FlagsClient> = mutableMapOf()
+
     // region Domain Objects
 
     /**
@@ -119,12 +125,6 @@ internal class FlagsFeature(private val sdkCore: FeatureSdkCore, internal val fl
 
     // region FlagsClient Management
 
-    /**
-     * Registry of [FlagsClient] instances by name.
-     * This map stores all clients created for this feature instance.
-     */
-    private val registeredClients: MutableMap<String, FlagsClient> = mutableMapOf()
-
     /**
      * Gets a registered [FlagsClient] by name.
      *

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

@@ -18,13 +18,13 @@ package com.datadog.android.flags.model
  * @property reason Optional reason code explaining why this value was resolved.
  * @property errorCode Optional error code if the resolution failed. Null indicates successful resolution.
  * @property errorMessage Optional human-readable error message providing additional context about failures.
- * @property flagMetadata Optional map of arbitrary metadata associated with the flag (string keys, primitive values).
+ * @property flagMetadata Map of arbitrary metadata associated with the flag (string keys, primitive values). Empty if no metadata.
  */
 data class ResolutionDetails<T : Any>(
     val value: T,
     val variant: String? = null,
     val reason: ResolutionReason? = null,
     val errorCode: ErrorCode? = null,
     val errorMessage: String? = null,
-    val flagMetadata: Map<String, Any>? = null
+    val flagMetadata: Map<String, Any> = emptyMap()
 )

features/dd-sdk-android-flags/src/test/kotlin/com/datadog/android/flags/internal/DatadogFlagsClientTest.kt

@@ -718,7 +718,7 @@ internal class DatadogFlagsClientTest {
         assertThat(result.errorCode).isEqualTo(ErrorCode.TYPE_MISMATCH)
         assertThat(result.errorMessage).contains("Flag '$fakeFlagKey'")
         assertThat(result.errorMessage).contains("has type 'string' but Boolean was requested")
-        assertThat(result.flagMetadata).isNull()
+        assertThat(result.flagMetadata).isEmpty()
 
         // Verify no exposure tracked for type mismatch
         verifyNoInteractions(mockProcessor)
@@ -741,7 +741,7 @@ internal class DatadogFlagsClientTest {
         assertThat(result.errorCode).isEqualTo(ErrorCode.FLAG_NOT_FOUND)
         assertThat(result.errorMessage).contains("Flag '$fakeFlagKey'")
         assertThat(result.errorMessage).contains("Flag not found")
-        assertThat(result.flagMetadata).isNull()
+        assertThat(result.flagMetadata).isEmpty()
 
         // Verify no exposure tracked when flag not found
         verifyNoInteractions(mockProcessor)
@@ -764,7 +764,7 @@ internal class DatadogFlagsClientTest {
         assertThat(result.errorCode).isEqualTo(ErrorCode.PROVIDER_NOT_READY)
         assertThat(result.errorMessage).contains("Flag '$fakeFlagKey'")
         assertThat(result.errorMessage).contains("Provider not ready")
-        assertThat(result.flagMetadata).isNull()
+        assertThat(result.flagMetadata).isEmpty()
 
         // Verify no exposure tracked when provider not ready
         verifyNoInteractions(mockProcessor)
@@ -798,7 +798,7 @@ internal class DatadogFlagsClientTest {
         assertThat(result.errorCode).isEqualTo(ErrorCode.PARSE_ERROR)
         assertThat(result.errorMessage).contains("Flag '$fakeFlagKey'")
         assertThat(result.errorMessage).contains("Failed to parse value")
-        assertThat(result.flagMetadata).isNull()
+        assertThat(result.flagMetadata).isEmpty()
 
         // Verify no exposure tracked for parse error
         verifyNoInteractions(mockProcessor)