pr suggestions

Author: Shahroz16

core/src/main/kotlin/io/customer/sdk/core/pipeline/DataPipeline.kt

@@ -12,6 +12,6 @@ import io.customer.base.internal.InternalCustomerIOApi
  */
 @InternalCustomerIOApi
 interface DataPipeline {
-    val userId: String?
+    val isUserIdentified: Boolean
     fun track(name: String, properties: Map<String, Any?>)
 }

core/src/main/kotlin/io/customer/sdk/core/pipeline/IdentifyContextProvider.kt

@@ -0,0 +1,20 @@
+package io.customer.sdk.core.pipeline
+
+import io.customer.base.internal.InternalCustomerIOApi
+
+/**
+ * Interface for modules that contribute context entries to identify events.
+ *
+ * Implementations return a map of primitive-valued entries (String, Number, Boolean)
+ * that will be added to the identify event's context via `putInContext()`.
+ * Return an empty map when there is nothing to contribute.
+ *
+ * These are NOT profile traits/attributes — they are context-level enrichment
+ * data (e.g., location coordinates) attached to the identify event payload.
+ *
+ * This is an internal SDK contract — not intended for use by host app developers.
+ */
+@InternalCustomerIOApi
+interface IdentifyContextProvider {
+    fun getIdentifyContext(): Map<String, Any>
+}

…re/pipeline/ProfileEnrichmentRegistry.kt …core/pipeline/IdentifyContextRegistry.ktcore/src/main/kotlin/io/customer/sdk/core/pipeline/ProfileEnrichmentRegistry.kt renamed to core/src/main/kotlin/io/customer/sdk/core/pipeline/IdentifyContextRegistry.kt core/src/main/kotlin/io/customer/sdk/core/pipeline/ProfileEnrichmentRegistry.kt renamed to core/src/main/kotlin/io/customer/sdk/core/pipeline/IdentifyContextRegistry.kt

@@ -4,28 +4,28 @@ import io.customer.base.internal.InternalCustomerIOApi
 import io.customer.sdk.core.di.SDKComponent
 
 /**
- * Thread-safe registry of [ProfileEnrichmentProvider] instances.
+ * Thread-safe registry of [IdentifyContextProvider] instances.
  *
  * Modules register providers during initialization. The datapipelines module
- * queries all providers when enriching identify events.
+ * queries all providers when enriching identify event context.
  *
  * Cleared automatically when [SDKComponent.reset] clears singletons.
  *
  * This is an internal SDK contract — not intended for use by host app developers.
  */
 @InternalCustomerIOApi
