Attend to review comments

mozilla · Jul 20, 2020 · abc0b8d · abc0b8d
1 parent 75a1ffa
commit abc0b8d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.dictionary b/.dictionary
@@ -115,6 +115,7 @@ integrations
 io
 ios
 janerik
+JWE
 ktlint
 lang
 latencies

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 * General
   * BUGFIX: fix `int32` to `ErrorType` mapping. The `InvalidOverflow` had a value mismatch between glean-core and the bindings. This would only be a problem in unit tests. ([#1063](https://github.com/mozilla/glean/pull/1063))
+  * Implement a JWE metric type ([#1062](https://github.com/mozilla/glean/pull/1062)).
 
 [Full changelog](https://github.com/mozilla/glean/compare/v31.4.0...main)
 

diff --git a/glean-core/src/lib_unit_tests.rs b/glean-core/src/lib_unit_tests.rs
@@ -372,7 +372,7 @@ fn correct_order() {
         Timespan(Duration::new(5, 0), TimeUnit::Second),
         TimingDistribution(Histogram::functional(2.0, 8.0)),
         MemoryDistribution(Histogram::functional(2.0, 8.0)),
-        Jwe("a...a.".into()),
+        Jwe("eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00ifQ.OKOawDo13gRp2ojaHV7LFpZcgV7T6DVZKTyKOMTYUmKoTCVJRgckCL9kiMT03JGeipsEdY3mx_etLbbWSrFr05kLzcSr4qKAq7YN7e9jwQRb23nfa6c9d-StnImGyFDbSv04uVuxIp5Zms1gNxKKK2Da14B8S4rzVRltdYwam_lDp5XnZAYpQdb76FdIKLaVmqgfwX7XWRxv2322i-vDxRfqNzo_tETKzpVLzfiwQyeyPGLBIO56YJ7eObdv0je81860ppamavo35UgoRdbYaBcoh9QcfylQr66oc6vFWXRcZ_ZT2LawVCWTIy3brGPi6UklfCpIMfIjf7iGdXKHzg.48V1_ALb6US04U3b.5eym8TW_c8SuK0ltJ3rpYIzOeDQz7TALvtu6UG9oMo4vpzs9tX_EFShS8iB7j6jiSdiwkIr3ajwQzaBtQD_A.XFBoMYUZodetZdvTiFvSkQ".into()),
     ];
 
     for metric in all_metrics {

diff --git a/glean-core/src/metrics/jwe.rs b/glean-core/src/metrics/jwe.rs
@@ -43,7 +43,7 @@ fn validate_base64url_encoding(value: &str) -> bool {
 /// Representation of a [JWE](https://tools.ietf.org/html/rfc7516).
 ///
 /// **Note** Variable sized elements will be constrained to a length of DEFAULT_MAX_CHARS_PER_VARIABLE_SIZE_ELEMENT,
-/// this is a constraint introduced by Glean and not part of the spec.
+/// this is a constraint introduced by Glean to prevent abuses and not part of the spec.
 #[derive(Serialize)]
 struct Jwe {
     /// A variable-size JWE protected header.
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,6 +115,7 @@ integrations @@
     io
     ios
     janerik
+    JWE
     ktlint
     lang
     latencies
@@ Expand Down @@