Merge branch 'main' into bug_1699391

Author: ChinYing-Li

.circleci/config.yml

@@ -102,6 +102,7 @@ jobs:
             python3 -m venv venv
             source venv/bin/activate
             pip install -r requirements.txt
+            glean_parser translate metrics.yaml pings.yaml -f javascript -o generated --option platform=qt
 
             sudo apt-get install xvfb
             xvfb-run python main.py &> qml.log &

CHANGELOG.md

@@ -2,7 +2,9 @@
 
 [Full changelog](https://github.com/mozilla/glean.js/compare/v0.10.2...main)
 
+* [#260](https://github.com/mozilla/glean.js/pull/260): Set minimum node (>= 12.0.0) and npm (>= 7.0.0) versions.
 * [#202](https://github.com/mozilla/glean.js/pull/202): Add a testing API for the ping type.
+* [#253](https://github.com/mozilla/glean.js/pull/253): Implement the timespan metric type.
 * [#261](https://github.com/mozilla/glean.js/pull/261): Show a spinner while setting up python virtual environment
 
 # v0.10.2 (2021-04-26)

glean/package-lock.json

@@ -75,7 +75,7 @@
     "@typescript-eslint/eslint-plugin": "^4.15.0",
     "@typescript-eslint/parser": "^4.15.1",
     "eslint": "^7.19.0",
-    "eslint-plugin-jsdoc": "^32.0.1",
+    "eslint-plugin-jsdoc": "^33.0.0",
     "eslint-plugin-json": "^2.1.2",
     "eslint-plugin-mocha": "^8.0.0",
     "eslint-plugin-notice": "^0.9.10",
@@ -96,5 +96,9 @@
   "dependencies": {
     "jose": "^3.7.0",
     "uuid": "^8.3.2"
+  },
+  "engines": {
+    "node": ">=12.20.0",
+    "npm": ">=7.0.0"
   }
 }

glean/package.json

@@ -15,7 +15,7 @@ import { promisify } from "util";
 const VIRTUAL_ENVIRONMENT_DIR = ".venv";
 
 // The version of glean_parser to install from PyPI.
-const GLEAN_PARSER_VERSION = "3.1.1";
+const GLEAN_PARSER_VERSION = "3.2.0";
 
 // This script runs a given Python module as a "main" module, like
 // `python -m module`. However, it first checks that the installed

glean/src/cli.ts

@@ -12,8 +12,7 @@ import { isUndefined, sanitizeApplicationId } from "./utils.js";
 import { CoreMetrics } from "./internal_metrics.js";
 import EventsDatabase from "./metrics/events_database.js";
 import UUIDMetricType from "./metrics/types/uuid.js";
-import DatetimeMetricType from "./metrics/types/datetime.js";
-import { DatetimeMetric } from "./metrics/types/datetime_metric.js";
+import DatetimeMetricType, { DatetimeMetric } from "./metrics/types/datetime.js";
 import CorePings from "./internal_pings.js";
 import { registerPluginToEvent, testResetEvents } from "./events/utils.js";
 

glean/src/core/glean.ts

@@ -5,11 +5,11 @@
 import type Store from "../storage/index.js";
 import type { MetricType } from "./index.js";
 import type { Metric } from "./metric.js";
-import { createMetric, validateMetricInternalRepresentation } from "./utils.js";
+import type { StorageBuilder } from "../../platform/index.js";
+import type { Metrics } from "./index.js";
 import type { JSONObject, JSONValue } from "../utils.js";
+import { createMetric, validateMetricInternalRepresentation } from "./utils.js";
 import { isObject, isUndefined } from "../utils.js";
-import type { StorageBuilder } from "../../platform/index.js";
-import type { Metrics } from "./metrics_interface";
 import { Lifetime } from "./lifetime.js";
 
 /**

glean/src/core/metrics/database.ts

@@ -3,11 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import type { JSONValue } from "../utils.js";
-import { isUndefined } from "../utils.js";
-import { Metric } from "./metric.js";
 import type { Lifetime } from "./lifetime.js";
 import type MetricsDatabase from "./database.js";
-import { getValidDynamicLabel } from "./types/labeled_utils.js";
+import { isUndefined } from "../utils.js";
+import { getValidDynamicLabel } from "./types/labeled.js";
+
+export interface Metrics {
+  [aMetricType: string]: {
+    [aMetricIdentifier: string]: JSONValue;
+  };
+}
+
 
 /**
  * The common set of data shared across all different metric types.
@@ -103,27 +109,3 @@ export abstract class MetricType implements CommonMetricData {
     return (uploadEnabled && !this.disabled);
   }
 }
-
-/**
- * This is an internal metric representation for labeled metrics.
- *
- * This can be used to instruct the validators to simply report
- * whatever is stored internally, without performing any specific
- * validation.
- *
- * This needs to live here, instead of labeled.ts, in order to avoid
- * a cyclic dependency.
- */
-export class LabeledMetric extends Metric<JSONValue, JSONValue> {
-  constructor(v: unknown) {
-    super(v);
-  }
-
-  validate(v: unknown): v is JSONValue {
-    return true;
-  }
-
-  payload(): JSONValue {
-    return this._inner;
-  }
-}

glean/src/core/metrics/index.ts

@@ -4,8 +4,23 @@
 
 import type { CommonMetricData } from "../index.js";
 import { MetricType } from "../index.js";
-import { BooleanMetric } from "./boolean_metric.js";
 import { Context } from "../../context.js";
+import { Metric } from "../metric.js";
+import { isBoolean } from "../../utils.js";
+
+export class BooleanMetric extends Metric<boolean, boolean> {
+  constructor(v: unknown) {
+    super(v);
+  }
+
+  validate(v: unknown): v is boolean {
+    return isBoolean(v);
+  }
+  payload(): boolean {
+    return this._inner;
+  }
+}
+
 
 /**
  *  A boolean metric.