Support EU API URL and bump Mixpanel to 7.3.3 from 7.3.0 (#7)

* Support EU api URL. * Bumb mixpanel to latest fix version 7.3.3
segment-integrations · Feb 27, 2024 · 6be1491 · 6be1491
1 parent 600b97b
commit 6be1491
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -56,7 +56,7 @@ dependencies {
 
 // Partner Dependencies
 dependencies {
-    implementation("com.mixpanel.android:mixpanel-android:7.3.0")
+    implementation("com.mixpanel.android:mixpanel-android:7.3.3")
 }
 
 // Test Dependencies

diff --git a/lib/src/main/java/com/segment/analytics/kotlin/destinations/mixpanel/MixpanelDestination.kt b/lib/src/main/java/com/segment/analytics/kotlin/destinations/mixpanel/MixpanelDestination.kt
@@ -51,6 +51,7 @@ SOFTWARE.
 @Serializable
 data class MixpanelSettings(
     var token: String,
+    var enableEuropeanUnionEndpoint: Boolean = false,
     @SerialName("people")
     var isPeopleEnabled: Boolean = false,
     var setAllTraitsByDefault: Boolean = true,
@@ -71,7 +72,7 @@ class MixpanelDestination(
     private val context: Context
 ) : DestinationPlugin(), AndroidLifecycle, VersionedPlugin {
 
-    internal var settings: MixpanelSettings? = null
+    internal var mixpanelSettings: MixpanelSettings? = null
     internal var mixpanel: MixpanelAPI? = null
 
     override val key: String = "Mixpanel"
@@ -80,13 +81,18 @@ class MixpanelDestination(
         super.update(settings, type)
         if (settings.hasIntegrationSettings(this)) {
             analytics.log("Mixpanel Destination is enabled")
-            this.settings = settings.destinationSettings(key)
+            this.mixpanelSettings = settings.destinationSettings(key)
             if (type == Plugin.UpdateType.Initial) {
                 mixpanel = MixpanelAPI.getInstance(
                     context,
-                    this.settings?.token,
-                    this.settings?.trackAutomaticEvents ?: false
+                    this.mixpanelSettings?.token,
+                    this.mixpanelSettings?.trackAutomaticEvents ?: false
                 )
+
+                if (mixpanelSettings?.enableEuropeanUnionEndpoint == true) {
+                    mixpanel?.setServerURL("https://api-eu.mixpanel.com")
+                }
+
                 analytics.log("Mixpanel Destination loaded")
             }
         } else {
@@ -95,7 +101,7 @@ class MixpanelDestination(
     }
 
     override fun track(payload: TrackEvent): BaseEvent {
-        val settings = settings ?: return payload
+        val settings = mixpanelSettings ?: return payload
         // Example of transforming event property keys
         val eventName = payload.event
         val properties = payload.properties
@@ -113,7 +119,7 @@ class MixpanelDestination(
     }
 
     override fun identify(payload: IdentifyEvent): BaseEvent {
-        val settings = settings ?: return payload
+        val settings = mixpanelSettings ?: return payload
         val userId: String = payload.userId
         val traits: JsonObject = payload.traits
 
@@ -193,7 +199,7 @@ class MixpanelDestination(
     }
 
     override fun screen(payload: ScreenEvent): BaseEvent {
-        val settings = settings ?: return payload
+        val settings = mixpanelSettings ?: return payload
         val screenName = payload.name
         val properties = payload.properties
         val screenCategory = payload.category
@@ -218,15 +224,15 @@ class MixpanelDestination(
     }
 
     override fun onActivityCreated(activity: Activity?, savedInstanceState: Bundle?) {
-        val settings = settings ?: return
+        val settings = mixpanelSettings ?: return
         // This is needed to trigger a call to #checkIntentForInboundAppLink.
         // From Mixpanel's source, this won't trigger a creation of another instance. It caches
         // instances by the application context and token, both of which remain the same.
         MixpanelAPI.getInstance(
             activity,
             settings.token,
             false,
-            this.settings?.trackAutomaticEvents ?: false
+            this.mixpanelSettings?.trackAutomaticEvents ?: false
         )
     }
 
@@ -250,7 +256,7 @@ class MixpanelDestination(
 
         val revenue = properties.getDouble("revenue")
 
-        with(settings!!) {
+        with(mixpanelSettings!!) {
             if (isPeopleEnabled && revenue != null && revenue != 0.0) {
                 mixpanel?.people?.trackCharge(revenue, props)
                 analytics.log("mixpanel.people.trackCharge($name, $props)")

diff --git a/.../test/java/com/segment/analytics/kotlin/destinations/mixpanel/MixpanelDestinationTests.kt b/.../test/java/com/segment/analytics/kotlin/destinations/mixpanel/MixpanelDestinationTests.kt
@@ -80,8 +80,8 @@ class MixpanelDestinationTests {
         mixpanelDestination.update(settingsBlob, Plugin.UpdateType.Initial)
 
         /* assertions about config */
-        Assertions.assertNotNull(mixpanelDestination.settings)
-        with(mixpanelDestination.settings!!) {
+        Assertions.assertNotNull(mixpanelDestination.mixpanelSettings)
+        with(mixpanelDestination.mixpanelSettings!!) {
             Assertions.assertFalse(consolidatedPageCalls)
             Assertions.assertTrue(isPeopleEnabled)
             Assertions.assertFalse(trackAllPages)
@@ -854,7 +854,7 @@ class MixpanelDestinationTests {
 
     private fun MixpanelDestination.setupTest(mixpanelSettings: MixpanelSettings) {
         this.mixpanel = mockMixpanel
-        this.settings = mixpanelSettings
+        this.mixpanelSettings = mixpanelSettings
     }
 
     data class JsonObjectMatcher(