remove e10s_cohort

docs/crash_aggregate_schema.md

@@ -19,7 +19,6 @@ The `crash_aggregates` table has 4 commonly-used columns:
     * `dimensions['experiment_id']` is the identifier of the experiment being participated in, such as `e10s-beta46-noapz@experiments.mozilla.org`, or null if no experiment.
     * `dimensions['experiment_branch']` is the branch of the experiment being participated in, such as `control` or `experiment`, or null if no experiment.
     * `dimensions['e10s_enabled']` is whether E10S is enabled.
-    * `dimensions['e10s_cohort']` is the E10S cohort the user is part of, such as `control`, `test`, or `disqualified`.
     * `dimensions['gfx_compositor']` is the graphics backend compositor used by the program, such as `d3d11`, `opengl` and `simple`. Null values may be reported as `none` as well.
     * All of the above fields can potentially be blank, which means "not present". That means that in the actual pings, the corresponding fields were null.
 * `stats` contains the aggregate values that we care about:

docs/crash_summary_schema.md

@@ -13,7 +13,6 @@ root
  |-- experiment_id: string (nullable = true)
  |-- experiment_branch: string (nullable = true)
  |-- e10s_enabled: boolean (nullable = true)
- |-- e10s_cohort: string (nullable = true)
  |-- gfx_compositor: string (nullable = true)
  |-- payload: struct (nullable = true)
  |    |-- crashDate: string (nullable = true)

docs/main_summary_schema.md

@@ -40,7 +40,6 @@ root
  |-- env_build_version: string (nullable = true)
  |-- env_build_arch: string (nullable = true)
  |-- e10s_enabled: boolean (nullable = true)
- |-- e10s_cohort: string (nullable = true)
  |-- locale: string (nullable = true)
  |-- attribution: struct (nullable = true)
  |    |-- source: string (nullable = true)

src/main/scala/com/mozilla/telemetry/views/CrashAggregateView.scala

@@ -102,7 +102,6 @@ object CrashAggregateView {
     List("environment.addons", "activeExperiment", "id"),
     List("environment.addons", "activeExperiment", "branch"),
     List("environment.settings", "e10sEnabled"),
-    List("environment.settings", "e10sCohort"),
     List("environment.system", "gfx", "features", "compositor")
   )
 
@@ -119,7 +118,6 @@ object CrashAggregateView {
     "experiment_id",
     "experiment_branch",
     "e10s_enabled",
-    "e10s_cohort",
     "gfx_compositor"
   )
 

src/main/scala/com/mozilla/telemetry/views/CrashSummaryView.scala

@@ -48,7 +48,6 @@ case class Settings(
     blocklistEnabled: Option[Boolean],
     isDefaultBrowser: Option[Boolean],
     e10sEnabled: Option[Boolean],
-    e10sCohort: Option[String],
     locale: String,
     telemetryEnabled: Boolean)
 
