Revert "update Rust for recorded context to handle event store queries"

This reverts commit b8f83af.

CHANGELOG.md

@@ -2,9 +2,6 @@
 
 ## ⚠️ Breaking Changes ⚠️
 
-### Nimbus SDK ⛅️🔬🔭
-- Added methods to `RecordedContext` for retrieving event queries and setting their values back to the foreign object ([#6322](https://github.com/mozilla/application-services/pull/6322)).
-
 ### Remote Settings
 - Updated Error hierarchy.  We don't need to update consumer code because the only consumer was
   Android and it only caught exceptions using the base RemoteSettingsException class.

components/nimbus/Cargo.toml

@@ -17,7 +17,7 @@ name = "nimbus"
 default=["stateful"]
 rkv-safe-mode = ["dep:rkv"]
 stateful-uniffi-bindings = []
-stateful = ["rkv-safe-mode", "stateful-uniffi-bindings", "dep:remote_settings", "dep:regex"]
+stateful = ["rkv-safe-mode", "stateful-uniffi-bindings", "dep:remote_settings"]
 
 [dependencies]
 anyhow = "1"
@@ -39,7 +39,6 @@ unicode-segmentation = "1.8.0"
 error-support = { path = "../support/error" }
 remote_settings = { path = "../remote_settings", optional = true }
 cfg-if = "1.0.0"
-regex = { version = "1.10.5", optional = true }
 
 [build-dependencies]
 uniffi = { workspace = true, features = ["build"] }
@@ -50,4 +49,3 @@ viaduct-reqwest = { path = "../support/viaduct-reqwest" }
 env_logger = "0.10"
 clap = "2.34"
 tempfile = "3"
-ctor = "0.2.2"

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

@@ -24,7 +24,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
-import org.junit.Assert.assertThrows
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Ignore
@@ -38,9 +37,7 @@ import org.mozilla.experiments.nimbus.GleanMetrics.NimbusHealth
 import org.mozilla.experiments.nimbus.internal.EnrollmentChangeEvent
 import org.mozilla.experiments.nimbus.internal.EnrollmentChangeEventType
 import org.mozilla.experiments.nimbus.internal.JsonObject
-import org.mozilla.experiments.nimbus.internal.NimbusException
 import org.mozilla.experiments.nimbus.internal.RecordedContext
-import org.mozilla.experiments.nimbus.internal.validateEventQueries
 import org.robolectric.RobolectricTestRunner
 import java.util.Calendar
 import java.util.concurrent.Executors
@@ -74,7 +71,6 @@ class NimbusTests {
     private fun createNimbus(
         coenrollingFeatureIds: List<String> = listOf(),
         recordedContext: RecordedContext? = null,
-        block: Nimbus.() -> Unit = {},
     ) = Nimbus(
         context = context,
         appInfo = appInfo,
@@ -84,7 +80,7 @@ class NimbusTests {
         observer = null,
         delegate = nimbusDelegate,
         recordedContext = recordedContext,
-    ).also(block)
+    )
 
     @get:Rule
     val gleanRule = GleanTestRule(context)
@@ -738,59 +734,23 @@ class NimbusTests {
         assertEquals("Event count must match", isReadyEvents.count(), 3)
     }
 
-    class TestRecordedContext(
-        private val eventQueries: Map<String, String>? = null,
-        private var eventQueryValues: Map<String, Double>? = null,
-    ) : RecordedContext {
-        var recorded = mutableListOf<JSONObject>()
-
-        override fun getEventQueries(): Map<String, String> {
-            return eventQueries?.toMap() ?: mapOf()
-        }
-
-        override fun setEventQueryValues(eventQueryValues: Map<String, Double>) {
-            this.eventQueryValues = eventQueryValues
-        }
-
-        override fun record() {
-            recorded.add(this.toJson())
-        }
-
-        override fun toJson(): JsonObject {
-            val contextToRecord = JSONObject()
-            contextToRecord.put("enabled", true)
-            contextToRecord.put("events", JSONObject(eventQueryValues ?: mapOf<String, Double>()))
-            return contextToRecord
-        }
-    }
-
     @Test
     fun `Nimbus records context if it's passed in`() {
-        val context = TestRecordedContext()
-        val nimbus = createNimbus(recordedContext = context)
-
-        suspend fun getString(): String {
-            return testExperimentsJsonString(appInfo, packageName)
-        }
-
-        val job = nimbus.applyLocalExperiments(::getString)
-        runBlocking {
-            job.join()
-        }
+        class TestRecordedContext : RecordedContext {
+            var recordCount = 0
 
-        assertEquals(context.recorded.size, 1)
-    }
+            override fun record() {
+                recordCount++
+            }
 
-    @Test
-    fun `Nimbus recorded context event queries are run and the value is written back into the object`() {
-        val context = TestRecordedContext(
-            mapOf(
-                "TEST_QUERY" to "'event'|eventSum('Days', 1, 0)",
-            ),
-        )
-        val nimbus = createNimbus(recordedContext = context) {
-            recordEvent("event")
+            override fun toJson(): JsonObject {
+                val contextToRecord = JSONObject()
+                contextToRecord.put("enabled", true)
+                return contextToRecord
+            }
         }
+        val context = TestRecordedContext()
+        val nimbus = createNimbus(recordedContext = context)
 
         suspend fun getString(): String {
             return testExperimentsJsonString(appInfo, packageName)
@@ -801,19 +761,7 @@ class NimbusTests {
             job.join()
         }
 
-        assertEquals(context.recorded.size, 1)
-        assertEquals(context.recorded[0].getJSONObject("events").getDouble("TEST_QUERY"), 1.0, 0.0)
-    }
-
-    @Test
-    fun `Nimbus recorded context event queries are validated`() {
-        val context = TestRecordedContext(
-            mapOf(
-                "FAILING_QUERY" to "'event'|eventSumThisWillFail('Days', 1, 0)",
-            ),
-        )
-
-        assertThrows("Expected an error to be thrown", NimbusException::class.java, { validateEventQueries(context) })
+        assertEquals(context.recordCount, 1)
     }
 }
 

components/nimbus/src/error.rs

@@ -68,9 +68,6 @@ pub enum NimbusError {
     CirrusError(#[from] CirrusClientError),
     #[error("UniFFI callback error: {0}")]
     UniFFICallbackError(#[from] uniffi::UnexpectedUniFFICallbackError),
-    #[cfg(feature = "stateful")]
-    #[error("Regex error: {0}")]
-    RegexError(#[from] regex::Error),
 }
 
 #[cfg(feature = "stateful")]
@@ -84,14 +81,6 @@ pub enum BehaviorError {
     IntervalParseError(String),
     #[error("The event store is not available on the targeting attributes")]
     MissingEventStore,
-    #[error("The recorded context is not available on the nimbus client")]
-    MissingRecordedContext,
-    #[error("EventQueryTypeParseError: {0} is not a valid EventQueryType")]
-    EventQueryTypeParseError(String),
-    #[error(r#"EventQueryParseError: "{0}" is not a valid EventQuery"#)]
-    EventQueryParseError(String),
-    #[error(r#"TypeError: "{0}" is not of type {1}"#)]
-    TypeError(String, String),
 }
 
 #[cfg(not(feature = "stateful"))]

components/nimbus/src/nimbus.udl

@@ -4,15 +4,7 @@ typedef extern RemoteSettingsConfig;
 [ExternalExport="remote_settings"]
 typedef extern RemoteSettingsServer;
 
-namespace nimbus {
-
-    /// A test utility used to validate event queries against the jexl evaluator.
-    ///
-    /// This method should only be used in tests.
-    [Throws=NimbusError]
-    void validate_event_queries(RecordedContext recorded_context);
-};
-
+namespace nimbus {};
 dictionary AppContext {
     string app_name;
     string app_id;
@@ -112,7 +104,6 @@ enum NimbusError {
     "InvalidPath", "InternalError", "NoSuchExperiment", "NoSuchBranch",
     "DatabaseNotReady", "VersionParsingError", "BehaviorError", "TryFromIntError",
     "ParseIntError", "TransformParameterError", "ClientError", "UniFFICallbackError",
-    "RegexError",
 };
 
 [Custom]
@@ -122,10 +113,6 @@ typedef string JsonObject;
 interface RecordedContext {
     JsonObject to_json();
 
-    record<string, string> get_event_queries();
-
-    void set_event_query_values(record<string, f64> event_query_values);
-
     void record();
 };
 
@@ -296,7 +283,6 @@ interface NimbusClient {
 
     [Throws=NimbusError]
     void dump_state_to_log();
-
 };
 
 interface NimbusTargetingHelper {

components/nimbus/src/stateful/behavior.rs

@@ -62,7 +62,6 @@ impl PartialEq for Interval {
         self.to_string() == other.to_string()
     }
 }
-
 impl Eq for Interval {}
 
 impl Hash for Interval {
@@ -85,7 +84,7 @@ impl FromStr for Interval {
             _ => {
                 return Err(NimbusError::BehaviorError(
                     BehaviorError::IntervalParseError(input.to_string()),
-                ));
+                ))
             }
         })
     }
@@ -366,7 +365,7 @@ impl EventQueryType {
                 return Err(NimbusError::TransformParameterError(format!(
                     "event transform {} requires a positive number as the second parameter",
                     self
-                )));
+                )))
             }
         } as usize;
         let zero = &Value::from(0);
@@ -376,7 +375,7 @@ impl EventQueryType {
                 return Err(NimbusError::TransformParameterError(format!(
                     "event transform {} requires a positive number as the third parameter",
                     self
-                )));
+                )))
             }
         } as usize;
 
@@ -403,7 +402,7 @@ impl EventQueryType {
                 return Err(NimbusError::TransformParameterError(format!(
                     "event transform {} requires a positive number as the second parameter",
                     self
-                )));
+                )))
             }
         } as usize;
 
@@ -428,13 +427,6 @@ impl EventQueryType {
         })
     }
 
-    pub fn validate_query(maybe_query: &str) -> Result<bool> {
-        let regex = regex::Regex::new(
-            r#"^(?:"[^"']+"|'[^"']+')\|event(?:Sum|LastSeen|CountNonZero|Average|AveragePerNonZeroInterval)\(["'](?:Years|Months|Weeks|Days|Hours|Minutes)["'],\s*\d+\s*(?:,\s*\d+\s*)?\)$"#,
-        )?;
-        Ok(regex.is_match(maybe_query))
-    }
-
     fn error_value(&self) -> f64 {
         match self {
             Self::LastSeen => f64::MAX,