Skip to content

Commit 285ebd3

Browse files
committed
Revert "Merge pull request mozilla#647 from badboy/text-metric"
This reverts commit 030d850, reversing changes made to b9ac92a.
1 parent c5b794a commit 285ebd3

File tree

10 files changed

+2
-222
lines changed

10 files changed

+2
-222
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
* Only up to 15 ping submissions every 60 seconds are now allowed.
1212
* [#658](https://github.com/mozilla/glean.js/pull/658): BUGFIX: Unblock ping uploading jobs after the maximum of upload failures are hit for a given uploading window.
1313
* [#661](https://github.com/mozilla/glean.js/pull/661): Include unminified version of library on Qt/QML builds.
14-
* [#647](https://github.com/mozilla/glean.js/pull/647): Implement the Text metric type.
1514
* [#681](https://github.com/mozilla/glean.js/pull/681): BUGFIX: Fix error in scanning events database upon initialization on Qt/QML.
1615
* This bug prevents the changes introduced in [#526](https://github.com/mozilla/glean.js/pull/526) from working properly.
1716

benchmarks/size/webext/max.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import EventMetricType from "@mozilla/glean/webext/private/metrics/event";
1111
import LabeledMetricType from "@mozilla/glean/webext/private/metrics/labeled";
1212
import QuantityMetricType from "@mozilla/glean/webext/private/metrics/quantity";
1313
import StringMetricType from "@mozilla/glean/webext/private/metrics/string";
14-
import TextMetricType from "@mozilla/glean/webext/private/metrics/text";
1514
import TimespanMetricType from "@mozilla/glean/webext/private/metrics/timespan";
1615
import UUIDMetricType from "@mozilla/glean/webext/private/metrics/uuid";
1716
import URLMetricType from "@mozilla/glean/webext/private/metrics/url";
@@ -29,7 +28,6 @@ console.log(
2928
JSON.stringify(LabeledMetricType),
3029
JSON.stringify(QuantityMetricType),
3130
JSON.stringify(StringMetricType),
32-
JSON.stringify(TextMetricType),
3331
JSON.stringify(TimespanMetricType),
3432
JSON.stringify(UUIDMetricType),
3533
JSON.stringify(URLMetricType),

glean/src/cli.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const LOG_TAG = "CLI";
1919
const VIRTUAL_ENVIRONMENT_DIR = ".venv";
2020

2121
// The version of glean_parser to install from PyPI.
22-
const GLEAN_PARSER_VERSION = "4.0.0";
22+
const GLEAN_PARSER_VERSION = "3.8.0";
2323

2424
// This script runs a given Python module as a "main" module, like
2525
// `python -m module`. However, it first checks that the installed

glean/src/core/metrics/types/text.ts

Lines changed: 0 additions & 89 deletions
This file was deleted.

glean/src/core/metrics/utils.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { CounterMetric } from "./types/counter.js";
1212
import { DatetimeMetric } from "./types/datetime.js";
1313
import { QuantityMetric } from "./types/quantity.js";
1414
import { StringMetric } from "./types/string.js";
15-
import { TextMetric } from "./types/text.js";
1615
import { TimespanMetric } from "./types/timespan.js";
1716
import { UrlMetric } from "./types/url.js";
1817
import { UUIDMetric } from "./types/uuid.js";
@@ -31,7 +30,6 @@ const METRIC_MAP: {
3130
"labeled_string": LabeledMetric,
3231
"quantity": QuantityMetric,
3332
"string": StringMetric,
34-
"text": TextMetric,
3533
"timespan": TimespanMetric,
3634
"url": UrlMetric,
3735
"uuid": UUIDMetric,

glean/src/index/qt.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import EventMetricType from "../core/metrics/types/event.js";
1717
import LabeledMetricType from "../core/metrics/types/labeled.js";
1818
import QuantityMetricType from "../core/metrics/types/quantity.js";
1919
import StringMetricType from "../core/metrics/types/string.js";
20-
import TextMetricType from "../core/metrics/types/text.js";
2120
import TimespanMetricType from "../core/metrics/types/timespan.js";
2221
import UUIDMetricType from "../core/metrics/types/uuid.js";
2322
import URLMetricType from "../core/metrics/types/url.js";
@@ -125,7 +124,6 @@ export default {
125124
QuantityMetricType,
126125
StringMetricType,
127126
TimespanMetricType,
128-
TextMetricType,
129127
UUIDMetricType,
130128
URLMetricType
131129
}

glean/tests/integration/schema/metrics.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,3 @@ for_testing:
175175
expires: never
176176
send_in_pings:
177177
- testing
178-
text:
179-
type: text
180-
description: |
181-
Sample text metric.
182-
bugs:
183-
- https://bugzilla.mozilla.org/000000
184-
data_reviews:
185-
- https://bugzilla.mozilla.org/show_bug.cgi?id=000000#c3
186-
notification_emails:
187-
- me@mozilla.com
188-
expires: never
189-
send_in_pings:
190-
- testing
191-
data_sensitivity:
192-
- highly_sensitive

glean/tests/integration/schema/schema.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ describe("schema", function() {
7070
metrics.labeledString["a_label"].set("ho");
7171
metrics.quantity.set(42);
7272
metrics.string.set("let's go");
73-
metrics.text.set("let's gooooooooo");
7473
metrics.timespan.setRawNanos(10 * 10**6);
7574
metrics.uuid.generateAndSet();
7675
metrics.url.set("glean://test");

glean/tests/unit/core/metrics/text.spec.ts

Lines changed: 0 additions & 108 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
PySide2==5.15.2
22
shiboken2==5.15.2
3-
glean_parser==4.0.0
3+
glean_parser==3.8.0

0 commit comments

Comments
 (0)