fixup! gh-135953: Add Gecko reporter to sampling profiler

Author: ivonastojanovic

Lib/profiling/sampling/gecko_format.py

@@ -7,7 +7,7 @@
 from dataclasses import dataclass, field
 from typing import List, Dict, Optional, Any
 
-from Lib.profiling.sampling.string_table import StringTable
+from .string_table import StringTable
 
 PYTHON_CATEGORY = 0
 OTHER_CATEGORY = 1
@@ -267,7 +267,7 @@ def to_dict(self) -> Dict[str, Any]:
         }
 
 class GeckoBuilder:
-    def __init__(self, string_table: StringTable, start_time: float = None):
+    def __init__(self, string_table: StringTable, start_time: float):
         self.string_table = string_table
         self.start_time = start_time
         self.threads_data = {}
@@ -359,7 +359,7 @@ def build_profile(self):
                 isMainThread=(thread_id == 0),
                 processType="default",
                 processName="Python",
-                processStartupTime=(self.start_time or 0) * 1000,
+                processStartupTime=None,
                 processShutdownTime=None,
                 registerTime=0,
                 unregisterTime=None,
@@ -376,7 +376,7 @@ def build_profile(self):
             threads.append(gecko_thread.to_dict())
 
         gecko_meta = GeckoMeta(
-            startTime=(self.start_time or 0) * 1000
+            startTime=self.start_time * 1000
         )
 
         gecko_profile = GeckoProfile(

Lib/profiling/sampling/stack_collector.py

@@ -309,45 +309,21 @@ class GeckoCollector(StackTraceCollector):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.samples = []
-        self.start_time = None
         self._string_table = StringTable()
-        self._func_intern = {}
+        self._builder = GeckoBuilder(self._string_table, time.time())
 
     def process_frames(self, frames, thread_id):
         current_time = time.time()
-        if self.start_time is None:
-            self.start_time = current_time
-
-        # Intern frames to avoid storing duplicates
-        interned_frames = [
-            self._func_intern.setdefault(frame, frame) for frame in frames
-        ]
-
-        self.samples.append({
-            'timestamp': current_time,
-            'thread_id': thread_id,
-            'frames': interned_frames
-        })
+        self._builder.add_sample(frames, current_time, thread_id)
 
     def export(self, filename):
-        if not self.samples:
+        if not self._builder.threads_data:
             print("No samples to export")
             return
 
-        builder = GeckoBuilder(self._string_table, self.start_time)
-
-        for sample in self.samples:
-            builder.add_sample(
-                sample['frames'],
-                sample['timestamp'],
-                sample['thread_id']
-            )
-
-        profile = builder.build_profile()
+        profile = self._builder.build_profile()
 
         with open(filename, 'w', encoding='utf-8') as file:
             json.dump(profile, file, indent=2)
 
-        thread_count = len(set(sample['thread_id'] for sample in self.samples))
-        print(f"Gecko profile exported: {filename} ({thread_count} threads, {len(self.samples)} samples)")
+        print(f"Gecko profile exported: {filename}")