perfetto: add option to disable ext descriptor and use in report test (#5335)

This CL adds an option, similar to the other builtin data sources, to
disable dumping the extension descriptor into the trace. We then use
this in the reporter CTS test which is currently failing because the
extension descriptor is causing the trace to be too big.

Author: LalitMaganti

include/perfetto/public/protos/config/trace_config.pzc.h

@@ -640,6 +640,11 @@ PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
                   bool,
                   disable_chunk_usage_histograms,
                   8);
+PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_BuiltinDataSource,
+                  VARINT,
+                  bool,
+                  disable_extension_descriptors,
+                  9);
 
 PERFETTO_PB_MSG(perfetto_protos_TraceConfig_DataSource);
 PERFETTO_PB_FIELD(perfetto_protos_TraceConfig_DataSource,

include/perfetto/public/protos/trace/interned_data/interned_data.pzc.h

@@ -34,6 +34,7 @@ PERFETTO_PB_MSG_DECL(perfetto_protos_EventCategory);
 PERFETTO_PB_MSG_DECL(perfetto_protos_EventName);
 PERFETTO_PB_MSG_DECL(perfetto_protos_Frame);
 PERFETTO_PB_MSG_DECL(perfetto_protos_HistogramName);
+PERFETTO_PB_MSG_DECL(perfetto_protos_InternedGpuCounterDescriptor);
 PERFETTO_PB_MSG_DECL(perfetto_protos_InternedGpuRenderStageSpecification);
 PERFETTO_PB_MSG_DECL(perfetto_protos_InternedGraphicsContext);
 PERFETTO_PB_MSG_DECL(perfetto_protos_InternedString);
@@ -238,5 +239,10 @@ PERFETTO_PB_FIELD(perfetto_protos_InternedData,
                   perfetto_protos_AndroidJobName,
                   android_job_name,
                   44);
+PERFETTO_PB_FIELD(perfetto_protos_InternedData,
+                  MSG,
+                  perfetto_protos_InternedGpuCounterDescriptor,
+                  gpu_counter_descriptors,
+                  47);
 
 #endif  // INCLUDE_PERFETTO_PUBLIC_PROTOS_TRACE_INTERNED_DATA_INTERNED_DATA_PZC_H_

include/perfetto/public/protos/trace/trace_packet.pzc.h

@@ -56,6 +56,7 @@ PERFETTO_PB_MSG_DECL(perfetto_protos_GenericKernelProcessTree);
 PERFETTO_PB_MSG_DECL(perfetto_protos_GenericKernelTaskRenameEvent);
 PERFETTO_PB_MSG_DECL(perfetto_protos_GenericKernelTaskStateEvent);
 PERFETTO_PB_MSG_DECL(perfetto_protos_GpuCounterEvent);
+PERFETTO_PB_MSG_DECL(perfetto_protos_GpuInfo);
 PERFETTO_PB_MSG_DECL(perfetto_protos_GpuLog);
 PERFETTO_PB_MSG_DECL(perfetto_protos_GpuMemTotalEvent);
 PERFETTO_PB_MSG_DECL(perfetto_protos_GpuRenderStageEvent);
@@ -402,6 +403,11 @@ PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
                   perfetto_protos_AndroidAflags,
                   android_aflags,
                   127);
+PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
+                  MSG,
+                  perfetto_protos_GpuInfo,
+                  gpu_info,
+                  128);
 PERFETTO_PB_FIELD(perfetto_protos_TracePacket,
                   MSG,
                   perfetto_protos_ModuleSymbols,

protos/perfetto/config/perfetto_config.proto

@@ -4695,6 +4695,9 @@ message TraceConfig {
 
     // Disables the reporting of per-trace-writer histograms in TraceStats.
     optional bool disable_chunk_usage_histograms = 8;
+
+    // Disable emitting extension descriptors into the trace.
+    optional bool disable_extension_descriptors = 9;
   }
   optional BuiltinDataSource builtin_data_sources = 20;
 

protos/perfetto/config/trace_config.proto

@@ -172,6 +172,9 @@ message TraceConfig {
 
     // Disables the reporting of per-trace-writer histograms in TraceStats.
     optional bool disable_chunk_usage_histograms = 8;
+
+    // Disable emitting extension descriptors into the trace.
+    optional bool disable_extension_descriptors = 9;
   }
   optional BuiltinDataSource builtin_data_sources = 20;
 

protos/perfetto/trace/perfetto_trace.proto

@@ -4695,6 +4695,9 @@ message TraceConfig {
 
     // Disables the reporting of per-trace-writer histograms in TraceStats.
     optional bool disable_chunk_usage_histograms = 8;
+
+    // Disable emitting extension descriptors into the trace.
+    optional bool disable_extension_descriptors = 9;
   }
   optional BuiltinDataSource builtin_data_sources = 20;
 

python/perfetto/protos/perfetto/trace/perfetto_trace_pb2.py

@@ -2676,7 +2676,10 @@ std::vector<TracePacket> TracingServiceImpl::ReadBuffers(
   }
   if (!tracing_session->did_emit_initial_packets) {
     EmitUuid(tracing_session, &packets);
-    EmitExtensionDescriptors(tracing_session, &packets);
+    if (!tracing_session->config.builtin_data_sources()
+             .disable_extension_descriptors()) {
+      EmitExtensionDescriptors(tracing_session, &packets);
+    }
     EmitTraceProvenance(tracing_session, &packets);
     if (!tracing_session->config.builtin_data_sources().disable_system_info()) {
       EmitSystemInfo(&packets);

python/perfetto/protos/perfetto/trace/perfetto_trace_pb2.pyi

@@ -49,6 +49,7 @@ TEST(PerfettoReporterTest, TestEndToEndReport) {
   builtin->set_disable_system_info(true);
   builtin->set_disable_service_events(true);
   builtin->set_disable_chunk_usage_histograms(true);
+  builtin->set_disable_extension_descriptors(true);
 
   auto* ds_config = trace_config.add_data_sources()->mutable_config();
   ds_config->set_name("android.perfetto.FakeProducer");