feat: rename amplitude-core to analytics-connector (#13)

* fix: rename core to analytcs-connector

* rename core classes to connector

* connector v1.0.0

core/build.gradle → analytics-connector/build.gradle

@@ -4,11 +4,11 @@ plugins {
 }
 
 ext {
-    PUBLISH_NAME = 'Amplitude SDK Core'
-    PUBLISH_DESCRIPTION = 'Core package for Amplitide SDKs'
+    PUBLISH_NAME = 'Amplitude Analytics SDK Connector'
+    PUBLISH_DESCRIPTION = 'Connector for seamlessly integrating with the Amplitude Analytics SDK'
     PUBLISH_GROUP_ID = 'com.amplitude'
     PUBLISH_VERSION = '1.0.0'
-    PUBLISH_ARTIFACT_ID = 'amplitude-core'
+    PUBLISH_ARTIFACT_ID = 'analytics-connector'
 }
 
 apply from: "${rootDir}/gradle/publish-module.gradle"

core/src/main/AndroidManifest.xml → analytics-connector/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.amplitude.core">
+    package="com.amplitude.analytics">
 
 </manifest>

analytics-connector/src/main/java/com/amplitude/analytics/connector/AnalyticsConnector.kt

@@ -0,0 +1,22 @@
+package com.amplitude.analytics.connector
+
+class AnalyticsConnector private constructor() {
+
+    companion object {
+
+        private val instancesLock = Any()
+        private val instances = mutableMapOf<String, AnalyticsConnector>()
+
+        @JvmStatic
+        fun getInstance(instanceName: String): AnalyticsConnector {
+            return synchronized(instancesLock) {
+                instances.getOrPut(instanceName) {
+                    AnalyticsConnector()
+                }
+            }
+        }
+    }
+
+    val identityStore: IdentityStore = IdentityStoreImpl()
+    val eventBridge: EventBridge = EventBridgeImpl()
+}

core/src/main/java/com/amplitude/core/AnalyticsConnector.kt → analytics-connector/src/main/java/com/amplitude/analytics/connector/EventBridge.kt

@@ -1,4 +1,4 @@
-package com.amplitude.core
+package com.amplitude.analytics.connector
 
 import java.util.concurrent.ArrayBlockingQueue
 
@@ -10,13 +10,13 @@ data class AnalyticsEvent(
     val userProperties: Map<String, Map<String, Any>>? = null,
 )
 
-interface AnalyticsConnector {
+interface EventBridge {
 
     fun logEvent(event: AnalyticsEvent)
     fun setEventReceiver(receiver: AnalyticsEventReceiver?)
 }
 
-internal class AnalyticsConnectorImpl : AnalyticsConnector {
+internal class EventBridgeImpl : EventBridge {
 
     private val lock = Any()
     private var receiver: AnalyticsEventReceiver? = null

core/src/main/java/com/amplitude/core/IdentityStore.kt → analytics-connector/src/main/java/com/amplitude/analytics/connector/IdentityStore.kt

@@ -1,4 +1,4 @@
-package com.amplitude.core
+package com.amplitude.analytics.connector
 
 import java.util.concurrent.locks.ReentrantReadWriteLock
 import kotlin.concurrent.read

core/src/main/java/com/amplitude/core/util/JSON.kt → analytics-connector/src/main/java/com/amplitude/analytics/connector/util/JSON.kt

@@ -1,6 +1,6 @@
 @file:JvmName("JSONUtil")
 
-package com.amplitude.core.util
+package com.amplitude.analytics.connector.util
 
 import org.json.JSONArray
 import org.json.JSONObject

core/src/test/java/com/amplitude/core/AnalyticsConnectorTest.kt → analytics-connector/src/test/java/com/amplitude/analytics/connector/EventBridgeTest.kt

@@ -1,14 +1,16 @@
-package com.amplitude.core
+package com.amplitude.analytics.connector
 
+import com.amplitude.analytics.connector.AnalyticsEvent
+import com.amplitude.analytics.connector.EventBridgeImpl
 import org.junit.Assert
 import org.junit.Test
 
-class AnalyticsConnectorTest {
+class EventBridgeTest {
 
     @Test
     fun `test addEventListener, logEvent, listener called`() {
         val testEvent = AnalyticsEvent("test")
-        val analyticsConnector = AnalyticsConnectorImpl()
+        val analyticsConnector = EventBridgeImpl()
         analyticsConnector.setEventReceiver {
             Assert.assertEquals(testEvent, it)
         }
@@ -20,7 +22,7 @@ class AnalyticsConnectorTest {
         val testEvent0 = AnalyticsEvent("test0")
         val testEvent1 = AnalyticsEvent("test1")
         val testEvent2 = AnalyticsEvent("test2")
-        val analyticsConnector = AnalyticsConnectorImpl()
+        val analyticsConnector = EventBridgeImpl()
         analyticsConnector.logEvent(testEvent0)
         analyticsConnector.logEvent(testEvent1)
         var eventCount = 0

core/src/test/java/com/amplitude/core/IdentityStoreTest.kt → analytics-connector/src/test/java/com/amplitude/analytics/connector/IdentityStoreTest.kt

@@ -1,7 +1,7 @@
-package com.amplitude.core
+package com.amplitude.analytics.connector
 
 import com.amplitude.api.Identify
-import com.amplitude.core.util.toUpdateUserPropertiesMap
+import com.amplitude.analytics.connector.util.toUpdateUserPropertiesMap
 import org.json.JSONArray
 import org.json.JSONObject
 import org.junit.Assert
@@ -85,11 +85,13 @@ class IdentityStoreTest {
     @Test
     fun `test updateUserProperties, unset`() {
         val identityStore = IdentityStoreImpl()
-        identityStore.setIdentity(Identity(userProperties = mapOf(
+        identityStore.setIdentity(
+            Identity(userProperties = mapOf(
             "key" to "value",
             "other" to true,
             "final" to 4.2
-        )))
+        ))
+        )
         identityStore.editIdentity()
             .updateUserProperties(
                 mapOf("\$unset" to mapOf("other" to "-", "final" to "-"))
@@ -104,12 +106,14 @@ class IdentityStoreTest {
     @Test
     fun `test updateUserProperties, clearAll`() {
         val identityStore = IdentityStoreImpl()
-        identityStore.setIdentity(Identity(userProperties = mapOf(
+        identityStore.setIdentity(
+            Identity(userProperties = mapOf(
             "key" to listOf(-3, -2, -1, 0),
             "key2" to mapOf("wow" to "cool"),
             "key3" to 3,
             "key4" to false,
-        )))
+        ))
+        )
         identityStore.editIdentity()
             .updateUserProperties(
                 mapOf("\$clearAll" to mapOf())

sdk/build.gradle

@@ -34,10 +34,11 @@ android {
 }
 
 dependencies {
-    implementation 'com.amplitude:amplitude-core:1.0.0'
-    implementation 'com.amplitude:android-sdk:2.26.1'
+    implementation 'com.amplitude:analytics-connector:1.0.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
 
+    implementation 'com.amplitude:android-sdk:2.26.1'
+
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.json:json:20201115'
 }

sdk/src/main/java/com/amplitude/experiment/CoreAnalyticsProvider.kt → sdk/src/main/java/com/amplitude/experiment/ConnectorAnalyticsProvider.kt

@@ -1,19 +1,19 @@
 package com.amplitude.experiment
 
-import com.amplitude.core.AnalyticsConnector
-import com.amplitude.core.AnalyticsEvent
+import com.amplitude.analytics.connector.EventBridge
+import com.amplitude.analytics.connector.AnalyticsEvent
 import com.amplitude.experiment.analytics.ExperimentAnalyticsEvent
 import com.amplitude.experiment.analytics.ExperimentAnalyticsProvider
 
-internal class CoreAnalyticsProvider(
-    private val analyticsConnector: AnalyticsConnector
+internal class ConnectorAnalyticsProvider(
+    private val eventBridge: EventBridge
 ): ExperimentAnalyticsProvider {
 
     override fun track(event: ExperimentAnalyticsEvent) {
         val eventProperties: Map<String, String> = event.properties
             .filterValues { it != null }
             .mapValues { it.value!! }
-        analyticsConnector.logEvent(
+        eventBridge.logEvent(
             AnalyticsEvent(
                 eventType = event.name,
                 eventProperties = eventProperties
@@ -23,7 +23,7 @@ internal class CoreAnalyticsProvider(
 
     override fun setUserProperty(event: ExperimentAnalyticsEvent) {
         val variant = event.variant.value ?: return
-        analyticsConnector.logEvent(
+        eventBridge.logEvent(
             AnalyticsEvent(
                 "\$identify",
                 null,
@@ -37,7 +37,7 @@ internal class CoreAnalyticsProvider(
     }
 
     override fun unsetUserProperty(event: ExperimentAnalyticsEvent) {
-        analyticsConnector.logEvent(
+        eventBridge.logEvent(
             AnalyticsEvent(
                 "\$identify",
                 null,

sdk/src/main/java/com/amplitude/experiment/CoreUserProvider.kt → sdk/src/main/java/com/amplitude/experiment/ConnectorUserProvider.kt

@@ -1,14 +1,14 @@
 package com.amplitude.experiment
 
 import android.content.Context
-import com.amplitude.core.Identity
-import com.amplitude.core.IdentityStore
+import com.amplitude.analytics.connector.Identity
+import com.amplitude.analytics.connector.IdentityStore
 import com.amplitude.experiment.util.Lock
 import com.amplitude.experiment.util.LockResult
 import java.util.concurrent.TimeoutException
 import kotlin.jvm.Throws
 
-internal class CoreUserProvider(
+internal class ConnectorUserProvider(
     context: Context,
     private val identityStore: IdentityStore,
 ): ExperimentUserProvider {
@@ -66,3 +66,7 @@ private fun IdentityStore.getIdentityOrWait(ms: Long): Identity {
     removeIdentityListener(callback)
     return result
 }
+
+private fun Identity.isUnidentified(): Boolean {
+    return deviceId.isNullOrBlank() && userId.isNullOrBlank()
+}

sdk/src/main/java/com/amplitude/experiment/DefaultExperimentClient.kt

@@ -281,7 +281,7 @@ internal class DefaultExperimentClient internal constructor(
     @Throws(IllegalStateException::class)
     private fun getUserMergedWithProviderOrWait(ms: Long): ExperimentUser {
         val safeUserProvider = userProvider
-        val providedUser = if (safeUserProvider is CoreUserProvider) {
+        val providedUser = if (safeUserProvider is ConnectorUserProvider) {
             try {
                 safeUserProvider.getUserOrWait(ms)
             } catch (e: TimeoutException) {

sdk/src/main/java/com/amplitude/experiment/Experiment.kt

@@ -1,7 +1,7 @@
 package com.amplitude.experiment
 
 import android.app.Application
-import com.amplitude.core.AmplitudeCore
+import com.amplitude.analytics.connector.AnalyticsConnector
 import com.amplitude.experiment.storage.SharedPrefsStorage
 import com.amplitude.experiment.util.AndroidLogger
 import com.amplitude.experiment.util.Logger
@@ -82,16 +82,16 @@ object Experiment {
     ): ExperimentClient = synchronized(instances) {
         val instanceName = config.instanceName
         val instanceKey = "$instanceName.$apiKey"
-        val core = AmplitudeCore.getInstance(instanceName)
+        val connector = AnalyticsConnector.getInstance(instanceName)
         val instance = when (val instance = instances[instanceKey]) {
             null -> {
                 Logger.implementation = AndroidLogger(config.debug)
                 val configBuilder = config.copyToBuilder()
                 if (config.userProvider == null) {
-                    configBuilder.userProvider(CoreUserProvider(application, core.identityStore))
+                    configBuilder.userProvider(ConnectorUserProvider(application, connector.identityStore))
                 }
                 if (config.analyticsProvider == null) {
-                    configBuilder.analyticsProvider(CoreAnalyticsProvider(core.analyticsConnector))
+                    configBuilder.analyticsProvider(ConnectorAnalyticsProvider(connector.eventBridge))
                 }
                 val newInstance = DefaultExperimentClient(
                     apiKey,
@@ -102,7 +102,7 @@ object Experiment {
                 )
                 instances[instanceKey] = newInstance
                 if (config.automaticFetchOnAmplitudeIdentityChange) {
-                    core.identityStore.addIdentityListener {
+                    connector.identityStore.addIdentityListener {
                         newInstance.fetch()
                     }
                 }