From 8b7279ebe48fc225326aeecaeac8a66804d84650 Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <janerik@fnordig.de>
Date: Thu, 4 Mar 2021 17:22:56 +0100
Subject: [PATCH] Pass auto-generated build info (version code and name) to
 Glean (#18230)

This also re-generated the Glean docs due to an update of the bundled
glean-parser.
---
 .../java/org/mozilla/fenix/glean/BaselinePingTest.kt      | 8 +++++---
 app/src/main/java/org/mozilla/fenix/FenixApplication.kt   | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
index c3a26ae214..fe941a86ed 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/glean/BaselinePingTest.kt
@@ -27,6 +27,7 @@ import org.junit.BeforeClass
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mozilla.fenix.GleanMetrics.GleanBuildInfo
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.HomeActivityTestRule
@@ -85,9 +86,10 @@ class BaselinePingTest {
             // we need to do this on the main thread, as the Glean SDK requires it.
             GlobalScope.launch(Dispatchers.Main.immediate) {
                 Glean.initialize(
-                    ApplicationProvider.getApplicationContext(),
-                    true,
-                    Configuration(httpClient = httpClient)
+                    applicationContext = ApplicationProvider.getApplicationContext(),
+                    uploadEnabled = true,
+                    configuration = Configuration(httpClient = httpClient),
+                    buildInfo = GleanBuildInfo.buildInfo
                 )
             }
         }
diff --git a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
index d3ddf601b3..2b18c803d9 100644
--- a/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
+++ b/app/src/main/java/org/mozilla/fenix/FenixApplication.kt
@@ -39,6 +39,7 @@ import mozilla.components.support.rusthttp.RustHttpConfig
 import mozilla.components.support.rustlog.RustLog
 import mozilla.components.support.utils.logElapsedTime
 import mozilla.components.support.webextensions.WebExtensionSupport
+import org.mozilla.fenix.GleanMetrics.GleanBuildInfo
 import org.mozilla.fenix.GleanMetrics.PerfStartup
 import org.mozilla.fenix.components.Components
 import org.mozilla.fenix.components.metrics.MetricServiceType
@@ -111,7 +112,8 @@ open class FenixApplication : LocaleAwareApplication(), Provider {
                 httpClient = ConceptFetchHttpUploader(
                     lazy(LazyThreadSafetyMode.NONE) { components.core.client }
                 )),
-            uploadEnabled = telemetryEnabled
+            uploadEnabled = telemetryEnabled,
+            buildInfo = GleanBuildInfo.buildInfo
         )
     }