Protobuf update

Make code changes to router to allow it to compile with the new protobuf. This does not actually add the eventual functionality required to fill out the new fields, but does update the snapshots.
apollographql · May 3, 2024 · c3bc8df · c3bc8df
1 parent 624e545
commit c3bc8df
Show file tree

Hide file tree

Showing 29 changed files with 121 additions and 7 deletions.
diff --git a/...pshots/apollo_router__plugins__telemetry__metrics__apollo__studio__test__aggregation.snap b/...pshots/apollo_router__plugins__telemetry__metrics__apollo__studio__test__aggregation.snap
@@ -12,14 +12,16 @@ expression: aggregated_metrics
             "client_name": "client_1",
             "client_version": "version_1",
             "operation_type": "",
-            "operation_subtype": ""
+            "operation_subtype": "",
+            "result": ""
           },
           {
             "context": {
               "client_name": "client_1",
               "client_version": "version_1",
               "operation_type": "",
-              "operation_subtype": ""
+              "operation_subtype": "",
+              "result": ""
             },
             "query_latency_stats": {
               "request_latencies": {

diff --git a/apollo-router/src/plugins/telemetry/metrics/apollo/studio.rs b/apollo-router/src/plugins/telemetry/metrics/apollo/studio.rs
@@ -192,8 +192,11 @@ impl From<ContextualizedStats>
                 .into_iter()
                 .map(|(k, v)| (k, v.into()))
                 .collect(),
+            local_per_type_stat: Default::default(),
+            limits_stats: None,
             query_latency_stats: Some(stats.query_latency_stats.into()),
             context: Some(stats.context),
+            operation_count: 0,
         }
     }
 }
