Maintenance: update reports.proto protobuf definition

NEXT_CHANGELOG.md

@@ -132,6 +132,11 @@ This test was failing frequently due to it being a timing test being run in a si
 
 By [@bryncooke](https://github.com/bryncooke) in https://github.com/apollographql/router/pull/2218
 
+### update reports.proto protobuf definition ([PR #2247](https://github.com/apollographql/router/pull/2247))
+
+Update the reports.proto file, and change the prompt to update the file with the correct new location.
+
+By [@o0Ignition0o](https://github.com/o0Ignition0o) in https://github.com/apollographql/router/pull/2247
 ### Upgrade OpenTelemetry to 0.18 ([Issue #1970](https://github.com/apollographql/router/issues/1970))
 
 Update to OpenTelemetry 0.18.

apollo-router/src/plugins/telemetry/apollo_exporter.rs

@@ -391,6 +391,6 @@ fn check_reports_proto_is_up_to_date() {
     assert!(
         content == include_str!("proto/reports.proto"),
         "Protobuf file is out of date. Run this command to update it:\n\n    \
-            curl -f {proto_url} > apollo-router/src/spaceport/proto/reports.proto\n\n"
+            curl -f {proto_url} > apollo-router/src/plugins/telemetry/proto/reports.proto\n\n"
     );
 }

apollo-router/src/plugins/telemetry/proto/reports.proto

@@ -436,6 +436,13 @@ message Report {
 
   // Total number of operations processed during this period.
   uint64 operation_count = 6;
+
+  // If this is set to true, the stats in TracesWithStats.stats_with_context
+  // represent all of the operations described from this report, and the
+  // traces in TracesWithStats.trace are a sampling of some of the same
+  // operations. If this is false, each operation is described in precisely
+  // one of those two fields.
+  bool traces_pre_aggregated = 7;
 }
 
 message ContextualizedStats {
@@ -447,8 +454,11 @@ message ContextualizedStats {
 
 }
 
-// A sequence of traces and stats. An individual operation should either be described as a trace
-// or as part of stats, but not both.
+// A sequence of traces and stats. If Report.traces_pre_aggregated (at the top
+// level of the report) is false, an individual operation should either be
+// described as a trace or as part of stats, but not both. If that flag
+// is true, then all operations are described as stats and some are also
+// described as traces.
 message TracesAndStats {
   repeated Trace trace = 1 [(js_preEncoded)=true];
   repeated ContextualizedStats stats_with_context = 2 [(js_use_toArray)=true];