Merge "tp: Add dimensions column to track_table" into main

Author: aMayzner

src/trace_processor/export_json_unittest.cc

@@ -251,7 +251,7 @@ TEST_F(ExportJsonTest, StorageWithThreadName) {
 }
 
 TEST_F(ExportJsonTest, SystemEventsIgnored) {
-  TrackId track = context_.track_tracker->CreateProcessAsyncTrack(
+  TrackId track = context_.track_tracker->LegacyCreateProcessAsyncTrack(
       /*name=*/kNullStringId, /*upid=*/0, /*source=*/kNullStringId);
   context_.args_tracker->Flush();  // Flush track args.
 
@@ -769,7 +769,7 @@ TEST_F(ExportJsonTest, InstantEvent) {
 
   // Global legacy track.
   TrackId track = context_.track_tracker->InternGlobalTrack(
-      TrackTracker::GlobalTrackType::kChromeLegacyGlobalInstant);
+      TrackTracker::TrackClassification::kChromeLegacyGlobalInstant);
   context_.args_tracker->Flush();  // Flush track args.
   StringId cat_id = context_.storage->InternString(base::StringView(kCategory));
   StringId name_id = context_.storage->InternString(base::StringView(kName));
@@ -982,11 +982,11 @@ TEST_F(ExportJsonTest, AsyncEvents) {
   StringId name3_id = context_.storage->InternString(base::StringView(kName3));
 
   constexpr int64_t kSourceId = 235;
-  TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
+  TrackId track = context_.track_tracker->LegacyInternLegacyChromeAsyncTrack(
       name_id, upid, kSourceId, /*trace_id_is_process_scoped=*/true,
       /*source_scope=*/kNullStringId);
   constexpr int64_t kSourceId2 = 236;
-  TrackId track2 = context_.track_tracker->InternLegacyChromeAsyncTrack(
+  TrackId track2 = context_.track_tracker->LegacyInternLegacyChromeAsyncTrack(
       name3_id, upid, kSourceId2, /*trace_id_is_process_scoped=*/true,
       /*source_scope=*/kNullStringId);
   context_.args_tracker->Flush();  // Flush track args.
@@ -1129,11 +1129,11 @@ TEST_F(ExportJsonTest, LegacyAsyncEvents) {
   };
 
   constexpr int64_t kSourceId = 235;
-  TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
+  TrackId track = context_.track_tracker->LegacyInternLegacyChromeAsyncTrack(
       name_id, upid, kSourceId, /*trace_id_is_process_scoped=*/true,
       /*source_scope=*/kNullStringId);
   constexpr int64_t kSourceId2 = 236;
-  TrackId track2 = context_.track_tracker->InternLegacyChromeAsyncTrack(
+  TrackId track2 = context_.track_tracker->LegacyInternLegacyChromeAsyncTrack(
       name3_id, upid, kSourceId2, /*trace_id_is_process_scoped=*/true,
       /*source_scope=*/kNullStringId);
   context_.args_tracker->Flush();  // Flush track args.
@@ -1252,7 +1252,7 @@ TEST_F(ExportJsonTest, AsyncEventWithThreadTimestamp) {
   StringId name_id = context_.storage->InternString(base::StringView(kName));
 
   constexpr int64_t kSourceId = 235;
-  TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
+  TrackId track = context_.track_tracker->LegacyInternLegacyChromeAsyncTrack(
       name_id, upid, kSourceId, /*trace_id_is_process_scoped=*/true,
       /*source_scope=*/kNullStringId);
   context_.args_tracker->Flush();  // Flush track args.
@@ -1308,7 +1308,7 @@ TEST_F(ExportJsonTest, UnfinishedAsyncEvent) {
   StringId name_id = context_.storage->InternString(base::StringView(kName));
 
   constexpr int64_t kSourceId = 235;
-  TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
+  TrackId track = context_.track_tracker->LegacyInternLegacyChromeAsyncTrack(
       name_id, upid, kSourceId, /*trace_id_is_process_scoped=*/true,
       /*source_scope=*/kNullStringId);
   context_.args_tracker->Flush();  // Flush track args.
@@ -1353,7 +1353,7 @@ TEST_F(ExportJsonTest, AsyncInstantEvent) {
   StringId name_id = context_.storage->InternString(base::StringView(kName));
 
   constexpr int64_t kSourceId = 235;
-  TrackId track = context_.track_tracker->InternLegacyChromeAsyncTrack(
+  TrackId track = context_.track_tracker->LegacyInternLegacyChromeAsyncTrack(
       name_id, upid, kSourceId, /*trace_id_is_process_scoped=*/true,
       /*source_scope=*/kNullStringId);
   context_.args_tracker->Flush();  // Flush track args.

src/trace_processor/importers/common/async_track_set_tracker.cc

@@ -184,7 +184,7 @@ TrackId AsyncTrackSetTracker::CreateTrackForSet(const TrackSet& set) {
     case TrackSetScope::kGlobal:
       // TODO(lalitm): propogate source from callers rather than just passing
       // kNullStringId here.
-      return context_->track_tracker->CreateGlobalAsyncTrack(
+      return context_->track_tracker->LegacyCreateGlobalAsyncTrack(
           set.global_track_name, kNullStringId);
     case TrackSetScope::kProcess:
       // TODO(lalitm): propogate source from callers rather than just passing
@@ -193,7 +193,7 @@ TrackId AsyncTrackSetTracker::CreateTrackForSet(const TrackSet& set) {
           set.nesting_behaviour == NestingBehaviour::kLegacySaturatingUnnestable
               ? android_source_
               : kNullStringId;
-      return context_->track_tracker->CreateProcessAsyncTrack(
+      return context_->track_tracker->LegacyCreateProcessAsyncTrack(
           set.process_tuple.name, set.process_tuple.upid, source);
   }
   PERFETTO_FATAL("For GCC");

src/trace_processor/importers/common/event_tracker_unittest.cc

@@ -55,7 +55,7 @@ TEST_F(EventTrackerTest, CounterDuration) {
   int64_t timestamp = 100;
 
   TrackId track = context.track_tracker->InternCpuCounterTrack(
-      TrackTracker::CpuCounterTrackType::kFrequency, cpu);
+      TrackTracker::TrackClassification::kCpuFrequency, cpu);
   context.event_tracker->PushCounter(timestamp, 1000, track);
   context.event_tracker->PushCounter(timestamp + 1, 4000, track);
   context.event_tracker->PushCounter(timestamp + 3, 5000, track);