Merge pull request #22 from aminekarimii/dev-update-segment-impl

Update segment implementation
aminekarimii · Apr 17, 2023 · ea98234 · ea98234
2 parents 6898b25 + d54afc6
commit ea98234
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 42 deletions.
diff --git a/addon/analytiks-segment/build.gradle b/addon/analytiks-segment/build.gradle
@@ -33,6 +33,6 @@ android {
 
 dependencies {
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'com.segment.analytics.android:analytics:4.11.0'
+    implementation 'com.segment.analytics.kotlin:android:1.10.3'
     implementation project(':analytiks-core')
 }
diff --git a/addon/analytiks-segment/src/main/java/com/analytiks/segment/PropertiesHelper.kt b/addon/analytiks-segment/src/main/java/com/analytiks/segment/PropertiesHelper.kt
diff --git a/addon/analytiks-segment/src/main/java/com/analytiks/segment/SegmentAnalyticsClient.kt b/addon/analytiks-segment/src/main/java/com/analytiks/segment/SegmentAnalyticsClient.kt
@@ -1,42 +1,39 @@
 package com.analytiks.segment
 
 import android.content.Context
+import com.analytiks.core.AnalyticsDataTransmitterExtension
 import com.analytiks.core.CoreAddon
 import com.analytiks.core.EventsExtension
 import com.analytiks.core.UserProfileExtension
 import com.analytiks.core.model.Param
 import com.analytiks.core.model.UserProperty
-import com.analytiks.segment.PropertiesHelper.formatParamsToProperties
-import com.segment.analytics.Analytics
-import com.segment.analytics.Traits
-import java.util.concurrent.TimeUnit
+import com.segment.analytics.kotlin.android.Analytics
+import com.segment.analytics.kotlin.core.Analytics
+import kotlinx.serialization.json.buildJsonObject
+import kotlinx.serialization.json.put
 
 class SegmentAnalyticsClient(
     private val token: String,
-    private val recordScreen: Boolean = true,
     private val collectDeviceId: Boolean = true,
-    private val flushIntervalInSeconds: Long? = null,
+    private val trackApplicationLifecycleEvents: Boolean = false,
+    private val useLifecycleObserver: Boolean = false,
+    private val flushIntervalInSeconds: Int? = null,
+    private val flushAt: Int? = null,
     private val tag: String? = null
-) : CoreAddon, EventsExtension, UserProfileExtension {
+) : CoreAddon, EventsExtension, UserProfileExtension, AnalyticsDataTransmitterExtension {
     lateinit var segmentAnalytics: Analytics
 
     override fun initialize(context: Context) {
-        segmentAnalytics = Analytics.Builder(context, token).apply {
-            trackApplicationLifecycleEvents()
+        segmentAnalytics = Analytics(this.token, context) {
+            this.trackApplicationLifecycleEvents =
+                this@SegmentAnalyticsClient.trackApplicationLifecycleEvents
 
-            if (flushIntervalInSeconds != null) this.flushInterval(
-                flushIntervalInSeconds,
-                TimeUnit.SECONDS
-            )
+            this.useLifecycleObserver = this@SegmentAnalyticsClient.useLifecycleObserver
+            this.collectDeviceId = this@SegmentAnalyticsClient.collectDeviceId
 
-            if (recordScreen) this.recordScreenViews()
-            if (collectDeviceId) this.collectDeviceId(true)
-            tag?.let { this.tag(it) }
-        }.build().also {
-            Analytics.setSingletonInstance(it)
+            this@SegmentAnalyticsClient.flushIntervalInSeconds?.let { this.flushInterval = it }
+            this@SegmentAnalyticsClient.flushAt?.let { this.flushAt = it }
         }
-
-        segmentAnalytics = Analytics.with(context)
     }
 
     override fun reset() {
@@ -48,21 +45,28 @@ class SegmentAnalyticsClient(
     }
 
     override fun logEvent(name: String, vararg properties: Param) {
-        val formattedParams = formatParamsToProperties(*properties)
-        segmentAnalytics.track(name, formattedParams)
+        segmentAnalytics.track(name, buildJsonObject {
+            properties.forEach {
+                put(it.propertyName, it.propertyValue)
+            }
+        })
     }
 
     override fun identify(userId: String) {
         segmentAnalytics.identify(userId)
     }
 
     override fun setUserProperty(property: UserProperty) {
-        segmentAnalytics.identify(
-            Traits().apply {
-                putValue(property.propertyName, property.propertyValue)
-            }
-        )
+        if (segmentAnalytics.userId() == null) return
+
+        segmentAnalytics.identify(userId = segmentAnalytics.userId()!!, buildJsonObject {
+            put(property.propertyName, property.propertyValue.toString())
+        })
     }
 
     override fun setUserPropertyOnce(property: UserProperty) = Unit
+
+    override fun pushAll() {
+        segmentAnalytics.flush()
+    }
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,6 +47,7 @@ dependencies {
     implementation project(':analytiks')
     implementation project(path: ':analytiks-core')
     implementation project(path: ':addon:analytiks-mixpanel')
+    implementation project(path: ':addon:analytiks-segment')
     implementation project(path: ':addon:analytiks-timber')
 
     testImplementation 'junit:junit:4.13.2'

diff --git a/app/src/main/java/com/logitanalyticsapp/MainActivity.kt b/app/src/main/java/com/logitanalyticsapp/MainActivity.kt
@@ -7,6 +7,7 @@ import com.analytiks.addon.mixpanel.MixpanelAnalyticsClient
 import com.analytiks.addon.timber.TimberLocalClient
 import com.analytiks.core.CoreAddon
 import com.analytiks.core.model.Param
+import com.analytiks.segment.SegmentAnalyticsClient
 import com.logitanalyticsapp.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
@@ -25,6 +26,11 @@ class MainActivity : AppCompatActivity() {
             TimberLocalClient(),
             MixpanelAnalyticsClient(
                 token = "YOUR_TOKEN"
+            ),
+            SegmentAnalyticsClient(
+                token = "YOUR_TOKEN",
+                flushIntervalInSeconds = 5,
+                trackApplicationLifecycleEvents = true,
             )
         )