Skip to content
This repository has been archived by the owner on Apr 27, 2023. It is now read-only.

Commit

Permalink
Merge branch 'release-v1.4.4' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhelmer
rhelmer committed Apr 7, 2022
2 parents 11ebb93 + 9d6c8c2 commit ff05b95
Show file tree
Hide file tree
Showing 8 changed files with 3,023 additions and 1,037 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Unreleased changes

[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.4.3...master)
[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.4.4...master)

# v1.4.4 (2022-04-07)

[Full changelog](https://github.com/mozilla-rally/core-addon/compare/v1.4.3...v1.4.4)

* [804](https://github.com/mozilla-rally/rally-core-addon/pull/804): Bug 1760255 - add rally ID to events pings
* [808](https://github.com/mozilla-rally/rally-core-addon/pull/808): Use correct dynamic label for demographics survey

# v1.4.3 (2022-02-03)

Expand Down
4 changes: 2 additions & 2 deletions core-addon/DataCollection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

import Glean from "@mozilla/glean/webext";
import PingEncryptionPlugin from "@mozilla/glean/webext/plugins/encryption";
import PingEncryptionPlugin from "@mozilla/glean/plugins/encryption";

import * as userMetrics from "../public/generated/user.js";
import * as rallyPings from "../public/generated/pings.js";
Expand Down Expand Up @@ -247,7 +247,7 @@ export default class DataCollection {

if ("hispanicLatinxSpanishOrigin" in data) {
const label = (data["hispanicLatinxSpanishOrigin"] === "other")
? "other" : "hispanicLatinxSpanish";
? "other" : "hispanic_latinx_spanish";
userMetrics.origin[label].set(true);
}

Expand Down
19 changes: 17 additions & 2 deletions docs/metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ This means you might have to go searching through the dependency tree to get a f
- [deletion-request](#deletion-request)
- [demographics](#demographics)
- [enrollment](#enrollment)
- [events](#events)
- [study-enrollment](#study-enrollment)
- [study-unenrollment](#study-unenrollment)
- [uninstall-deletion](#uninstall-deletion)
Expand Down Expand Up @@ -86,6 +87,20 @@ In addition to those built-in metrics, the following metrics are added to the pi
| --- | --- | --- | --- | --- | --- | --- |
| rally.id |[uuid](https://mozilla.github.io/glean/book/user/metrics/uuid.html) |The id of the Rally client. |[mozilla-rally/rally-core-addon#505](https://github.com/mozilla-rally/rally-core-addon/pull/505#issuecomment-815826426)||never | |

## events

This is a built-in ping that is assembled out of the box by the Glean SDK.

See the Glean SDK documentation for the [`events` ping](https://mozilla.github.io/glean/book/user/pings/events.html).

All Glean pings contain built-in metrics in the [`ping_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-ping_info-section) and [`client_info`](https://mozilla.github.io/glean/book/user/pings/index.html#the-client_info-section) sections.

In addition to those built-in metrics, the following metrics are added to the ping:

| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
| --- | --- | --- | --- | --- | --- | --- |
| rally.id |[uuid](https://mozilla.github.io/glean/book/user/metrics/uuid.html) |The id of the Rally client. |[mozilla-rally/rally-core-addon#505](https://github.com/mozilla-rally/rally-core-addon/pull/505#issuecomment-815826426)||never | |

## study-enrollment

This ping is sent when user clicks the Join button for a study
Expand All @@ -108,7 +123,7 @@ In addition to those built-in metrics, the following metrics are added to the pi

| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
| --- | --- | --- | --- | --- | --- | --- |
| enrollment.schema_namespace |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The schema namespace for the study the user has joined. |[Review 1](TODO)||never | |
| enrollment.schema_namespace |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The schema namespace for the study the user has joined. |[Bug 1663857](https://bugzilla.mozilla.org/show_bug.cgi?id=1663857#c5)||never | |
| enrollment.study_id |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The id of the study user has joined. |[Bug 1663857](https://bugzilla.mozilla.org/show_bug.cgi?id=1663857#c5)||never | |
| rally.id |[uuid](https://mozilla.github.io/glean/book/user/metrics/uuid.html) |The id of the Rally client. |[mozilla-rally/rally-core-addon#505](https://github.com/mozilla-rally/rally-core-addon/pull/505#issuecomment-815826426)||never | |

Expand All @@ -134,7 +149,7 @@ In addition to those built-in metrics, the following metrics are added to the pi
| Name | Type | Description | Data reviews | Extras | Expiration | [Data Sensitivity](https://wiki.mozilla.org/Firefox/Data_Collection) |
| --- | --- | --- | --- | --- | --- | --- |
| rally.id |[uuid](https://mozilla.github.io/glean/book/user/metrics/uuid.html) |The id of the Rally client. |[mozilla-rally/rally-core-addon#505](https://github.com/mozilla-rally/rally-core-addon/pull/505#issuecomment-815826426)||never | |
| unenrollment.schema_namespace |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The schema namespace for the study the user has left. |[Review 1](TODO)||never | |
| unenrollment.schema_namespace |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The schema namespace for the study the user has left. |[Bug 1646151](https://bugzilla.mozilla.org/show_bug.cgi?id=1646151#c32)||never | |
| unenrollment.study_id |[string](https://mozilla.github.io/glean/book/user/metrics/string.html) |The id of the study user has left. |[Bug 1646151](https://bugzilla.mozilla.org/show_bug.cgi?id=1646151#c32)||never | |

## uninstall-deletion
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"author": "Mozilla",
"manifest_version": 2,
"name": "Mozilla Rally",
"version": "1.4.3",
"version": "1.4.4",
"homepage_url": "https://github.com/mozilla-rally/rally-core-addon",
"icons": {
"48": "public/img/rally-favicon.svg",
Expand Down
1 change: 1 addition & 0 deletions metrics.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ rally:
- study-unenrollment
- demographics
- uninstall-deletion
- events
description: |
The id of the Rally client.
bugs:
Expand Down
Loading

1 comment on commit ff05b95

@firefoxci-taskcluster
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh oh! Looks like an error! Details

Taskcluster-GitHub attempted to create a task for this event with the following scopes:

["assume:repo:github.com/mozilla-rally/rally-core-addon:tag:v1.4.4","queue:route:checks","queue:scheduler-id:taskcluster-github"]

The expansion of these scopes is not sufficient to create the task, leading to the following:

Client ID static/taskcluster/github does not have sufficient scopes and is missing the following scopes:

assume:repo:github.com/mozilla-rally/rally-core-addon:branch:v1.4.4

This request requires the client to satisfy the following scope expression:

{
  "AllOf": [
    "assume:repo:github.com/mozilla-rally/rally-core-addon:branch:v1.4.4",
    "queue:route:checks",
    "queue:route:index.xpi.v2.rally-core-addon.revision.ff05b95fa1e953cc20f048f4b92e519aa542351d.taskgraph.decision",
    "queue:create-task:project:none",
    "queue:scheduler-id:xpi-level-1",
    {
      "AnyOf": [
        "queue:create-task:highest:xpi-1/decision",
        "queue:create-task:very-high:xpi-1/decision",
        "queue:create-task:high:xpi-1/decision",
        "queue:create-task:medium:xpi-1/decision",
        "queue:create-task:low:xpi-1/decision",
        "queue:create-task:very-low:xpi-1/decision",
        "queue:create-task:lowest:xpi-1/decision"
      ]
    }
  ]
}
  • method: createTask
  • errorCode: InsufficientScopes
  • statusCode: 403
  • time: 2022-04-07T22:51:35.772Z

Please sign in to comment.