@@ -333,6 +336,7 @@ mod test {
                             client_version: client_version.to_string(),
                             operation_type: String::new(),
                             operation_subtype: String::new(),
+                            result: String::new(),
                         },
                         query_latency_stats: SingleQueryLatencyStats {
                             latency: Duration::from_secs(1),

diff --git a/...o_router__plugins__telemetry__metrics__apollo__test__apollo_metrics_for_subscription.snap b/...o_router__plugins__telemetry__metrics__apollo__test__apollo_metrics_for_subscription.snap
@@ -12,7 +12,8 @@ expression: results
             "client_name": "test_client",
             "client_version": "1.0-test",
             "operation_type": "subscription",
-            "operation_subtype": "subscription-request"
+            "operation_subtype": "subscription-request",
+            "result": ""
           },
           "query_latency_stats": {
             "latency": {

diff --git a/...er__plugins__telemetry__metrics__apollo__test__apollo_metrics_for_subscription_error.snap b/...er__plugins__telemetry__metrics__apollo__test__apollo_metrics_for_subscription_error.snap
@@ -12,7 +12,8 @@ expression: results
             "client_name": "test_client",
             "client_version": "1.0-test",
             "operation_type": "subscription",
-            "operation_subtype": "subscription-request"
+            "operation_subtype": "subscription-request",
+            "result": ""
           },
           "query_latency_stats": {
             "latency": {

diff --git a/...o_router__plugins__telemetry__metrics__apollo__test__apollo_metrics_single_operation.snap b/...o_router__plugins__telemetry__metrics__apollo__test__apollo_metrics_single_operation.snap
@@ -12,7 +12,8 @@ expression: results
             "client_name": "test_client",
             "client_version": "1.0-test",
             "operation_type": "query",
-            "operation_subtype": ""
+            "operation_subtype": "",
+            "result": ""
           },
           "query_latency_stats": {
             "latency": {

diff --git a/..._router__plugins__telemetry__metrics__apollo__test__apollo_metrics_unknown_operation.snap b/..._router__plugins__telemetry__metrics__apollo__test__apollo_metrics_unknown_operation.snap
@@ -12,7 +12,8 @@ expression: results
             "client_name": "test_client",
             "client_version": "1.0-test",
             "operation_type": "query",
-            "operation_subtype": ""
+            "operation_subtype": "",
+            "result": ""
           },
           "query_latency_stats": {
             "latency": {

diff --git a/apollo-router/src/plugins/telemetry/mod.rs b/apollo-router/src/plugins/telemetry/mod.rs
@@ -1395,6 +1395,7 @@ impl Telemetry {
                                     operation_subtype: operation_subtype
                                         .map(|op| op.to_string())
                                         .unwrap_or_default(),
+                                    result: "".to_string(),
                                 },
                                 query_latency_stats: SingleQueryLatencyStats {
                                     latency: duration,

diff --git a/apollo-router/tests/snapshots/apollo_reports__batch_send_header-2.snap b/apollo-router/tests/snapshots/apollo_reports__batch_send_header-2.snap
@@ -186,6 +186,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -429,6 +430,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -536,6 +538,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -549,6 +552,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
       - start_time:
           seconds: "[seconds]"
           nanos: "[nanos]"
@@ -722,6 +726,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -965,6 +970,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -1072,6 +1078,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -1085,6 +1092,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
     stats_with_context: []
     referenced_fields_by_type: {}
     query_metadata: ~

diff --git a/apollo-router/tests/snapshots/apollo_reports__batch_send_header.snap b/apollo-router/tests/snapshots/apollo_reports__batch_send_header.snap
@@ -186,6 +186,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -429,6 +430,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -536,6 +538,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -549,6 +552,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
       - start_time:
           seconds: "[seconds]"
           nanos: "[nanos]"
@@ -722,6 +726,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -965,6 +970,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -1072,6 +1078,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -1085,6 +1092,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
     stats_with_context: []
     referenced_fields_by_type: {}
     query_metadata: ~

diff --git a/apollo-router/tests/snapshots/apollo_reports__batch_trace_id-2.snap b/apollo-router/tests/snapshots/apollo_reports__batch_trace_id-2.snap
@@ -183,6 +183,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -426,6 +427,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -533,6 +535,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -546,6 +549,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
       - start_time:
           seconds: "[seconds]"
           nanos: "[nanos]"
@@ -716,6 +720,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -959,6 +964,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -1066,6 +1072,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -1079,6 +1086,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
     stats_with_context: []
     referenced_fields_by_type: {}
     query_metadata: ~

diff --git a/apollo-router/tests/snapshots/apollo_reports__batch_trace_id.snap b/apollo-router/tests/snapshots/apollo_reports__batch_trace_id.snap
@@ -183,6 +183,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -426,6 +427,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -533,6 +535,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -546,6 +549,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
       - start_time:
           seconds: "[seconds]"
           nanos: "[nanos]"
@@ -716,6 +720,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -959,6 +964,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -1066,6 +1072,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -1079,6 +1086,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
     stats_with_context: []
     referenced_fields_by_type: {}
     query_metadata: ~

diff --git a/apollo-router/tests/snapshots/apollo_reports__client_name-2.snap b/apollo-router/tests/snapshots/apollo_reports__client_name-2.snap
@@ -183,6 +183,7 @@ traces_per_query:
                         registered_operation: false
                         forbidden_operation: false
                         field_execution_weight: 1
+                        limits: ~
                       sent_time_offset: "[sent_time_offset]"
                       sent_time:
                         seconds: "[seconds]"
@@ -426,6 +427,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -533,6 +535,7 @@ traces_per_query:
                               registered_operation: false
                               forbidden_operation: false
                               field_execution_weight: 1
+                              limits: ~
                             sent_time_offset: "[sent_time_offset]"
                             sent_time:
                               seconds: "[seconds]"
@@ -546,6 +549,7 @@ traces_per_query:
         registered_operation: false
         forbidden_operation: false
         field_execution_weight: 1
+        limits: ~
     stats_with_context: []
     referenced_fields_by_type: {}
     query_metadata: ~