Fix usage reporting of enum values in deferred requests

apollo-router/src/apollo_studio_interop/mod.rs

@@ -285,18 +285,17 @@ pub(crate) fn extract_enums_from_response(
     operation_name: Option<&str>,
     schema: &Valid<Schema>,
     response_body: &Object,
-) -> ReferencedEnums {
-    let mut result = ReferencedEnums::new();
+    existing_refs: &mut ReferencedEnums,
+) {
     if let Some(operation) = query.operation(operation_name) {
         extract_enums_from_selection_set(
             &operation.selection_set,
             &query.fragments,
             schema,
             response_body,
-            &mut result,
+            existing_refs,
         );
     }
-    result
 }
 
 fn add_enum_value_to_map(

apollo-router/src/apollo_studio_interop/tests.rs

@@ -130,12 +130,15 @@ fn enums_from_response(
     let query = Query::parse(query_str, operation_name, &schema, &config).unwrap();
     let response_body: Object = serde_json::from_str(response_body_str).unwrap();
 
+    let mut result = ReferencedEnums::new();
     extract_enums_from_response(
         Arc::new(query),
         operation_name,
         schema.supergraph_schema(),
         &response_body,
-    )
+        &mut result,
+    );
+    result
 }
 
 #[test(tokio::test)]

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

@@ -1528,9 +1528,11 @@ impl Telemetry {
                     .extensions()
                     .with_lock(|lock| lock.get::<ExtendedReferenceStats>().cloned())
                     .unwrap_or_default();
+                // Clear the enum values from responses when we send them in a report so that we properly report enum response
+                // values for deferred responses and subscriptions.
                 let enum_response_references = context
                     .extensions()
-                    .with_lock(|lock| lock.get::<ReferencedEnums>().cloned())
+                    .with_lock(|mut lock| lock.remove::<ReferencedEnums>())
                     .unwrap_or_default();
 
                 SingleStatsReport {

apollo-router/src/services/execution/service.rs

@@ -353,16 +353,20 @@ impl ExecutionService {
 
             nullified_paths.extend(paths);
 
-            let referenced_enums = if let (ApolloMetricsReferenceMode::Extended, Some(Value::Object(response_body))) = (metrics_ref_mode, &response.data) {
+            let mut referenced_enums = context
+                .extensions()
+                .with_lock(|lock| lock.get::<ReferencedEnums>().cloned())
+                .unwrap_or_default();
+            if let (ApolloMetricsReferenceMode::Extended, Some(Value::Object(response_body))) = (metrics_ref_mode, &response.data) {
                 extract_enums_from_response(
                     query.clone(),
                     operation_name,
                     schema.api_schema(),
                     response_body,
+                    &mut referenced_enums,
                 )
-            } else {
-                ReferencedEnums::new()
             };
+
             context
                     .extensions()
                     .with_lock(|mut lock| lock.insert::<ReferencedEnums>(referenced_enums));