Address comments in PR

Author: mdboom

components/service/glean/metrics.yaml

@@ -5,6 +5,9 @@
 $schema: moz://mozilla.org/schemas/glean/metrics/1-0-0
 
 baseline:
+  ## TODO: Some metrics are commented out below until we implement them as part
+  ## of 1497894 and its dependent bugs
+
   # sessions:
   #   type: counter 
   #   description: |
@@ -33,35 +36,35 @@ baseline:
     notification_emails:
       - [email protected]
 
-  os_version:
-    type: string
-    lifetime: application
-    description: |
-      The version of the operating system.
-    bugs:
-      - 1497894
-    notification_emails:
-      - [email protected]
+  # os_version:
+  #   type: string
+  #   lifetime: application
+  #   description: |
+  #     The version of the operating system.
+  #   bugs:
+  #     - 1497894
+  #   notification_emails:
+  #     - [email protected]
 
-  device:
-    type: string
-    lifetime: application
-    description: |
-      The manufacturer and model of the device.
-    bugs:
-      - 1497894
-    notification_emails:
-      - [email protected]
+  # device:
+  #   type: string
+  #   lifetime: application
+  #   description: |
+  #     The manufacturer and model of the device.
+  #   bugs:
+  #     - 1497894
+  #   notification_emails:
+  #     - [email protected]
 
-  architecture:
-    type: string
-    lifetime: application
-    description: |
-      The architecture of the device, (e.g. "arm", "x86").
-    bugs:
-      - 1497894
-    notification_emails:
-      - [email protected]
+  # architecture:
+  #   type: string
+  #   lifetime: application
+  #   description: |
+  #     The architecture of the device, (e.g. "arm", "x86").
+  #   bugs:
+  #     - 1497894
+  #   notification_emails:
+  #     - [email protected]
 
   # timezone:
   #   type: number

components/service/glean/scripts/sdk_generator.gradle

@@ -125,6 +125,6 @@ ext.gleanGenerateMetricsAPI = {
 
 if (android.hasProperty('applicationVariants')) {
     android.applicationVariants.all(ext.gleanGenerateMetricsAPI('GleanMetrics'))
-} else {
+} else if (project.name == 'service-glean') {
     android.libraryVariants.all(ext.gleanGenerateMetricsAPI('mozilla.components.service.glean.metrics'))
 }

components/service/glean/src/main/java/mozilla/components/service/glean/Glean.kt

@@ -82,8 +82,6 @@ object Glean {
 
         initializeCoreMetrics(applicationContext)
 
-        Baseline.os.set("Android")
-
         ProcessLifecycleOwner.get().lifecycle.addObserver(gleanLifecycleObserver)
     }
 
@@ -184,6 +182,9 @@ object Glean {
         if (firstRunDetector.isFirstRun()) {
             GleanInternalMetrics.clientId.generateAndSet()
         }
+
+        // Set the OS type
+        Baseline.os.set("Android")
     }
 
     /**