tp: move metadata, perf sample and stack trackers to improters/proto
Change-Id: Ie08312f919718634c5923bcbdfa23bcbceec91af
diff --git a/Android.bp b/Android.bp
index 00fe8f7..2aeebf3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6574,7 +6574,6 @@
"src/trace_processor/default_modules.cc",
"src/trace_processor/event_tracker.cc",
"src/trace_processor/forwarding_trace_parser.cc",
- "src/trace_processor/heap_profile_tracker.cc",
"src/trace_processor/importers/common/args_tracker.cc",
"src/trace_processor/importers/common/global_args_tracker.cc",
"src/trace_processor/importers/common/process_tracker.cc",
@@ -6584,19 +6583,20 @@
"src/trace_processor/importers/json/json_utils.cc",
"src/trace_processor/importers/ninja/ninja_log_parser.cc",
"src/trace_processor/importers/proto/args_table_utils.cc",
+ "src/trace_processor/importers/proto/heap_profile_tracker.cc",
+ "src/trace_processor/importers/proto/metadata_tracker.cc",
"src/trace_processor/importers/proto/packet_sequence_state.cc",
+ "src/trace_processor/importers/proto/perf_sample_tracker.cc",
"src/trace_processor/importers/proto/profile_module.cc",
"src/trace_processor/importers/proto/profile_packet_utils.cc",
"src/trace_processor/importers/proto/proto_importer_module.cc",
"src/trace_processor/importers/proto/proto_trace_parser.cc",
"src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
+ "src/trace_processor/importers/proto/stack_profile_tracker.cc",
"src/trace_processor/importers/proto/track_event_module.cc",
"src/trace_processor/importers/proto/track_event_parser.cc",
"src/trace_processor/importers/proto/track_event_tokenizer.cc",
- "src/trace_processor/metadata_tracker.cc",
- "src/trace_processor/perf_sample_tracker.cc",
"src/trace_processor/slice_tracker.cc",
- "src/trace_processor/stack_profile_tracker.cc",
"src/trace_processor/trace_processor_context.cc",
"src/trace_processor/trace_processor_storage.cc",
"src/trace_processor/trace_processor_storage_impl.cc",
@@ -6661,12 +6661,12 @@
"src/trace_processor/dynamic/experimental_counter_dur_generator_unittest.cc",
"src/trace_processor/event_tracker_unittest.cc",
"src/trace_processor/forwarding_trace_parser_unittest.cc",
- "src/trace_processor/heap_profile_tracker_unittest.cc",
"src/trace_processor/importers/common/process_tracker_unittest.cc",
"src/trace_processor/importers/fuchsia/fuchsia_trace_utils_unittest.cc",
"src/trace_processor/importers/proto/args_table_utils_unittest.cc",
"src/trace_processor/importers/proto/heap_graph_tracker_unittest.cc",
"src/trace_processor/importers/proto/heap_graph_walker_unittest.cc",
+ "src/trace_processor/importers/proto/heap_profile_tracker_unittest.cc",
"src/trace_processor/importers/proto/proto_trace_parser_unittest.cc",
"src/trace_processor/importers/syscalls/syscall_tracker_unittest.cc",
"src/trace_processor/importers/systrace/systrace_parser_unittest.cc",
diff --git a/BUILD b/BUILD
index d143300..bba8d0d 100644
--- a/BUILD
+++ b/BUILD
@@ -983,8 +983,6 @@
"src/trace_processor/event_tracker.h",
"src/trace_processor/forwarding_trace_parser.cc",
"src/trace_processor/forwarding_trace_parser.h",
- "src/trace_processor/heap_profile_tracker.cc",
- "src/trace_processor/heap_profile_tracker.h",
"src/trace_processor/importers/common/args_tracker.cc",
"src/trace_processor/importers/common/args_tracker.h",
"src/trace_processor/importers/common/global_args_tracker.cc",
@@ -1005,8 +1003,14 @@
"src/trace_processor/importers/ninja/ninja_log_parser.h",
"src/trace_processor/importers/proto/args_table_utils.cc",
"src/trace_processor/importers/proto/args_table_utils.h",
+ "src/trace_processor/importers/proto/heap_profile_tracker.cc",
+ "src/trace_processor/importers/proto/heap_profile_tracker.h",
+ "src/trace_processor/importers/proto/metadata_tracker.cc",
+ "src/trace_processor/importers/proto/metadata_tracker.h",
"src/trace_processor/importers/proto/packet_sequence_state.cc",
"src/trace_processor/importers/proto/packet_sequence_state.h",
+ "src/trace_processor/importers/proto/perf_sample_tracker.cc",
+ "src/trace_processor/importers/proto/perf_sample_tracker.h",
"src/trace_processor/importers/proto/profile_module.cc",
"src/trace_processor/importers/proto/profile_module.h",
"src/trace_processor/importers/proto/profile_packet_utils.cc",
@@ -1018,6 +1022,8 @@
"src/trace_processor/importers/proto/proto_trace_parser.h",
"src/trace_processor/importers/proto/proto_trace_tokenizer.cc",
"src/trace_processor/importers/proto/proto_trace_tokenizer.h",
+ "src/trace_processor/importers/proto/stack_profile_tracker.cc",
+ "src/trace_processor/importers/proto/stack_profile_tracker.h",
"src/trace_processor/importers/proto/track_event_module.cc",
"src/trace_processor/importers/proto/track_event_module.h",
"src/trace_processor/importers/proto/track_event_parser.cc",
@@ -1026,14 +1032,8 @@
"src/trace_processor/importers/proto/track_event_tokenizer.h",
"src/trace_processor/importers/syscalls/syscall_tracker.h",
"src/trace_processor/importers/systrace/systrace_line.h",
- "src/trace_processor/metadata_tracker.cc",
- "src/trace_processor/metadata_tracker.h",
- "src/trace_processor/perf_sample_tracker.cc",
- "src/trace_processor/perf_sample_tracker.h",
"src/trace_processor/slice_tracker.cc",
"src/trace_processor/slice_tracker.h",
- "src/trace_processor/stack_profile_tracker.cc",
- "src/trace_processor/stack_profile_tracker.h",
"src/trace_processor/status_macros.h",
"src/trace_processor/timestamped_trace_piece.h",
"src/trace_processor/trace_blob_view.h",
diff --git a/src/trace_processor/BUILD.gn b/src/trace_processor/BUILD.gn
index 4512f42..121b420 100644
--- a/src/trace_processor/BUILD.gn
+++ b/src/trace_processor/BUILD.gn
@@ -99,8 +99,6 @@
"event_tracker.h",
"forwarding_trace_parser.cc",
"forwarding_trace_parser.h",
- "heap_profile_tracker.cc",
- "heap_profile_tracker.h",
"importers/common/args_tracker.cc",
"importers/common/args_tracker.h",
"importers/common/global_args_tracker.cc",
@@ -121,8 +119,14 @@
"importers/ninja/ninja_log_parser.h",
"importers/proto/args_table_utils.cc",
"importers/proto/args_table_utils.h",
+ "importers/proto/heap_profile_tracker.cc",
+ "importers/proto/heap_profile_tracker.h",
+ "importers/proto/metadata_tracker.cc",
+ "importers/proto/metadata_tracker.h",
"importers/proto/packet_sequence_state.cc",
"importers/proto/packet_sequence_state.h",
+ "importers/proto/perf_sample_tracker.cc",
+ "importers/proto/perf_sample_tracker.h",
"importers/proto/profile_module.cc",
"importers/proto/profile_module.h",
"importers/proto/profile_packet_utils.cc",
@@ -134,6 +138,8 @@
"importers/proto/proto_trace_parser.h",
"importers/proto/proto_trace_tokenizer.cc",
"importers/proto/proto_trace_tokenizer.h",
+ "importers/proto/stack_profile_tracker.cc",
+ "importers/proto/stack_profile_tracker.h",
"importers/proto/track_event_module.cc",
"importers/proto/track_event_module.h",
"importers/proto/track_event_parser.cc",
@@ -142,14 +148,8 @@
"importers/proto/track_event_tokenizer.h",
"importers/syscalls/syscall_tracker.h",
"importers/systrace/systrace_line.h",
- "metadata_tracker.cc",
- "metadata_tracker.h",
- "perf_sample_tracker.cc",
- "perf_sample_tracker.h",
"slice_tracker.cc",
"slice_tracker.h",
- "stack_profile_tracker.cc",
- "stack_profile_tracker.h",
"status_macros.h",
"timestamped_trace_piece.h",
"trace_blob_view.h",
@@ -376,12 +376,12 @@
"clock_tracker_unittest.cc",
"event_tracker_unittest.cc",
"forwarding_trace_parser_unittest.cc",
- "heap_profile_tracker_unittest.cc",
"importers/common/process_tracker_unittest.cc",
"importers/fuchsia/fuchsia_trace_utils_unittest.cc",
"importers/proto/args_table_utils_unittest.cc",
"importers/proto/heap_graph_tracker_unittest.cc",
"importers/proto/heap_graph_walker_unittest.cc",
+ "importers/proto/heap_profile_tracker_unittest.cc",
"importers/proto/proto_trace_parser_unittest.cc",
"importers/syscalls/syscall_tracker_unittest.cc",
"importers/systrace/systrace_parser_unittest.cc",
diff --git a/src/trace_processor/dynamic/experimental_flamegraph_generator.cc b/src/trace_processor/dynamic/experimental_flamegraph_generator.cc
index 872ce35..cc6aa4b 100644
--- a/src/trace_processor/dynamic/experimental_flamegraph_generator.cc
+++ b/src/trace_processor/dynamic/experimental_flamegraph_generator.cc
@@ -18,8 +18,8 @@
#include "perfetto/ext/base/string_utils.h"
-#include "src/trace_processor/heap_profile_tracker.h"
#include "src/trace_processor/importers/proto/heap_graph_tracker.h"
+#include "src/trace_processor/importers/proto/heap_profile_tracker.h"
#include "src/trace_processor/types/trace_processor_context.h"
namespace perfetto {
diff --git a/src/trace_processor/export_json_unittest.cc b/src/trace_processor/export_json_unittest.cc
index b7fc0a3..f3a05e9 100644
--- a/src/trace_processor/export_json_unittest.cc
+++ b/src/trace_processor/export_json_unittest.cc
@@ -28,7 +28,7 @@
#include "src/trace_processor/importers/common/args_tracker.h"
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/importers/common/track_tracker.h"
-#include "src/trace_processor/metadata_tracker.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/types/trace_processor_context.h"
#include "test/gtest_and_gmock.h"
diff --git a/src/trace_processor/importers/proto/android_probes_parser.cc b/src/trace_processor/importers/proto/android_probes_parser.cc
index d34d54a..3873371 100644
--- a/src/trace_processor/importers/proto/android_probes_parser.cc
+++ b/src/trace_processor/importers/proto/android_probes_parser.cc
@@ -22,8 +22,8 @@
#include "src/trace_processor/event_tracker.h"
#include "src/trace_processor/importers/common/args_tracker.h"
#include "src/trace_processor/importers/common/process_tracker.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/syscalls/syscall_tracker.h"
-#include "src/trace_processor/metadata_tracker.h"
#include "src/trace_processor/types/trace_processor_context.h"
#include "protos/perfetto/common/android_log_constants.pbzero.h"
diff --git a/src/trace_processor/heap_profile_tracker.cc b/src/trace_processor/importers/proto/heap_profile_tracker.cc
similarity index 99%
rename from src/trace_processor/heap_profile_tracker.cc
rename to src/trace_processor/importers/proto/heap_profile_tracker.cc
index b4f6194..721b923 100644
--- a/src/trace_processor/heap_profile_tracker.cc
+++ b/src/trace_processor/importers/proto/heap_profile_tracker.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/heap_profile_tracker.h"
+#include "src/trace_processor/importers/proto/heap_profile_tracker.h"
#include "perfetto/base/logging.h"
#include "src/trace_processor/importers/common/process_tracker.h"
diff --git a/src/trace_processor/heap_profile_tracker.h b/src/trace_processor/importers/proto/heap_profile_tracker.h
similarity index 90%
rename from src/trace_processor/heap_profile_tracker.h
rename to src/trace_processor/importers/proto/heap_profile_tracker.h
index 17bc18c..91cfe72 100644
--- a/src/trace_processor/heap_profile_tracker.h
+++ b/src/trace_processor/importers/proto/heap_profile_tracker.h
@@ -14,23 +14,21 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_HEAP_PROFILE_TRACKER_H_
-#define SRC_TRACE_PROCESSOR_HEAP_PROFILE_TRACKER_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_HEAP_PROFILE_TRACKER_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_HEAP_PROFILE_TRACKER_H_
#include <set>
#include <unordered_map>
#include "perfetto/ext/base/optional.h"
-#include "src/trace_processor/stack_profile_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/storage/trace_storage.h"
namespace perfetto {
namespace trace_processor {
-std::unique_ptr<tables::ExperimentalFlamegraphNodesTable> BuildNativeFlamegraph(
- TraceStorage* storage,
- UniquePid upid,
- int64_t timestamp);
+std::unique_ptr<tables::ExperimentalFlamegraphNodesTable>
+BuildNativeFlamegraph(TraceStorage* storage, UniquePid upid, int64_t timestamp);
class TraceProcessorContext;
@@ -118,4 +116,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_HEAP_PROFILE_TRACKER_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_HEAP_PROFILE_TRACKER_H_
diff --git a/src/trace_processor/heap_profile_tracker_unittest.cc b/src/trace_processor/importers/proto/heap_profile_tracker_unittest.cc
similarity index 98%
rename from src/trace_processor/heap_profile_tracker_unittest.cc
rename to src/trace_processor/importers/proto/heap_profile_tracker_unittest.cc
index 55ce380..1a4e493 100644
--- a/src/trace_processor/heap_profile_tracker_unittest.cc
+++ b/src/trace_processor/importers/proto/heap_profile_tracker_unittest.cc
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-#include "src/trace_processor/heap_profile_tracker.h"
+#include "src/trace_processor/importers/proto/heap_profile_tracker.h"
-#include "src/trace_processor/stack_profile_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/types/trace_processor_context.h"
#include "test/gtest_and_gmock.h"
diff --git a/src/trace_processor/metadata_tracker.cc b/src/trace_processor/importers/proto/metadata_tracker.cc
similarity index 97%
rename from src/trace_processor/metadata_tracker.cc
rename to src/trace_processor/importers/proto/metadata_tracker.cc
index 29f70fb..757ac1a 100644
--- a/src/trace_processor/metadata_tracker.cc
+++ b/src/trace_processor/importers/proto/metadata_tracker.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/metadata_tracker.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/types/trace_processor_context.h"
diff --git a/src/trace_processor/metadata_tracker.h b/src/trace_processor/importers/proto/metadata_tracker.h
similarity index 90%
rename from src/trace_processor/metadata_tracker.h
rename to src/trace_processor/importers/proto/metadata_tracker.h
index 3afc752..b2ecda3 100644
--- a/src/trace_processor/metadata_tracker.h
+++ b/src/trace_processor/importers/proto/metadata_tracker.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_METADATA_TRACKER_H_
-#define SRC_TRACE_PROCESSOR_METADATA_TRACKER_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_METADATA_TRACKER_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_METADATA_TRACKER_H_
#include "src/trace_processor/storage/trace_storage.h"
@@ -58,4 +58,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_METADATA_TRACKER_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_METADATA_TRACKER_H_
diff --git a/src/trace_processor/importers/proto/packet_sequence_state.h b/src/trace_processor/importers/proto/packet_sequence_state.h
index 9aa833c..1bd9cae 100644
--- a/src/trace_processor/importers/proto/packet_sequence_state.h
+++ b/src/trace_processor/importers/proto/packet_sequence_state.h
@@ -24,7 +24,7 @@
#include "perfetto/base/compiler.h"
#include "perfetto/protozero/proto_decoder.h"
-#include "src/trace_processor/stack_profile_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/storage/trace_storage.h"
#include "src/trace_processor/trace_blob_view.h"
#include "src/trace_processor/types/trace_processor_context.h"
diff --git a/src/trace_processor/perf_sample_tracker.cc b/src/trace_processor/importers/proto/perf_sample_tracker.cc
similarity index 97%
rename from src/trace_processor/perf_sample_tracker.cc
rename to src/trace_processor/importers/proto/perf_sample_tracker.cc
index 4ce39a1..3016bf5 100644
--- a/src/trace_processor/perf_sample_tracker.cc
+++ b/src/trace_processor/importers/proto/perf_sample_tracker.cc
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "src/trace_processor/perf_sample_tracker.h"
+#include "src/trace_processor/importers/proto/perf_sample_tracker.h"
#include <vector>
diff --git a/src/trace_processor/perf_sample_tracker.h b/src/trace_processor/importers/proto/perf_sample_tracker.h
similarity index 86%
rename from src/trace_processor/perf_sample_tracker.h
rename to src/trace_processor/importers/proto/perf_sample_tracker.h
index 5d9c548..81dd73e 100644
--- a/src/trace_processor/perf_sample_tracker.h
+++ b/src/trace_processor/importers/proto/perf_sample_tracker.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_PERF_SAMPLE_TRACKER_H_
-#define SRC_TRACE_PROCESSOR_PERF_SAMPLE_TRACKER_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PERF_SAMPLE_TRACKER_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PERF_SAMPLE_TRACKER_H_
#include <stdint.h>
@@ -47,4 +47,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_PERF_SAMPLE_TRACKER_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_PERF_SAMPLE_TRACKER_H_
diff --git a/src/trace_processor/importers/proto/profile_module.cc b/src/trace_processor/importers/proto/profile_module.cc
index 696b7df..f9df4a4 100644
--- a/src/trace_processor/importers/proto/profile_module.cc
+++ b/src/trace_processor/importers/proto/profile_module.cc
@@ -21,7 +21,7 @@
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
#include "src/trace_processor/importers/proto/profile_packet_utils.h"
-#include "src/trace_processor/stack_profile_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/storage/trace_storage.h"
#include "src/trace_processor/tables/profiler_tables.h"
#include "src/trace_processor/timestamped_trace_piece.h"
diff --git a/src/trace_processor/importers/proto/profile_packet_utils.h b/src/trace_processor/importers/proto/profile_packet_utils.h
index 79c63bf..8b32126 100644
--- a/src/trace_processor/importers/proto/profile_packet_utils.h
+++ b/src/trace_processor/importers/proto/profile_packet_utils.h
@@ -20,7 +20,7 @@
#include "perfetto/ext/base/optional.h"
#include "perfetto/ext/base/string_view.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
-#include "src/trace_processor/stack_profile_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "protos/perfetto/trace/interned_data/interned_data.pbzero.h"
#include "protos/perfetto/trace/profiling/profile_common.pbzero.h"
diff --git a/src/trace_processor/importers/proto/proto_trace_parser.cc b/src/trace_processor/importers/proto/proto_trace_parser.cc
index 12dce71..dc2c3f6 100644
--- a/src/trace_processor/importers/proto/proto_trace_parser.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser.cc
@@ -31,17 +31,17 @@
#include "perfetto/trace_processor/status.h"
#include "src/trace_processor/clock_tracker.h"
#include "src/trace_processor/event_tracker.h"
-#include "src/trace_processor/heap_profile_tracker.h"
#include "src/trace_processor/importers/common/args_tracker.h"
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/importers/common/track_tracker.h"
#include "src/trace_processor/importers/ftrace/ftrace_module.h"
+#include "src/trace_processor/importers/proto/heap_profile_tracker.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/proto/packet_sequence_state.h"
+#include "src/trace_processor/importers/proto/perf_sample_tracker.h"
#include "src/trace_processor/importers/proto/profile_packet_utils.h"
-#include "src/trace_processor/metadata_tracker.h"
-#include "src/trace_processor/perf_sample_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/slice_tracker.h"
-#include "src/trace_processor/stack_profile_tracker.h"
#include "src/trace_processor/storage/metadata.h"
#include "src/trace_processor/timestamped_trace_piece.h"
#include "src/trace_processor/types/trace_processor_context.h"
diff --git a/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
index c7dc6f0..745638e 100644
--- a/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
+++ b/src/trace_processor/importers/proto/proto_trace_parser_unittest.cc
@@ -27,10 +27,10 @@
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/importers/common/track_tracker.h"
#include "src/trace_processor/importers/ftrace/sched_event_tracker.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/proto/proto_trace_parser.h"
-#include "src/trace_processor/metadata_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/slice_tracker.h"
-#include "src/trace_processor/stack_profile_tracker.h"
#include "src/trace_processor/storage/metadata.h"
#include "src/trace_processor/storage/trace_storage.h"
#include "src/trace_processor/trace_sorter.h"
diff --git a/src/trace_processor/stack_profile_tracker.cc b/src/trace_processor/importers/proto/stack_profile_tracker.cc
similarity index 99%
rename from src/trace_processor/stack_profile_tracker.cc
rename to src/trace_processor/importers/proto/stack_profile_tracker.cc
index 2edd915..aa996c9 100644
--- a/src/trace_processor/stack_profile_tracker.cc
+++ b/src/trace_processor/importers/proto/stack_profile_tracker.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "src/trace_processor/stack_profile_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/types/trace_processor_context.h"
diff --git a/src/trace_processor/stack_profile_tracker.h b/src/trace_processor/importers/proto/stack_profile_tracker.h
similarity index 96%
rename from src/trace_processor/stack_profile_tracker.h
rename to src/trace_processor/importers/proto/stack_profile_tracker.h
index 1f7198c..27ae226 100644
--- a/src/trace_processor/stack_profile_tracker.h
+++ b/src/trace_processor/importers/proto/stack_profile_tracker.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef SRC_TRACE_PROCESSOR_STACK_PROFILE_TRACKER_H_
-#define SRC_TRACE_PROCESSOR_STACK_PROFILE_TRACKER_H_
+#ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_STACK_PROFILE_TRACKER_H_
+#define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_STACK_PROFILE_TRACKER_H_
#include <deque>
#include <unordered_map>
@@ -227,4 +227,4 @@
} // namespace trace_processor
} // namespace perfetto
-#endif // SRC_TRACE_PROCESSOR_STACK_PROFILE_TRACKER_H_
+#endif // SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_STACK_PROFILE_TRACKER_H_
diff --git a/src/trace_processor/importers/proto/system_probes_parser.cc b/src/trace_processor/importers/proto/system_probes_parser.cc
index 115b17b..7ce17f4 100644
--- a/src/trace_processor/importers/proto/system_probes_parser.cc
+++ b/src/trace_processor/importers/proto/system_probes_parser.cc
@@ -21,8 +21,8 @@
#include "perfetto/protozero/proto_decoder.h"
#include "src/trace_processor/event_tracker.h"
#include "src/trace_processor/importers/common/process_tracker.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/syscalls/syscall_tracker.h"
-#include "src/trace_processor/metadata_tracker.h"
#include "src/trace_processor/storage/metadata.h"
#include "src/trace_processor/types/trace_processor_context.h"
diff --git a/src/trace_processor/trace_processor_context.cc b/src/trace_processor/trace_processor_context.cc
index 3a8a71e..67d29f7 100644
--- a/src/trace_processor/trace_processor_context.cc
+++ b/src/trace_processor/trace_processor_context.cc
@@ -20,19 +20,19 @@
#include "src/trace_processor/clock_tracker.h"
#include "src/trace_processor/event_tracker.h"
#include "src/trace_processor/forwarding_trace_parser.h"
-#include "src/trace_processor/heap_profile_tracker.h"
#include "src/trace_processor/importers/common/args_tracker.h"
#include "src/trace_processor/importers/common/global_args_tracker.h"
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/importers/common/track_tracker.h"
#include "src/trace_processor/importers/ftrace/ftrace_module.h"
+#include "src/trace_processor/importers/proto/heap_profile_tracker.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
+#include "src/trace_processor/importers/proto/perf_sample_tracker.h"
#include "src/trace_processor/importers/proto/proto_importer_module.h"
#include "src/trace_processor/importers/proto/proto_trace_parser.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/importers/proto/track_event_module.h"
-#include "src/trace_processor/metadata_tracker.h"
-#include "src/trace_processor/perf_sample_tracker.h"
#include "src/trace_processor/slice_tracker.h"
-#include "src/trace_processor/stack_profile_tracker.h"
#include "src/trace_processor/trace_sorter.h"
#include "src/trace_processor/types/destructible.h"
diff --git a/src/trace_processor/trace_processor_impl.cc b/src/trace_processor/trace_processor_impl.cc
index 12c9398..8df1822 100644
--- a/src/trace_processor/trace_processor_impl.cc
+++ b/src/trace_processor/trace_processor_impl.cc
@@ -34,8 +34,8 @@
#include "src/trace_processor/importers/gzip/gzip_trace_parser.h"
#include "src/trace_processor/importers/json/json_trace_parser.h"
#include "src/trace_processor/importers/json/json_trace_tokenizer.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
#include "src/trace_processor/importers/systrace/systrace_trace_parser.h"
-#include "src/trace_processor/metadata_tracker.h"
#include "src/trace_processor/sqlite/span_join_operator_table.h"
#include "src/trace_processor/sqlite/sql_stats_table.h"
#include "src/trace_processor/sqlite/sqlite3_str_split.h"
diff --git a/src/trace_processor/trace_processor_storage_impl.cc b/src/trace_processor/trace_processor_storage_impl.cc
index 2c827d3..e09f6d8 100644
--- a/src/trace_processor/trace_processor_storage_impl.cc
+++ b/src/trace_processor/trace_processor_storage_impl.cc
@@ -21,16 +21,16 @@
#include "src/trace_processor/default_modules.h"
#include "src/trace_processor/event_tracker.h"
#include "src/trace_processor/forwarding_trace_parser.h"
-#include "src/trace_processor/heap_profile_tracker.h"
#include "src/trace_processor/importers/common/args_tracker.h"
#include "src/trace_processor/importers/common/process_tracker.h"
#include "src/trace_processor/importers/common/track_tracker.h"
+#include "src/trace_processor/importers/proto/heap_profile_tracker.h"
+#include "src/trace_processor/importers/proto/metadata_tracker.h"
+#include "src/trace_processor/importers/proto/perf_sample_tracker.h"
#include "src/trace_processor/importers/proto/proto_importer_module.h"
#include "src/trace_processor/importers/proto/proto_trace_tokenizer.h"
-#include "src/trace_processor/metadata_tracker.h"
-#include "src/trace_processor/perf_sample_tracker.h"
+#include "src/trace_processor/importers/proto/stack_profile_tracker.h"
#include "src/trace_processor/slice_tracker.h"
-#include "src/trace_processor/stack_profile_tracker.h"
#include "src/trace_processor/trace_blob_view.h"
#include "src/trace_processor/trace_sorter.h"