@@ -118,7 +117,6 @@ case class CrashSummary (
     experiment_id: Option[String],
     experiment_branch: Option[String],
     e10s_enabled: Option[Boolean],
-    e10s_cohort: Option[String],
     gfx_compositor: Option[String],
     profile_created: Option[Int],
     payload: Payload) {
@@ -142,7 +140,6 @@ case class CrashSummary (
         x <- ping.meta.`environment.addons`.activeExperiment
       } yield x.branch,
       e10s_enabled = ping.meta.`environment.settings`.e10sEnabled,
-      e10s_cohort = ping.meta.`environment.settings`.e10sCohort,
       gfx_compositor = for {
         x <- ping.meta.`environment.system`.gfx
         y <-  x.features

src/main/scala/com/mozilla/telemetry/views/Longitudinal.scala

@@ -284,7 +284,6 @@ object LongitudinalView {
           .endRecord()
         .name("search_cohort").`type`().optional().stringType()
         .name("e10s_enabled").`type`().optional().booleanType()
-        .name("e10s_cohort").`type`().optional().stringType()
         .name("telemetry_enabled").`type`().optional().booleanType()
         .name("locale").`type`().optional().stringType()
         .name("update").`type`().optional()

src/main/scala/com/mozilla/telemetry/views/MainEventsView.scala

@@ -91,7 +91,7 @@ object MainEventsView {
     val eventsSchema = Events.buildEventSchema
     val partialDataFrame = mainSummaryData
       .select("document_id", "client_id", "normalized_channel", "country", "locale", "app_name", "app_version", "os",
-        "os_version", "e10s_enabled", "e10s_cohort", "subsession_start_date", "subsession_length", "sync_configured",
+        "os_version", "e10s_enabled", "subsession_start_date", "subsession_length", "sync_configured",
         "sync_count_desktop", "sync_count_mobile", "timestamp", "sample_id", "active_experiment_id",
         "active_experiment_branch", "experiments", "events")
       .where("client_id is not null")
@@ -106,7 +106,7 @@ object MainEventsView {
     val exploded = records.withColumn("events", explode(when(size(col("events")).gt(0), col("events"))))
 
     exploded.selectExpr("document_id", "client_id", "normalized_channel", "country", "locale", "app_name",
-      "app_version", "os", "os_version", "e10s_enabled", "e10s_cohort", "subsession_start_date", "subsession_length",
+      "app_version", "os", "os_version", "e10s_enabled", "subsession_start_date", "subsession_length",
       "sync_configured", "sync_count_desktop", "sync_count_mobile", "timestamp", "sample_id", "active_experiment_id",
       "active_experiment_branch", "experiments",
       // Flatten nested event fields.

src/main/scala/com/mozilla/telemetry/views/MainSummaryView.scala

@@ -595,10 +595,6 @@ object MainSummaryView {
           case JBool(x) => x
           case _ => null
         },
-        settings \ "e10sCohort" match {
-          case JString(x) => x
-          case _ => null
-        },
         settings \ "e10sMultiProcesses" match {
           case JInt(x) => x.toLong
           case _ => null
@@ -981,7 +977,6 @@ object MainSummaryView {
 
       // See bug 1251259
       StructField("e10s_enabled", BooleanType, nullable = true), // environment/settings/e10sEnabled
-      StructField("e10s_cohort", StringType, nullable = true), // environment/settings/e10sCohort
 
       // Bug 1406238
       StructField("e10s_multi_processes", LongType, nullable = true), // environment/settings/e10sMultiProcesses

src/test/resources/crash_ping_indented.json

@@ -3,7 +3,7 @@
    "clientId": "my-client-id",
    "creationTimestamp": 1.483495356792E18,
    "appName": "Fennec",
-   "environment.settings": "{\"locale\":\"pt-BR\",\"telemetryEnabled\":true,\"userPrefs\":{\"browser.cache.disk.capacity\":204800},\"update\":{\"enabled\":false,\"autoDownload\":true,\"channel\":\"beta\"},\"e10sEnabled\":true,\"e10sCohort\":\"test\",\"blocklistEnabled\":true}",
+   "environment.settings": "{\"locale\":\"pt-BR\",\"telemetryEnabled\":true,\"userPrefs\":{\"browser.cache.disk.capacity\":204800},\"update\":{\"enabled\":false,\"autoDownload\":true,\"channel\":\"beta\"},\"e10sEnabled\":true,\"blocklistEnabled\":true}",
    "geoCity": "Santo Ângelo",
    "appUpdateChannel": "beta",
    "appVersion": "40.0",

src/test/scala/com/mozilla/telemetry/views/CrashAggregateViewTest.scala

@@ -27,7 +27,6 @@ class CrashAggregateViewTest extends FlatSpec with Matchers with BeforeAndAfterA
     ("experiment_id",     List(null, "displayport-tuning-nightly@experiments.mozilla.org")),
     ("experiment_branch", List("control", "experiment")),
     ("e10s",              List(true, false)),
-    ("e10s_cohort",       List("control", "test")),
     ("gfx_compositor",    List("simple", "none", null))
   )
 
@@ -116,8 +115,7 @@ class CrashAggregateViewTest extends FlatSpec with Matchers with BeforeAndAfterA
           ("features" ->
             ("compositor" -> dimensions("gfx_compositor").asInstanceOf[String])))
       val settings =
-        ("e10sEnabled" -> dimensions("e10s").asInstanceOf[Boolean]) ~
-        ("e10sCohort" -> dimensions("e10s_cohort").asInstanceOf[String])
+        ("e10sEnabled" -> dimensions("e10s").asInstanceOf[Boolean])
       val build =
         ("version" -> dimensions("build_version").asInstanceOf[String]) ~
         ("buildId" -> dimensions("build_id").asInstanceOf[String]) ~
@@ -208,7 +206,6 @@ class CrashAggregateViewTest extends FlatSpec with Matchers with BeforeAndAfterA
       assert(dimensionValues("experiment_id")     contains dimensions.getOrElse("experiment_id", null))
       assert(dimensionValues("experiment_branch") contains dimensions.getOrElse("experiment_branch", null))
       assert(List("True", "False")                contains dimensions.getOrElse("e10s_enabled", null))
-      assert(dimensionValues("e10s_cohort")       contains dimensions.getOrElse("e10s_cohort", null))
       assert(dimensionValues("gfx_compositor")    contains dimensions.getOrElse("gfx_compositor", null))
     }
   }

src/test/scala/com/mozilla/telemetry/views/CrashSummaryViewTest.scala

@@ -66,7 +66,6 @@ class CrashSummaryViewTest extends FlatSpec with Matchers {
       assert(x.country == "BR")
       assert(x.experiment_id == Some("1"))
       assert(x.experiment_branch == Some("control"))
-      assert(x.e10s_cohort == Some("test"))
       assert(x.e10s_enabled == Some(true))
       assert(x.gfx_compositor == Some("opengl"))
       assert(x.payload.processType == Some("main"))
@@ -100,7 +99,6 @@ class CrashSummaryViewTest extends FlatSpec with Matchers {
       assert(x.country == "BR")
       assert(x.experiment_id == Some("1"))
       assert(x.experiment_branch == Some("control"))
-      assert(x.e10s_cohort == Some("test"))
       assert(x.e10s_enabled == Some(true))
       assert(x.gfx_compositor == Some("opengl"))
       assert(x.profile_created == Some(16446))

src/test/scala/com/mozilla/telemetry/views/GenericCountViewTest.scala

@@ -15,7 +15,6 @@ case class Submission(client_id: String,
                       country: String,
                       locale: String,
                       e10s_enabled: Boolean,
-                      e10s_cohort: String,
                       os: String,
                       os_version: String,
                       devtools_toolbox_opened_count: Int,
@@ -32,7 +31,6 @@ object Submission{
     "country" -> List("IT", "US"),
     "locale" -> List("en-US"),
     "e10s_enabled" -> List(true, false),
-    "e10s_cohort" -> List("control", "test"),
     "os" -> List("Windows", "Darwin"),
     "os_version" -> List("1.0", "1.1"),
     "devtools_toolbox_opened_count" -> List(0, 42),
@@ -49,7 +47,6 @@ object Submission{
       country <- dimensions("country")
       locale <- dimensions("locale")
       e10sEnabled <- dimensions("e10s_enabled")
-      e10sCohort <- dimensions("e10s_cohort")
       os <- dimensions("os")
       osVersion <- dimensions("os_version")
       devtoolsToolboxOpenedCount <- dimensions("devtools_toolbox_opened_count")
@@ -64,7 +61,6 @@ object Submission{
                  country.asInstanceOf[String],
                  locale.asInstanceOf[String],
                  e10sEnabled.asInstanceOf[Boolean],
-                 e10sCohort.asInstanceOf[String],
                  os.asInstanceOf[String],
                  osVersion.asInstanceOf[String],
                  devtoolsToolboxOpenedCount.asInstanceOf[Int],
@@ -96,7 +92,6 @@ class GenericCountTest extends FlatSpec with Matchers with BeforeAndAfterAll {
     "app_name" ::
     "app_version" ::
     "e10s_enabled" ::
-    "e10s_cohort" ::
     "os" ::
     "os_version" :: Nil
 

src/test/scala/com/mozilla/telemetry/views/MainEventsViewTest.scala

@@ -22,7 +22,6 @@ case class TestMainSummary(document_id: String,
                            os: String,
                            os_version: String,
                            e10s_enabled: Boolean,
-                           e10s_cohort: String,
                            subsession_start_date: String,
                            subsession_length: Long,
                            sync_configured: Boolean,
@@ -54,7 +53,7 @@ class MainEventsViewTest extends FlatSpec with Matchers{
       val e = Event(0, "navigation", "search", "urlbar", "enter", Map("engine" -> "google"))
       val m = TestMainSummary("6609b4d8-94d4-4e87-9f6f-80183079ff1b",
         "25a00eb7-2fd8-47fd-8d3f-223af3e5c68f", "release", "US", "en-US", "Firefox", "50.1.0", "Windows_NT", "10.0",
-        true, "test", "2017-01-23T20:54:10.123Z", 1000, false, 0, 0, 1485205018000000000L, 42, "test_experiment",
+        true, "2017-01-23T20:54:10.123Z", 1000, false, 0, 0, 1485205018000000000L, 42, "test_experiment",
         "test_branch", Map("experiment1" -> "branch1"), Some(Seq(e)))
 
       val pings : DataFrame = Seq(

src/test/scala/com/mozilla/telemetry/views/MainSummaryViewTest.scala

@@ -281,7 +281,6 @@ class MainSummaryViewTest extends FlatSpec with Matchers{
             "env_build_version"                 -> "48.0a1",
             "env_build_arch"                    -> "x86-64",
             "e10s_enabled"                      -> true,
-            "e10s_cohort"                       -> "unsupportedChannel",
             "e10s_multi_processes"              -> null,
             "locale"                            -> "en-US",
             "active_experiment_id"              -> null,