diff options
Diffstat (limited to 'toolkit/components/telemetry/build_scripts')
4 files changed, 1 insertions, 42 deletions
diff --git a/toolkit/components/telemetry/build_scripts/mozparsers/parse_events.py b/toolkit/components/telemetry/build_scripts/mozparsers/parse_events.py index 09ed651917..1275e03a5e 100644 --- a/toolkit/components/telemetry/build_scripts/mozparsers/parse_events.py +++ b/toolkit/components/telemetry/build_scripts/mozparsers/parse_events.py @@ -265,12 +265,6 @@ class EventData: ParserError( self.identifier + ": Unknown value in products: " + product ).handle_later() - if utils.is_geckoview_streaming_product(product): - ParserError( - "{}: Product `{}` unsupported for Event Telemetry".format( - self.identifier, product - ) - ).handle_later() # Check operating_systems. operating_systems = definition.get("operating_systems", []) diff --git a/toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py b/toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py index 626188bf06..92fff31a48 100644 --- a/toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py +++ b/toolkit/components/telemetry/build_scripts/mozparsers/parse_histograms.py @@ -46,12 +46,6 @@ BASE_DOC_URL = ( HISTOGRAMS_DOC_URL = BASE_DOC_URL + "collection/histograms.html" SCALARS_DOC_URL = BASE_DOC_URL + "collection/scalars.html" -GECKOVIEW_STREAMING_SUPPORTED_KINDS = [ - "linear", - "exponential", - "categorical", -] - def linear_buckets(dmin, dmax, n_buckets): ret_array = [0] * n_buckets @@ -435,22 +429,6 @@ class Histogram: 'Histogram "%s" has unknown product "%s" in %s.\n%s' % (name, product, field, DOC_URL) ).handle_later() - if utils.is_geckoview_streaming_product(product): - kind = definition.get("kind") - if kind not in GECKOVIEW_STREAMING_SUPPORTED_KINDS: - ParserError( - ( - 'Histogram "%s" is of kind "%s" which is unsupported for ' - 'product "%s".' - ) - % (name, kind, product) - ).handle_later() - keyed = definition.get("keyed") - if keyed: - ParserError( - 'Keyed histograms like "%s" are unsupported for product "%s"' - % (name, product) - ).handle_later() def check_operating_systems(self, name, definition): if not self._strict_type_checks: diff --git a/toolkit/components/telemetry/build_scripts/mozparsers/parse_scalars.py b/toolkit/components/telemetry/build_scripts/mozparsers/parse_scalars.py index 5ec591b393..b46cc7c3db 100644 --- a/toolkit/components/telemetry/build_scripts/mozparsers/parse_scalars.py +++ b/toolkit/components/telemetry/build_scripts/mozparsers/parse_scalars.py @@ -308,13 +308,6 @@ class ScalarType: + product + ".\nSee: {}".format(BASE_DOC_URL) ).handle_later() - if utils.is_geckoview_streaming_product(product): - keyed = definition.get("keyed") - if keyed: - ParserError( - "%s - keyed Scalars not supported for product %s" - % (self._name, product) - ).handle_later() # Validate the expiration version. # Historical versions of Scalars.json may contain expiration versions diff --git a/toolkit/components/telemetry/build_scripts/mozparsers/shared_telemetry_utils.py b/toolkit/components/telemetry/build_scripts/mozparsers/shared_telemetry_utils.py index 4b4cc9f685..80ae685c45 100644 --- a/toolkit/components/telemetry/build_scripts/mozparsers/shared_telemetry_utils.py +++ b/toolkit/components/telemetry/build_scripts/mozparsers/shared_telemetry_utils.py @@ -26,15 +26,13 @@ KNOWN_PROCESS_FLAGS = { "all_childs": "AllChildren", # Supporting files from before bug 1363725 } -GECKOVIEW_STREAMING_PRODUCT = "geckoview_streaming" - SUPPORTED_PRODUCTS = { "firefox": "Firefox", "fennec": "Fennec", - GECKOVIEW_STREAMING_PRODUCT: "GeckoviewStreaming", "thunderbird": "Thunderbird", # Historical, deprecated values: # 'geckoview': 'Geckoview', + # "geckoview_streaming": "GeckoviewStreaming", } SUPPORTED_OPERATING_SYSTEMS = [ @@ -114,10 +112,6 @@ def is_valid_product(name): return name in SUPPORTED_PRODUCTS -def is_geckoview_streaming_product(name): - return name == GECKOVIEW_STREAMING_PRODUCT - - def is_valid_os(name): return name in SUPPORTED_OPERATING_SYSTEMS |