Merge pull request #183 from ChinYing-Li/bug_1695884

Bug 1695884 - Put PingType in a standalone file (#)

Author: Beatriz Rizental

glean/src/core/internal_pings.ts

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 import { DELETION_REQUEST_PING_NAME } from "./constants.js";
-import PingType from "./pings/index.js";
+import PingType from "./pings/ping_type.js";
 
 /**
  * Glean-provided pings, all enabled by default.

glean/src/core/pings/index.ts renamed to glean/src/core/pings/ping_type.ts

@@ -8,7 +8,7 @@ import type { ConfigurationInterface } from "../core/config.js";
 import platform from "../platform/qt/index.js";
 
 // Private Glean types to export.
-import PingType from "../core/pings/index.js";
+import PingType from "../core/pings/ping_type.js";
 import BooleanMetricType from "../core/metrics/types/boolean.js";
 import CounterMetricType from "../core/metrics/types/counter.js";
 import DatetimeMetricType from "../core/metrics/types/datetime.js";

glean/src/index/qt.ts

@@ -10,7 +10,7 @@ import CoreEvents from "../../src/core/events";
 import Glean from "../../src/core/glean";
 import StringMetricType from "../../src/core/metrics/types/string";
 import CounterMetricType from "../../src/core/metrics/types/counter";
-import PingType from "../../src/core/pings";
+import PingType from "../../src/core/pings/ping_type";
 import type { JSONObject } from "../../src/core/utils";
 import { isObject } from "../../src/core/utils";
 import TestPlatform from "../../src/platform/qt";

glean/tests/core/glean.spec.ts

@@ -12,7 +12,7 @@ import BooleanMetricType from "../../../src/core/metrics/types/boolean";
 import CounterMetricType from "../../../src/core/metrics/types/counter";
 import LabeledMetricType from "../../../src/core/metrics/types/labeled";
 import StringMetricType from "../../../src/core/metrics/types/string";
-import PingType from "../../../src/core/pings";
+import PingType from "../../../src/core/pings/ping_type";
 import type { JSONObject } from "../../../src/core/utils";
 
 const sandbox = sinon.createSandbox();

glean/tests/core/metrics/labeled.spec.ts

@@ -5,7 +5,7 @@
 import assert from "assert";
 import sinon from "sinon";
 
-import PingType from "../../../src/core/pings";
+import PingType from "../../../src/core/pings/ping_type";
 import CounterMetricType from "../../../src/core/metrics/types/counter";
 import { Lifetime } from "../../../src/core/metrics/lifetime";
 import Glean from "../../../src/core/glean";

glean/tests/core/pings/index.spec.ts

@@ -5,7 +5,7 @@
 import assert from "assert";
 import sinon from "sinon";
 
-import PingType from "../../../src/core/pings";
+import PingType from "../../../src/core/pings/ping_type";
 import * as PingMaker from "../../../src/core/pings/maker";
 import Glean from "../../../src/core/glean";
 import CoreEvents from "../../../src/core/events";

glean/tests/core/pings/maker.spec.ts

@@ -9,7 +9,7 @@ import { v4 as UUIDv4 } from "uuid";
 import { Configuration } from "../../../src/core/config";
 import { Context } from "../../../src/core/context";
 import Glean from "../../../src/core/glean";
-import PingType from "../../../src/core/pings";
+import PingType from "../../../src/core/pings/ping_type";
 import collectAndStorePing from "../../../src/core/pings/maker";
 import PingUploader from "../../../src/core/upload";
 import { UploadResultStatus } from "../../../src/core/upload/uploader";

glean/tests/core/upload/index.spec.ts

@@ -9,7 +9,7 @@ import fromKeyLike from "jose/jwk/from_key_like";
 import compactDecrypt from "jose/jwe/compact/decrypt";
 
 import Glean from "../../src/core/glean";
-import PingType from "../../src/core/pings";
+import PingType from "../../src/core/pings/ping_type";
 import type { JSONObject } from "../../src/core/utils";
 import TestPlatform from "../../src/platform/qt";
 import PingEncryptionPlugin from "../../src/plugins/encryption";