[components] 1510308: Move experiments inside of ping_info

UltraBlame original commit: 92fb5b2703d44d1820c67710e2844fbb89aaeb12
marco-c · May 1, 2024 · 7268e07 · 7268e07
1 parent 3fcb54f
commit 7268e07
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/mobile/android/android-components/components/service/glean/build.gradle b/mobile/android/android-components/components/service/glean/build.gradle
@@ -139,7 +139,7 @@ String
 GLEAN_PING_SCHEMA_GIT_HASH
 =
 "
-46cfccf
+6041aa6
 "
 String
 GLEAN_PING_SCHEMA_URL

diff --git a/...components/service/glean/src/main/java/mozilla/components/service/glean/ping/PingMaker.kt b/...components/service/glean/src/main/java/mozilla/components/service/glean/ping/PingMaker.kt
@@ -101,6 +101,18 @@ mozilla
 .
 components
 .
+service
+.
+glean
+.
+storages
+.
+ExperimentsStorageEngine
+import
+mozilla
+.
+components
+.
 support
 .
 base
@@ -354,6 +366,22 @@ BuildConfig
 .
 LIBRARY_VERSION
 )
+pingInfo
+.
+put
+(
+"
+experiments
+"
+ExperimentsStorageEngine
+.
+getSnapshotAsJSON
+(
+"
+"
+false
+)
+)
 /
 /
 TODO

diff --git a/...ice/glean/src/main/java/mozilla/components/service/glean/storages/StorageEngineManager.kt b/...ice/glean/src/main/java/mozilla/components/service/glean/storages/StorageEngineManager.kt
@@ -138,11 +138,6 @@ events
 to
 EventsStorageEngine
 "
-experiments
-"
-to
-ExperimentsStorageEngine
-"
 string
 "
 to

diff --git a/...ents/components/service/glean/src/test/java/mozilla/components/service/glean/GleanTest.kt b/...ents/components/service/glean/src/test/java/mozilla/components/service/glean/GleanTest.kt
@@ -943,20 +943,27 @@ metricsJson
 opt
 (
 "
-experiments
+ping_info
 "
 )
 )
 assertNotNull
 (
 metricsJson
 .
-opt
+getJSONObject
 (
 "
 ping_info
 "
 )
+.
+opt
+(
+"
+experiments
+"
+)
 )
 assert
 (