Bug 1875874 - Allow null distro and distroVersion in legacy telemetry (…

…#810)
mozilla-services · May 1, 2024 · eeea9f5 · eeea9f5
1 parent c3d13ba
commit eeea9f5
Show file tree

Hide file tree

Showing 21 changed files with 168 additions and 42 deletions.
diff --git a/schemas/telemetry/bhr/bhr.4.schema.json b/schemas/telemetry/bhr/bhr.4.schema.json
@@ -1276,11 +1276,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/crash/crash.4.schema.json b/schemas/telemetry/crash/crash.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/dnssec-study-v1/dnssec-study-v1.4.schema.json b/schemas/telemetry/dnssec-study-v1/dnssec-study-v1.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/event/event.4.schema.json b/schemas/telemetry/event/event.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/first-shutdown/first-shutdown.4.schema.json b/schemas/telemetry/first-shutdown/first-shutdown.4.schema.json
@@ -1292,11 +1292,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/heartbeat/heartbeat.4.schema.json b/schemas/telemetry/heartbeat/heartbeat.4.schema.json
@@ -1283,11 +1283,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/main/main.4.schema.json b/schemas/telemetry/main/main.4.schema.json
@@ -1292,11 +1292,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/modules/modules.4.schema.json b/schemas/telemetry/modules/modules.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/new-profile/new-profile.4.schema.json b/schemas/telemetry/new-profile/new-profile.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/saved-session/saved-session.4.schema.json b/schemas/telemetry/saved-session/saved-session.4.schema.json
@@ -1292,11 +1292,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/shield-icq-v1/shield-icq-v1.4.schema.json b/schemas/telemetry/shield-icq-v1/shield-icq-v1.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/sync/sync.4.schema.json b/schemas/telemetry/sync/sync.4.schema.json
@@ -269,10 +269,16 @@
         "os": {
           "properties": {
             "distro": {
-              "type": "string"
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "distroVersion": {
-              "type": "string"
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "hasPrefetch": {
               "type": "boolean"

diff --git a/schemas/telemetry/sync/sync.5.schema.json b/schemas/telemetry/sync/sync.5.schema.json
@@ -283,10 +283,16 @@
         "os": {
           "properties": {
             "distro": {
-              "type": "string"
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "distroVersion": {
-              "type": "string"
+              "type": [
+                "string",
+                "null"
+              ]
             },
             "hasPrefetch": {
               "type": "boolean"

diff --git a/schemas/telemetry/testpilot/testpilot.4.schema.json b/schemas/telemetry/testpilot/testpilot.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/third-party-modules/third-party-modules.4.schema.json b/schemas/telemetry/third-party-modules/third-party-modules.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/uninstall/uninstall.4.schema.json b/schemas/telemetry/uninstall/uninstall.4.schema.json
@@ -1276,11 +1276,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/untrusted-modules/untrusted-modules.4.schema.json b/schemas/telemetry/untrusted-modules/untrusted-modules.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/update/update.4.schema.json b/schemas/telemetry/update/update.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/schemas/telemetry/voice/voice.4.schema.json b/schemas/telemetry/voice/voice.4.schema.json
@@ -1275,11 +1275,17 @@
               "properties": {
                 "distro": {
                   "description": "The name of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "distroVersion": {
                   "description": "The version of the Linux distribution. This is Linux only. `null` on failure.",
-                  "type": "string"
+                  "type": [
+                    "string",
+                    "null"
+                  ]
                 },
                 "hasPrefetch": {
                   "description": "Whether or not the OS-based prefetch application start-up optimization is set. This is Windows-only. `null` on failure.",

diff --git a/templates/include/telemetry/environment.1.schema.json b/templates/include/telemetry/environment.1.schema.json
@@ -1231,11 +1231,17 @@
               "description": "The version of the OS, e.g. '6.1'. This is `null` on failure."
             },
             "distro": {
-              "type": "string",
+              "type": [
+                "string",
+                "null"
+              ],
               "description": "The name of the Linux distribution. This is Linux only. `null` on failure."
             },
             "distroVersion": {
-              "type": "string",
+              "type": [
+                "string",
+                "null"
+              ],
               "description": "The version of the Linux distribution. This is Linux only. `null` on failure."
             },
             "kernelVersion": {