-class ProfileEnrichmentRegistry {
-    private val providers = mutableListOf<ProfileEnrichmentProvider>()
+class IdentifyContextRegistry {
+    private val providers = mutableListOf<IdentifyContextProvider>()
 
     @Synchronized
-    fun register(provider: ProfileEnrichmentProvider) {
+    fun register(provider: IdentifyContextProvider) {
         if (provider !in providers) {
             providers.add(provider)
         }
     }
 
     @Synchronized
-    fun getAll(): List<ProfileEnrichmentProvider> = providers.toList()
+    fun getAll(): List<IdentifyContextProvider> = providers.toList()
 
     @Synchronized
     fun clear() {
@@ -34,8 +34,8 @@ class ProfileEnrichmentRegistry {
 }
 
 /**
- * Singleton accessor for [ProfileEnrichmentRegistry] via [SDKComponent].
+ * Singleton accessor for [IdentifyContextRegistry] via [SDKComponent].
  */
 @InternalCustomerIOApi
-val SDKComponent.profileEnrichmentRegistry: ProfileEnrichmentRegistry
-    get() = singleton { ProfileEnrichmentRegistry() }
+val SDKComponent.identifyContextRegistry: IdentifyContextRegistry
+    get() = singleton { IdentifyContextRegistry() }

core/src/main/kotlin/io/customer/sdk/core/pipeline/ProfileEnrichmentProvider.kt

@@ -144,6 +144,7 @@ public final class io/customer/sdk/CustomerIO : io/customer/sdk/DataPipelineInst
 	public fun initialize ()V
 	public static final fun initialize (Lio/customer/sdk/CustomerIOConfig;)V
 	public static final fun instance ()Lio/customer/sdk/CustomerIO;
+	public fun isUserIdentified ()Z
 	public fun setDeviceAttributes (Ljava/util/Map;)V
 	public fun setDeviceAttributesDeprecated (Ljava/util/Map;)V
 	public fun setProfileAttributes (Ljava/util/Map;)V

datapipelines/api/datapipelines.api

@@ -6,20 +6,20 @@ import com.segment.analytics.kotlin.core.IdentifyEvent
 import com.segment.analytics.kotlin.core.platform.EventPlugin
 import com.segment.analytics.kotlin.core.platform.Plugin
 import com.segment.analytics.kotlin.core.utilities.putInContext
-import io.customer.sdk.core.pipeline.ProfileEnrichmentRegistry
+import io.customer.sdk.core.pipeline.IdentifyContextRegistry
 import io.customer.sdk.core.util.Logger
 import kotlinx.serialization.json.JsonPrimitive
 
 /**
  * Generic Segment enrichment plugin that queries all registered
- * [ProfileEnrichmentProvider] instances and adds their attributes
- * to identify event context.
+ * [IdentifyContextProvider][io.customer.sdk.core.pipeline.IdentifyContextProvider]
+ * instances and adds their entries to the identify event context.
  *
  * This plugin has zero knowledge of specific modules — providers
  * manage their own state and return primitive-valued maps.
  */
-internal class ProfileEnrichmentPlugin(
-    private val registry: ProfileEnrichmentRegistry,
+internal class IdentifyContextPlugin(
+    private val registry: IdentifyContextRegistry,
     private val logger: Logger
 ) : EventPlugin {
     override val type: Plugin.Type = Plugin.Type.Enrichment
@@ -28,21 +28,22 @@ internal class ProfileEnrichmentPlugin(
     override fun identify(payload: IdentifyEvent): BaseEvent {
         for (provider in registry.getAll()) {
             try {
-                val attributes = provider.getProfileEnrichmentAttributes() ?: continue
-                for ((key, value) in attributes) {
+                val context = provider.getIdentifyContext()
+                if (context.isEmpty()) continue
+                for ((key, value) in context) {
                     val jsonValue = when (value) {
                         is String -> JsonPrimitive(value)
                         is Number -> JsonPrimitive(value)
                         is Boolean -> JsonPrimitive(value)
                         else -> {
-                            logger.debug("Skipping non-primitive enrichment attribute: $key")
+                            logger.debug("Skipping non-primitive context entry: $key")
                             continue
                         }
                     }
                     payload.putInContext(key, jsonValue)
                 }
             } catch (e: Exception) {
-                logger.error("ProfileEnrichmentProvider failed: ${e.message}")
+                logger.error("IdentifyContextProvider failed: ${e.message}")
             }
         }
         return payload

…lines/plugins/ProfileEnrichmentPlugin.kt …pelines/plugins/IdentifyContextPlugin.ktdatapipelines/src/main/kotlin/io/customer/datapipelines/plugins/ProfileEnrichmentPlugin.kt renamed to datapipelines/src/main/kotlin/io/customer/datapipelines/plugins/IdentifyContextPlugin.kt datapipelines/src/main/kotlin/io/customer/datapipelines/plugins/ProfileEnrichmentPlugin.kt renamed to datapipelines/src/main/kotlin/io/customer/datapipelines/plugins/IdentifyContextPlugin.kt

@@ -25,15 +25,15 @@ import io.customer.datapipelines.plugins.AutomaticActivityScreenTrackingPlugin
 import io.customer.datapipelines.plugins.AutomaticApplicationLifecycleTrackingPlugin
 import io.customer.datapipelines.plugins.ContextPlugin
 import io.customer.datapipelines.plugins.CustomerIODestination
-import io.customer.datapipelines.plugins.ProfileEnrichmentPlugin
+import io.customer.datapipelines.plugins.IdentifyContextPlugin
 import io.customer.datapipelines.plugins.ScreenFilterPlugin
 import io.customer.sdk.communication.Event
 import io.customer.sdk.communication.subscribe
 import io.customer.sdk.core.di.AndroidSDKComponent
 import io.customer.sdk.core.di.SDKComponent
 import io.customer.sdk.core.module.CustomerIOModule
 import io.customer.sdk.core.pipeline.DataPipeline
-import io.customer.sdk.core.pipeline.profileEnrichmentRegistry
+import io.customer.sdk.core.pipeline.identifyContextRegistry
 import io.customer.sdk.core.util.CioLogLevel
 import io.customer.sdk.core.util.Logger
 import io.customer.sdk.data.model.CustomAttributes
@@ -130,7 +130,7 @@ class CustomerIO private constructor(
 
         // Add plugin to filter events based on SDK configuration
         analytics.add(ScreenFilterPlugin(moduleConfig.screenViewUse))
-        analytics.add(ProfileEnrichmentPlugin(SDKComponent.profileEnrichmentRegistry, logger))
+        analytics.add(IdentifyContextPlugin(SDKComponent.identifyContextRegistry, logger))
         analytics.add(ApplicationLifecyclePlugin())
 
         // Register this instance as DataPipeline so modules can send track events directly
@@ -325,6 +325,9 @@ class CustomerIO private constructor(
     override val userId: String?
         get() = analytics.userId()
 
+    override val isUserIdentified: Boolean
+        get() = !analytics.userId().isNullOrEmpty()
+
     @Deprecated("Use setDeviceAttributes() function instead")
     @set:JvmName("setDeviceAttributesDeprecated")
     override var deviceAttributes: CustomAttributes

datapipelines/src/main/kotlin/io/customer/sdk/CustomerIO.kt

@@ -3,16 +3,16 @@ package io.customer.location
 import io.customer.location.store.LocationPreferenceStore
 import io.customer.location.sync.LocationSyncFilter
 import io.customer.sdk.core.pipeline.DataPipeline
-import io.customer.sdk.core.pipeline.ProfileEnrichmentProvider
+import io.customer.sdk.core.pipeline.IdentifyContextProvider
 import io.customer.sdk.core.util.Logger
 import io.customer.sdk.util.EventNames
 
 /**
  * Coordinates all location state management: persistence, restoration,
  * profile enrichment, and sending location track events.
  *
- * Implements [ProfileEnrichmentProvider] to enrich identify events with
- * the latest location. Sends location track events directly via
+ * Implements [IdentifyContextProvider] to enrich identify event context
+ * with the latest location. Sends location track events directly via
  * [DataPipeline], applying the userId gate and sync filter locally.
  *
  * Tracks the last known userId to detect profile switches and reset
@@ -23,16 +23,16 @@ internal class LocationTracker(
     private val locationPreferenceStore: LocationPreferenceStore,
     private val locationSyncFilter: LocationSyncFilter,
     private val logger: Logger
-) : ProfileEnrichmentProvider {
+) : IdentifyContextProvider {
 
     @Volatile
     private var lastLocation: LocationCoordinates? = null
 
     @Volatile
     private var lastKnownUserId: String? = null
 
-    override fun getProfileEnrichmentAttributes(): Map<String, Any>? {
-        val location = lastLocation ?: return null
+    override fun getIdentifyContext(): Map<String, Any> {
+        val location = lastLocation ?: return emptyMap()
         return mapOf(
             "location_latitude" to location.latitude,
             "location_longitude" to location.longitude
@@ -115,7 +115,7 @@ internal class LocationTracker(
      */
     private fun trySendLocationTrack(latitude: Double, longitude: Double) {
         val pipeline = dataPipeline ?: return
-        if (pipeline.userId.isNullOrEmpty()) return
+        if (!pipeline.isUserIdentified) return
         if (!locationSyncFilter.filterAndRecord(latitude, longitude)) return
 
         logger.debug("Sending location track: lat=$latitude, lng=$longitude")

location/src/main/kotlin/io/customer/location/LocationTracker.kt

@@ -10,7 +10,7 @@ import io.customer.sdk.communication.subscribe
 import io.customer.sdk.core.di.SDKComponent
 import io.customer.sdk.core.module.CustomerIOModule
 import io.customer.sdk.core.pipeline.DataPipeline
-import io.customer.sdk.core.pipeline.profileEnrichmentRegistry
+import io.customer.sdk.core.pipeline.identifyContextRegistry
 import io.customer.sdk.core.util.Logger
 
 /**
@@ -46,6 +46,7 @@ class ModuleLocation @JvmOverloads constructor(
 ) : CustomerIOModule<LocationModuleConfig> {
     override val moduleName: String = MODULE_NAME
 
+    @Volatile
     private var _locationServices: LocationServices? = null
 
     /**
@@ -76,8 +77,8 @@ class ModuleLocation @JvmOverloads constructor(
 
         locationTracker.restorePersistedLocation()
 
-        // Register as ProfileEnrichmentProvider for identify enrichment
-        SDKComponent.profileEnrichmentRegistry.register(locationTracker)
+        // Register as IdentifyContextProvider so location is added to identify event context
+        SDKComponent.identifyContextRegistry.register(locationTracker)
 
         eventBus.subscribe<Event.ResetEvent> {
             locationTracker.onReset()