Merge pull request #233 from mstange/fxprof-v48

Make fxprof-processed-profile output version 48

Author: mstange

fxprof-processed-profile/src/counters.rs

@@ -70,21 +70,7 @@ impl<'a> Serialize for SerializableCounter<'a> {
         map.serialize_entry("description", &self.counter.description)?;
         map.serialize_entry("mainThreadIndex", &self.main_thread_index)?;
         map.serialize_entry("pid", &self.counter.pid)?;
-        map.serialize_entry(
-            "sampleGroups",
-            &[SerializableCounterSampleGroup(self.counter)],
-        )?;
-        map.end()
-    }
-}
-
-struct SerializableCounterSampleGroup<'a>(&'a Counter);
-
-impl<'a> Serialize for SerializableCounterSampleGroup<'a> {
-    fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        let mut map = serializer.serialize_map(None)?;
-        map.serialize_entry("id", &0)?; // It's not clear what the meaning of this ID is.
-        map.serialize_entry("samples", &self.0.samples)?;
+        map.serialize_entry("samples", &self.counter.samples)?;
         map.end()
     }
 }

fxprof-processed-profile/src/profile.rs

@@ -705,7 +705,7 @@ impl<'a> Serialize for SerializableProfileMeta<'a> {
             }),
         )?;
         map.serialize_entry("interval", &(self.0.interval.as_secs_f64() * 1000.0))?;
-        map.serialize_entry("preprocessedProfileVersion", &46)?;
+        map.serialize_entry("preprocessedProfileVersion", &48)?;
         map.serialize_entry("processType", &0)?;
         map.serialize_entry("product", &self.0.product)?;
         map.serialize_entry(

fxprof-processed-profile/tests/integration_tests/main.rs

@@ -342,7 +342,7 @@ fn profile_without_js() {
                 "name": []
               },
               "interval": 1.0,
-              "preprocessedProfileVersion": 46,
+              "preprocessedProfileVersion": 48,
               "processType": 0,
               "product": "test",
               "sampleUnits": {
@@ -974,29 +974,24 @@ fn profile_without_js() {
                 "description": "Amount of allocated memory",
                 "mainThreadIndex": 0,
                 "pid": "123",
-                "sampleGroups": [
-                  {
-                    "id": 0,
-                    "samples": {
-                      "length": 3,
-                      "count": [
-                        0.0,
-                        1000.0,
-                        800.0
-                      ],
-                      "number": [
-                        0,
-                        2,
-                        1
-                      ],
-                      "time": [
-                        0.0,
-                        1.0,
-                        2.0
-                      ]
-                    }
-                  }
-                ]
+                "samples": {
+                  "length": 3,
+                  "count": [
+                    0.0,
+                    1000.0,
+                    800.0
+                  ],
+                  "number": [
+                    0,
+                    2,
+                    1
+                  ],
+                  "time": [
+                    0.0,
+                    1.0,
+                    2.0
+                  ]
+                }
               }
             ]
           }
@@ -1071,7 +1066,7 @@ fn profile_with_js() {
                 "name": []
               },
               "interval": 1.0,
-              "preprocessedProfileVersion": 46,
+              "preprocessedProfileVersion": 48,
               "processType": 0,
               "product": "test with js",
               "sampleUnits": {
@@ -1327,7 +1322,7 @@ fn profile_counters_with_sorted_processes() {
                 "name": []
               },
               "interval": 1.0,
-              "preprocessedProfileVersion": 46,
+              "preprocessedProfileVersion": 48,
               "processType": 0,
               "product": "test",
               "sampleUnits": {
@@ -1522,47 +1517,37 @@ fn profile_counters_with_sorted_processes() {
                 "description": "Amount of allocated memory",
                 "mainThreadIndex": 1,
                 "pid": "123",
-                "sampleGroups": [
-                  {
-                    "id": 0,
-                    "samples": {
-                      "length": 1,
-                      "count": [
-                        0.0
-                      ],
-                      "number": [
-                        0
-                      ],
-                      "time": [
-                        1.0
-                      ]
-                    }
-                  }
-                ]
+                "samples": {
+                  "length": 1,
+                  "count": [
+                    0.0
+                  ],
+                  "number": [
+                    0
+                  ],
+                  "time": [
+                    1.0
+                  ]
+                }
               },
               {
                 "category": "Memory 2",
                 "name": "malloc",
                 "description": "Amount of allocated memory",
                 "mainThreadIndex": 1,
                 "pid": "123",
-                "sampleGroups": [
-                  {
-                    "id": 0,
-                    "samples": {
-                      "length": 1,
-                      "count": [
-                        0.0
-                      ],
-                      "number": [
-                        0
-                      ],
-                      "time": [
-                        0.0
-                      ]
-                    }
-                  }
-                ]
+                "samples": {
+                  "length": 1,
+                  "count": [
+                    0.0
+                  ],
+                  "number": [
+                    0
+                  ],
+                  "time": [
+                    0.0
+                  ]
+                }
               }
             ]
           }