Bug 1983107 - Update to jexl-eval 0.4.0 (#6893)

Nimbus now exposes a test only `recordEventSync` method to use in tests
becuase `recordEvent` dispatches the event recording to a background
thread. Because the new JEXL parser is so fast, our EventStoreTests are
now intermittently failing as the event recording hasn't finished by the
time we actually evaluate the JEXL expressions. Using `recordEventSync`
bypasses this issue entirely.

Author: freshstrangemusic

Cargo.lock

@@ -27,7 +27,7 @@ serde_json = "1"
 thiserror = "1"
 url = "2.5"
 rkv = { version = "0.19", optional = true }
-jexl-eval = "0.3.0"
+jexl-eval = "0.4.0"
 uuid = { version = "1.3", features = ["serde", "v4"]}
 sha2 = "^0.10"
 hex = "0.4"

components/nimbus/Cargo.toml

@@ -22,6 +22,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import mozilla.appservices.remotesettings.RemoteSettingsConfig
 import mozilla.appservices.remotesettings.RemoteSettingsServer
@@ -461,6 +462,9 @@ open class Nimbus(
         }
     }
 
+    override fun recordEventSync(count: Long, eventId: String) =
+        nimbusClient.recordEvent(eventId, count)
+
     override fun recordPastEvent(count: Long, eventId: String, secondsAgo: Long) =
         nimbusClient.recordPastEvent(eventId, secondsAgo, count)
 

components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/Nimbus.kt

@@ -249,6 +249,13 @@ interface NimbusEventStore {
     fun recordEvent(eventId: String) =
         recordEvent(1, eventId)
 
+    /**
+     * Record an event synchronously on the main thread.
+     *
+     * For testing only.
+     */
+    fun recordEventSync(count: Long = 1, eventId: String) = Unit
+
     /**
      * Records an event as if it were emitted in the past.
      *

components/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/NimbusInterface.kt

@@ -6,6 +6,7 @@ package org.mozilla.experiments.nimbus
 
 import android.content.Context
 import androidx.test.core.app.ApplicationProvider
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertTrue
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -44,7 +45,7 @@ class EventStoreTest {
     @Test
     fun `advancing time into the future`() {
         val helper = createHelper()
-        events.recordEvent(eventId)
+        events.recordEventSync(1, eventId)
 
         assertTrue(helper.evalJexl("'$eventId'|eventLastSeen('Days') == 0"))
 

components/nimbus/android/src/test/java/org/mozilla/experiments/nimbus/EventStoreTest.kt

@@ -26,7 +26,7 @@ viaduct = { path = "../viaduct" }
 url = "2"
 camino = "1.0"
 rusqlite = { version = "0.37.0", features = ["bundled"] }
-jexl-eval = { version = "0.3.0" }
+jexl-eval = { version = "0.4.0" }
 regex = "1.9"
 anyhow = "1.0"
 firefox-versioning = { path = "../support/firefox-versioning" }