Rename main_remainder_v4 to main_v5 (#785)

mozilla-services · Sep 27, 2023 · 671b909 · 671b909
1 parent d0fd37e
commit 671b909
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 24 deletions.
diff --git a/schemas/telemetry/first-shutdown/first-shutdown.4.schema.json b/schemas/telemetry/first-shutdown/first-shutdown.4.schema.json
@@ -9,16 +9,15 @@
       "preserve_original": true,
       "remainder": {
         "document_namespace": "telemetry",
-        "document_type": "first-shutdown-remainder",
-        "document_version": "4"
+        "document_type": "first-shutdown",
+        "document_version": "5"
       },
       "subsets": [
         {
           "document_namespace": "telemetry",
           "document_type": "first-shutdown-use-counter",
           "document_version": "4",
-          "extra_pattern": ".*[.]((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED",
-          "pattern": ".*[.]USE_COUNTER2_[^.]+"
+          "pattern": ".*[.](USE_COUNTER2_[^.]+|((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED)"
         }
       ]
     }

diff --git a/schemas/telemetry/main/main.4.schema.json b/schemas/telemetry/main/main.4.schema.json
@@ -9,16 +9,15 @@
       "preserve_original": true,
       "remainder": {
         "document_namespace": "telemetry",
-        "document_type": "main-remainder",
-        "document_version": "4"
+        "document_type": "main",
+        "document_version": "5"
       },
       "subsets": [
         {
           "document_namespace": "telemetry",
           "document_type": "main-use-counter",
           "document_version": "4",
-          "extra_pattern": ".*[.]((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED",
-          "pattern": ".*[.]USE_COUNTER2_[^.]+"
+          "pattern": ".*[.](USE_COUNTER2_[^.]+|((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED)"
         }
       ]
     }

diff --git a/schemas/telemetry/saved-session/saved-session.4.schema.json b/schemas/telemetry/saved-session/saved-session.4.schema.json
@@ -9,16 +9,15 @@
       "preserve_original": true,
       "remainder": {
         "document_namespace": "telemetry",
-        "document_type": "saved-session-remainder",
-        "document_version": "4"
+        "document_type": "saved-session",
+        "document_version": "5"
       },
       "subsets": [
         {
           "document_namespace": "telemetry",
           "document_type": "saved-session-use-counter",
           "document_version": "4",
-          "extra_pattern": ".*[.]((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED",
-          "pattern": ".*[.]USE_COUNTER2_[^.]+"
+          "pattern": ".*[.](USE_COUNTER2_[^.]+|((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED)"
         }
       ]
     }

diff --git a/templates/telemetry/first-shutdown/first-shutdown.4.schema.json b/templates/telemetry/first-shutdown/first-shutdown.4.schema.json
@@ -9,14 +9,13 @@
           "document_namespace": "telemetry",
           "document_type": "first-shutdown-use-counter",
           "document_version": "4",
-          "pattern": ".*[.]USE_COUNTER2_[^.]+",
-          "extra_pattern": ".*[.]((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED"
+          "pattern": ".*[.](USE_COUNTER2_[^.]+|((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED)"
         }
       ],
       "remainder": {
         "document_namespace": "telemetry",
-        "document_type": "first-shutdown-remainder",
-        "document_version": "4"
+        "document_type": "first-shutdown",
+        "document_version": "5"
       }
     }
   },

diff --git a/templates/telemetry/main/main.4.schema.json b/templates/telemetry/main/main.4.schema.json
@@ -9,14 +9,13 @@
           "document_namespace": "telemetry",
           "document_type": "main-use-counter",
           "document_version": "4",
-          "pattern": ".*[.]USE_COUNTER2_[^.]+",
-          "extra_pattern": ".*[.]((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED"
+          "pattern": ".*[.](USE_COUNTER2_[^.]+|((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED)"
         }
       ],
       "remainder": {
         "document_namespace": "telemetry",
-        "document_type": "main-remainder",
-        "document_version": "4"
+        "document_type": "main",
+        "document_version": "5"
       }
     }
   },

diff --git a/templates/telemetry/saved-session/saved-session.4.schema.json b/templates/telemetry/saved-session/saved-session.4.schema.json
@@ -9,14 +9,13 @@
           "document_namespace": "telemetry",
           "document_type": "saved-session-use-counter",
           "document_version": "4",
-          "pattern": ".*[.]USE_COUNTER2_[^.]+",
-          "extra_pattern": ".*[.]((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED"
+          "pattern": ".*[.](USE_COUNTER2_[^.]+|((TOP_LEVEL_)?CONTENT_DOCUMENTS|[^.]+_WORKER)_DESTROYED)"
         }
       ],
       "remainder": {
         "document_namespace": "telemetry",
-        "document_type": "saved-session-remainder",
-        "document_version": "4"
+        "document_type": "saved-session",
+        "document_version": "5"
       }
     }
   },