Commit 34cb8d0a authored by Bogdan Tara's avatar Bogdan Tara
Browse files

Merge inbound to mozilla-central. a=merge

parents a876ab13 6ce25702

testing/web-platform/meta/css/css-ui/appearance-textfield-001.html.ini

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
    if (os == "win") and debug and webrender: FAIL

    if (os == "win") and debug and not webrender and (processor == "x86_64"): [PASS, FAIL]

    if (os == "win") and (processor == "x86_64"): FAIL

    if (os == "win") and not debug: [PASS, FAIL]

toolkit/components/telemetry/Histograms.json

+0 −27
Original line number Diff line number Diff line
@@ -6801,33 +6801,6 @@ 
    "bug_numbers": [1254099],

    "description": "Generic histogram to track uptake of remote content like blocklists, settings or updates."

  },

  "THUNDERBIRD_GLODA_SIZE_MB": {

    "record_in_processes": ["main", "content"],

    "products": ["firefox", "fennec", "geckoview"],

    "expires_in_version": "never",

    "kind": "linear",

    "high": 1000,

    "n_buckets": 40,

    "description": "Gloda: size of global-messages-db.sqlite (MB)"

  },

  "THUNDERBIRD_CONVERSATIONS_TIME_TO_2ND_GLODA_QUERY_MS": {

    "record_in_processes": ["main", "content"],

    "products": ["firefox", "fennec", "geckoview"],

    "expires_in_version": "never",

    "kind": "exponential",

    "high": 10000,

    "n_buckets": 30,

    "description": "Conversations: time between the moment we click and the second gloda query returns (ms)"

  },

  "THUNDERBIRD_INDEXING_RATE_MSG_PER_S": {

    "record_in_processes": ["main", "content"],

    "products": ["firefox", "fennec", "geckoview"],

    "expires_in_version": "never",

    "kind": "linear",

    "high": 100,

    "n_buckets": 20,

    "description": "Gloda: indexing rate (message/s)"

  },

  "FX_GESTURE_INSTALL_SNAPSHOT_OF_PAGE": {

    "record_in_processes": ["main", "content"],

    "products": ["firefox", "fennec", "geckoview"],

toolkit/components/telemetry/build_scripts/gen_event_data.py

+16 −14
Original line number Diff line number Diff line
@@ -138,12 +138,13 @@ def generate_JSON_definitions(output, *filenames): 
           We only support a single file.

    """

    # Load the event data.

    if len(filenames) > 1:

        raise Exception('We don\'t support loading from more than one file.')

    events = []

    for filename in filenames:

        try:

        events = parse_events.load_events(filenames[0], True)

            batch = parse_events.load_events(filename, True)

            events.extend(batch)

        except ParserError as ex:

        print("\nError processing events:\n" + str(ex) + "\n")

            print("\nError processing %s:\n%s\n" % (filename, str(ex)), file=sys.stderr)

            sys.exit(1)



    event_definitions = OrderedDict()
@@ -170,12 +171,13 @@ def generate_JSON_definitions(output, *filenames): 


def main(output, *filenames):

    # Load the event data.

    if len(filenames) > 1:

        raise Exception('We don\'t support loading from more than one file.')

    events = []

    for filename in filenames:

        try:

        events = parse_events.load_events(filenames[0], True)

            batch = parse_events.load_events(filename, True)

            events.extend(batch)

        except ParserError as ex:

        print("\nError processing events:\n" + str(ex) + "\n")

            print("\nError processing %s:\n%s\n" % (filename, str(ex)), file=sys.stderr)

            sys.exit(1)



    # Write the scalar data file.

toolkit/components/telemetry/build_scripts/gen_event_enum.py

+8 −8
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ file_footer = """\ 


def main(output, *filenames):

    # Load the events first.

    if len(filenames) > 1:

        raise Exception('We don\'t support loading from more than one file.')



    events = []

    for filename in filenames:

        try:

        events = parse_events.load_events(filenames[0], True)

            batch = parse_events.load_events(filename, True)

            events.extend(batch)

        except ParserError as ex:

        print("\nError processing events:\n" + str(ex) + "\n")

            print("\nError processing %s:\n%s\n" % (filename, str(ex)), file=sys.stderr)

            sys.exit(1)



    grouped = dict()

toolkit/components/telemetry/build_scripts/gen_scalar_data.py

+9 −8
Original line number Diff line number Diff line
@@ -109,14 +109,15 @@ def write_scalar_tables(scalars, output): 




def parse_scalar_definitions(filenames):

    if len(filenames) > 1:

        raise Exception('We don\'t support loading from more than one file.')



    scalars = []

    for filename in filenames:

        try:

        return parse_scalars.load_scalars(filenames[0])

            batch = parse_scalars.load_scalars(filename)

            scalars.extend(batch)

        except ParserError as ex:

        print("\nError processing scalars:\n" + str(ex) + "\n")

            print("\nError processing %s:\n%s\n" % (filename, str(ex)), file=sys.stderr)

            sys.exit(1)

    return scalars





def generate_JSON_definitions(output, *filenames):