Remove experimental_apollo_metrics_generation_mode

apollographql · Aug 27, 2024 · 144d54e · 144d54e
1 parent daa082e
commit 144d54e
Show file tree

Hide file tree

Showing 15 changed files with 344 additions and 994 deletions.
diff --git a/.changesets/config_apollo_telemetry_config_rename.md b/.changesets/config_apollo_telemetry_config_rename.md
@@ -1,9 +1,9 @@
 ###  ([#5807](https://github.com/apollographql/router/pull/5807))
 
 All known issues related to the new Apollo usage report generation have been resolved so we are renaming some experimental options to be non-experimental.
-* experimental_apollo_metrics_generation_mode is now apollo_metrics_generation_mode
-* telemetry.apollo.experimental_apollo_signature_normalization_algorithm is now telemetry.apollo.signature_normalization_algorithm
-* telemetry.apollo.experimental_apollo_metrics_reference_mode is now telemetry.apollo.metrics_reference_mode
+* `experimental_apollo_metrics_generation_mode` is now `apollo_metrics_generation_mode`
+* `telemetry.apollo.experimental_apollo_signature_normalization_algorithm` is now `telemetry.apollo.signature_normalization_algorithm`
+* `telemetry.apollo.experimental_apollo_metrics_reference_mode` has been removed since the Rust implementation has been the default for a few versions and it is generating reports identical to the router-bridge implementation
 
 Previous configuration will warn but still work.
 

diff --git a/apollo-federation/tests/query_plan/build_query_plan_tests.rs b/apollo-federation/tests/query_plan/build_query_plan_tests.rs
@@ -542,75 +542,19 @@ fn key_where_at_external_is_not_at_top_level_of_selection_of_requires() {
           }
         "#,
         @r###"
-        QueryPlan {
-          Sequence {
-            Fetch(service: "A") {
-              {
-                u {
-                  __typename
-                  k1 {
-                    id
-                  }
-                }
-              }
-            },
-            Flatten(path: "u") {
-              Fetch(service: "B") {
-                {
-                  ... on U {
-                    __typename
-                    k1 {
-                      id
-                    }
-                  }
-                } =>
-                {
-                  ... on U {
-                    k2
-                  }
-                }
-              },
-            },
-            Flatten(path: "u") {
-              Fetch(service: "C") {
-                {
-                  ... on U {
-                    __typename
-                    k2
-                  }
-                } =>
-                {
-                  ... on U {
-                    v {
-                      v
-                    }
-                  }
-                }
-              },
-            },
-            Flatten(path: "u") {
-              Fetch(service: "B") {
-                {
-                  ... on U {
-                    __typename
-                    v {
-                      v
-                    }
-                    k1 {
-                      id
-                    }
-                  }
-                } =>
-                {
-                  ... on U {
-                    f
-                  }
-                }
-              },
-            },
-          },
+    QueryPlan {
+      Fetch(service: "A") {
+        {
+          u {
+            __typename
+            k1 {
+              id
+            }
+          }
         }
-      "###
+      },
+    }
+    "###
     );
 }