@apollo/gateway 2.0.0-alpha.5 → 2.0.0-alpha.6

package/src/__tests__/build-query-plan.feature

@@ -27,6 +27,7 @@ Scenario: should not confuse union types with overlapping field names
         "kind": "Fetch",
         "serviceName": "documents",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{body{__typename ...on Image{attributes{url}}...on Text{attributes{bold text}}}}"
       }
     }
@@ -51,6 +52,7 @@ Scenario: should use a single fetch when requesting a root field from one servic
         "kind": "Fetch",
         "serviceName": "accounts",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{me{name{first}}}"
       }
     }
@@ -81,6 +83,7 @@ Scenario: should use two independent fetches when requesting root fields from tw
             "kind": "Fetch",
             "serviceName": "accounts",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{me{name{first}}}"
           },
           {
@@ -90,6 +93,7 @@ Scenario: should use two independent fetches when requesting root fields from tw
                 "kind": "Fetch",
                 "serviceName": "product",
                 "variableUsages": [],
+                "operationKind": "query",
                 "operation": "{topProducts{__typename ...on Book{__typename isbn}...on Furniture{name}}}"
               },
               {
@@ -109,6 +113,7 @@ Scenario: should use two independent fetches when requesting root fields from tw
                     }
                   ],
                   "variableUsages": [],
+                  "operationKind": "query",
                   "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{title year}}}"
                 }
               },
@@ -131,6 +136,7 @@ Scenario: should use two independent fetches when requesting root fields from tw
                     }
                   ],
                   "variableUsages": [],
+                  "operationKind": "query",
                   "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{name}}}"
                 }
               }
@@ -164,6 +170,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
             "kind": "Fetch",
             "serviceName": "product",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topProducts{__typename ...on Book{__typename isbn}...on Furniture{name}}product(upc:\"1\"){__typename ...on Book{__typename isbn}...on Furniture{name}}}"
           },
           {
@@ -189,6 +196,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
                         }
                       ],
                       "variableUsages": [],
+                      "operationKind": "query",
                       "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{title year}}}"
                     }
                   },
@@ -211,6 +219,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
                         }
                       ],
                       "variableUsages": [],
+                      "operationKind": "query",
                       "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{name}}}"
                     }
                   }
@@ -236,6 +245,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
                         }
                       ],
                       "variableUsages": [],
+                      "operationKind": "query",
                       "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{title year}}}"
                     }
                   },
@@ -258,6 +268,7 @@ Scenario: should use a single fetch when requesting multiple root fields from th
                         }
                       ],
                       "variableUsages": [],
+                      "operationKind": "query",
                       "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{name}}}"
                     }
                   }
@@ -292,6 +303,7 @@ Scenario: should use a single fetch when requesting relationship subfields from
         "kind": "Fetch",
         "serviceName": "reviews",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{topReviews{body author{reviews{body}}}}"
       }
     }
@@ -320,6 +332,7 @@ Scenario: should use a single fetch when requesting relationship subfields and p
         "kind": "Fetch",
         "serviceName": "reviews",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{topReviews{body author{id reviews{body}}}}"
       }
     }
@@ -350,6 +363,7 @@ Scenario: when requesting an extension field from another service, it should add
             "kind": "Fetch",
             "serviceName": "accounts",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{me{__typename id name{first}}}"
           },
           {
@@ -369,6 +383,7 @@ Scenario: when requesting an extension field from another service, it should add
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{body}}}}"
             }
           }
@@ -399,6 +414,7 @@ Scenario: when requesting an extension field from another service, when the pare
             "kind": "Fetch",
             "serviceName": "accounts",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{me{__typename id}}"
           },
           {
@@ -418,6 +434,7 @@ Scenario: when requesting an extension field from another service, when the pare
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{body}}}}"
             }
           }
@@ -449,6 +466,7 @@ Scenario: when requesting an extension field from another service, should only a
             "kind": "Fetch",
             "serviceName": "accounts",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{me{__typename id}}"
           },
           {
@@ -468,6 +486,7 @@ Scenario: when requesting an extension field from another service, should only a
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{body}numberOfReviews}}}"
             }
           }
@@ -501,6 +520,7 @@ Scenario: when requesting a composite field with subfields from another service,
             "kind": "Fetch",
             "serviceName": "reviews",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topReviews{body author{__typename id}}}"
           },
           {
@@ -520,6 +540,7 @@ Scenario: when requesting a composite field with subfields from another service,
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name{first}}}}"
             }
           }
@@ -548,6 +569,7 @@ Scenario: when requesting a composite field with subfields from another service,
             "kind": "Fetch",
             "serviceName": "product",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topCars{__typename id price}}"
           },
           {
@@ -568,6 +590,7 @@ Scenario: when requesting a composite field with subfields from another service,
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Car{retailPrice}}}"
             }
           }
@@ -600,6 +623,7 @@ Scenario: when requesting a composite field with subfields from another service,
             "kind": "Fetch",
             "serviceName": "reviews",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topReviews{author{__typename id}}}"
           },
           {
@@ -619,6 +643,7 @@ Scenario: when requesting a composite field with subfields from another service,
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{name{first}}}}"
             }
           }
@@ -649,6 +674,7 @@ Scenario: when requesting a relationship field with extension subfields from a d
             "kind": "Fetch",
             "serviceName": "reviews",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topReviews{author{__typename id}}}"
           },
           {
@@ -668,6 +694,7 @@ Scenario: when requesting a relationship field with extension subfields from a d
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{birthDate}}}"
             }
           }
@@ -693,6 +720,7 @@ Scenario: for abstract types, it should add __typename when fetching objects of
         "kind": "Fetch",
         "serviceName": "product",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{topProducts{__typename price}}"
       }
     }
@@ -721,6 +749,7 @@ Scenario: should break up when traversing an extension field on an interface typ
             "kind": "Fetch",
             "serviceName": "product",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{topProducts{__typename price ...on Book{__typename isbn}...on Furniture{__typename upc}}}"
           },
           {
@@ -748,6 +777,7 @@ Scenario: should break up when traversing an extension field on an interface typ
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{reviews{body}}...on Furniture{reviews{body}}}}"
             }
           }
@@ -781,6 +811,7 @@ Scenario: interface fragments should expand into possible types only
             "kind": "Fetch",
             "serviceName": "books",
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "{books{__typename isbn title year}}"
           },
           {
@@ -802,6 +833,7 @@ Scenario: interface fragments should expand into possible types only
                 }
               ],
               "variableUsages": [],
+              "operationKind": "query",
               "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{name}}}"
             }
           }
@@ -829,6 +861,7 @@ Scenario: interface inside interface should expand into possible types only
         "kind": "Fetch",
         "serviceName": "product",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{product(upc:\"\"){__typename details{__typename country}}}"
       }
     }
@@ -870,6 +903,7 @@ Scenario: should properly expand nested unions with inline fragments
         "kind": "Fetch",
         "serviceName": "documents",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{body{__typename ...on Image{attributes{url}}...on Text{attributes{bold}}}}"
       }
     }
@@ -912,6 +946,7 @@ Scenario: deduplicates fields / selections regardless of adjacency and type cond
         "kind": "Fetch",
         "serviceName": "documents",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{body{__typename ...on Text{attributes{bold text}}}}"
       }
     }
@@ -947,6 +982,7 @@ Scenario: deduplicates fields / selections regardless of adjacency and type cond
         "kind": "Fetch",
         "serviceName": "documents",
         "variableUsages": [],
+        "operationKind": "query",
         "operation": "{body{__typename ...on Text{attributes{bold text}}}}"
       }
     }
@@ -972,6 +1008,7 @@ Scenario: supports basic, single-service mutation
         "username",
         "password"
       ],
+      "operationKind": "mutation",
       "operation": "mutation($username:String!$password:String!){login(username:$username password:$password){id}}"
     }
   }
@@ -1005,6 +1042,7 @@ Scenario: supports mutations with a cross-service request
             "username",
             "password"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($username:String!$password:String!){login(username:$username password:$password){__typename id}}"
         },
         {
@@ -1032,6 +1070,7 @@ Scenario: supports mutations with a cross-service request
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{product{__typename ...on Book{__typename isbn}...on Furniture{upc}}}}}}"
           }
         },
@@ -1063,6 +1102,7 @@ Scenario: supports mutations with a cross-service request
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{upc}}}"
           }
         }
@@ -1097,6 +1137,7 @@ Scenario: returning across service boundaries
             "upc",
             "body"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($upc:String!$body:String!){reviewProduct(input:{upc:$upc body:$body}){__typename ...on Furniture{__typename upc}}}"
         },
         {
@@ -1124,6 +1165,7 @@ Scenario: returning across service boundaries
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Furniture{name}}}"
           }
         }
@@ -1170,6 +1212,7 @@ Scenario: supports multiple root mutations
             "username",
             "password"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($username:String!$password:String!){login(username:$username password:$password){__typename id}}"
         },
         {
@@ -1197,6 +1240,7 @@ Scenario: supports multiple root mutations
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{product{__typename ...on Book{__typename isbn}...on Furniture{upc}}}}}}"
           }
         },
@@ -1228,6 +1272,7 @@ Scenario: supports multiple root mutations
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{upc}}}"
           }
         },
@@ -1238,6 +1283,7 @@ Scenario: supports multiple root mutations
             "upc",
             "body"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($upc:String!$body:String!){reviewProduct(input:{upc:$upc body:$body}){__typename ...on Furniture{__typename upc}}}"
         },
         {
@@ -1265,6 +1311,7 @@ Scenario: supports multiple root mutations
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Furniture{name}}}"
           }
         }
@@ -1319,6 +1366,7 @@ Scenario: multiple root mutations with correct service order
             "body",
             "updatedReview"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($upc:String!$body:String!$updatedReview:UpdateReviewInput!){reviewProduct(input:{upc:$upc body:$body}){__typename ...on Furniture{upc}}updateReview(review:$updatedReview){id body}}"
         },
         {
@@ -1328,6 +1376,7 @@ Scenario: multiple root mutations with correct service order
             "username",
             "password"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($username:String!$password:String!){login(username:$username password:$password){__typename id}}"
         },
         {
@@ -1355,6 +1404,7 @@ Scenario: multiple root mutations with correct service order
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on User{reviews{product{__typename ...on Book{__typename isbn}...on Furniture{upc}}}}}}"
           }
         },
@@ -1386,6 +1436,7 @@ Scenario: multiple root mutations with correct service order
               }
             ],
             "variableUsages": [],
+            "operationKind": "query",
             "operation": "query($representations:[_Any!]!){_entities(representations:$representations){...on Book{upc}}}"
           }
         },
@@ -1395,6 +1446,7 @@ Scenario: multiple root mutations with correct service order
           "variableUsages": [
             "reviewId"
           ],
+          "operationKind": "mutation",
           "operation": "mutation($reviewId:ID!){deleteReview(id:$reviewId)}"
         }
       ]

package/src/__tests__/integration/nockMocks.ts

@@ -121,9 +121,10 @@ export function mockSupergraphSdlRequestSuccessIfAfter(
 }
 
 export function mockSupergraphSdlRequestIfAfterUnchanged(
-    ifAfter: string | null = null,
+  ifAfter: string | null = null,
+  url: string = mockCloudConfigUrl1,
 ) {
-  return mockSupergraphSdlRequestIfAfter(ifAfter).reply(
+  return mockSupergraphSdlRequestIfAfter(ifAfter, url).reply(
       200,
       JSON.stringify({
         data: {

package/src/index.ts

@@ -402,7 +402,7 @@ export class ApolloGateway implements GraphQLService {
           apiKey: this.apolloConfig!.key!,
           uplinkEndpoints,
           maxRetries:
-            this.config.uplinkMaxRetries ?? uplinkEndpoints.length * 3,
+            this.config.uplinkMaxRetries ?? uplinkEndpoints.length * 3 - 1, // -1 for the initial request
           subgraphHealthCheck: this.config.serviceHealthCheck,
           fetcher: this.fetcher,
           logger: this.logger,
@@ -1127,3 +1127,6 @@ export {
   SupergraphSdlHook,
   SupergraphManager
 } from './config';
+
+export { UplinkFetcherError } from "./supergraphManagers"
+

package/src/supergraphManagers/LegacyFetcher/index.ts

@@ -219,7 +219,7 @@ export class LegacyFetcher implements SupergraphManager {
 
   private logUpdateFailure(e: any) {
     this.config.logger?.error(
-      'UplinkFetcher failed to update supergraph with the following error: ' +
+      'LegacyFetcher failed to update supergraph with the following error: ' +
         (e.message ?? e),
     );
   }

package/src/supergraphManagers/LocalCompose/index.ts

@@ -72,7 +72,7 @@ export class LocalCompose implements SupergraphManager {
 
   private logUpdateFailure(e: any) {
     this.config.logger?.error(
-      'UplinkFetcher failed to update supergraph with the following error: ' +
+      'LocalCompose failed to update supergraph with the following error: ' +
         (e.message ?? e),
     );
   }

package/src/supergraphManagers/UplinkFetcher/__tests__/loadSupergraphSdlFromStorage.test.ts

@@ -1,6 +1,7 @@
 import {
   loadSupergraphSdlFromStorage,
-  loadSupergraphSdlFromUplinks
+  loadSupergraphSdlFromUplinks,
+  UplinkFetcherError,
 } from '../loadSupergraphSdlFromStorage';
 import { getDefaultFetcher } from '../../..';
 import {
@@ -62,7 +63,8 @@ describe('loadSupergraphSdlFromStorage', () => {
       errorReportingEndpoint: undefined,
       fetcher,
       compositionId: "originalId-1234",
-      maxRetries: 1
+      maxRetries: 1,
+      roundRobinSeed: 0,
     });
 
     expect(result).toMatchObject({
@@ -84,10 +86,13 @@ describe('loadSupergraphSdlFromStorage', () => {
         errorReportingEndpoint: undefined,
         fetcher,
         compositionId: "originalId-1234",
-        maxRetries: 1
+        maxRetries: 1,
+        roundRobinSeed: 0,
       }),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"An error occurred while fetching your schema from Apollo: 500 Internal Server Error"`,
+    ).rejects.toThrowError(
+      new UplinkFetcherError(
+        "An error occurred while fetching your schema from Apollo: 500 Internal Server Error",
+      )
     );
   })
 
@@ -105,8 +110,10 @@ describe('loadSupergraphSdlFromStorage', () => {
           fetcher,
           compositionId: null,
         }),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"An error occurred while fetching your schema from Apollo: 200 invalid json response body at https://example1.cloud-config-url.com/cloudconfig/ reason: Unexpected token I in JSON at position 0"`,
+      ).rejects.toThrowError(
+        new UplinkFetcherError(
+          "An error occurred while fetching your schema from Apollo: 200 invalid json response body at https://example1.cloud-config-url.com/cloudconfig/ reason: Unexpected token I in JSON at position 0"
+        )
       );
     });
 
@@ -129,7 +136,9 @@ describe('loadSupergraphSdlFromStorage', () => {
           fetcher,
           compositionId: null,
         }),
-      ).rejects.toThrowError(message);
+      ).rejects.toThrowError(
+        new UplinkFetcherError(`An error occurred while fetching your schema from Apollo: \n${message}`)
+      );
     });
 
     it("throws on non-OK status codes when `errors` isn't present in a JSON response", async () => {
@@ -146,8 +155,10 @@ describe('loadSupergraphSdlFromStorage', () => {
           fetcher,
           compositionId: null,
         }),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"An error occurred while fetching your schema from Apollo: 500 Internal Server Error"`,
+      ).rejects.toThrowError(
+        new UplinkFetcherError(
+          "An error occurred while fetching your schema from Apollo: 500 Internal Server Error"
+        )
       );
     });
 
@@ -166,8 +177,10 @@ describe('loadSupergraphSdlFromStorage', () => {
           fetcher,
           compositionId: null,
         }),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"An error occurred while fetching your schema from Apollo: 400 invalid json response body at https://example1.cloud-config-url.com/cloudconfig/ reason: Unexpected end of JSON input"`,
+      ).rejects.toThrowError(
+        new UplinkFetcherError(
+          "An error occurred while fetching your schema from Apollo: 400 invalid json response body at https://example1.cloud-config-url.com/cloudconfig/ reason: Unexpected end of JSON input",
+        )
       );
     });
 
@@ -185,8 +198,10 @@ describe('loadSupergraphSdlFromStorage', () => {
           fetcher,
           compositionId: null,
         }),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"An error occurred while fetching your schema from Apollo: 400 invalid json response body at https://example1.cloud-config-url.com/cloudconfig/ reason: Unexpected end of JSON input"`,
+      ).rejects.toThrowError(
+        new UplinkFetcherError(
+          "An error occurred while fetching your schema from Apollo: 400 invalid json response body at https://example1.cloud-config-url.com/cloudconfig/ reason: Unexpected end of JSON input",
+        )
       );
     });
 
@@ -204,8 +219,10 @@ describe('loadSupergraphSdlFromStorage', () => {
           fetcher,
           compositionId: null,
         }),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"An error occurred while fetching your schema from Apollo: 413 Payload Too Large"`,
+      ).rejects.toThrowError(
+        new UplinkFetcherError(
+          "An error occurred while fetching your schema from Apollo: 413 Payload Too Large",
+        )
       );
     });
 
@@ -223,8 +240,10 @@ describe('loadSupergraphSdlFromStorage', () => {
           fetcher,
           compositionId: null,
         }),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"An error occurred while fetching your schema from Apollo: 422 Unprocessable Entity"`,
+      ).rejects.toThrowError(
+        new UplinkFetcherError(
+          "An error occurred while fetching your schema from Apollo: 422 Unprocessable Entity",
+        )
       );
     });
 
@@ -242,8 +261,10 @@ describe('loadSupergraphSdlFromStorage', () => {
           fetcher,
           compositionId: null,
         }),
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"An error occurred while fetching your schema from Apollo: 408 Request Timeout"`,
+      ).rejects.toThrowError(
+        new UplinkFetcherError(
+          "An error occurred while fetching your schema from Apollo: 408 Request Timeout",
+        )
       );
     });
   });
@@ -263,8 +284,10 @@ describe('loadSupergraphSdlFromStorage', () => {
         fetcher,
         compositionId: null,
       }),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"An error occurred while fetching your schema from Apollo: 504 Gateway Timeout"`,
+    ).rejects.toThrowError(
+      new UplinkFetcherError(
+        "An error occurred while fetching your schema from Apollo: 504 Gateway Timeout",
+      )
     );
   });
 
@@ -282,8 +305,10 @@ describe('loadSupergraphSdlFromStorage', () => {
         fetcher,
         compositionId: null,
       }),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"An error occurred while fetching your schema from Apollo: request to https://example1.cloud-config-url.com/cloudconfig/ failed, reason: no response"`,
+    ).rejects.toThrowError(
+      new UplinkFetcherError(
+        "An error occurred while fetching your schema from Apollo: request to https://example1.cloud-config-url.com/cloudconfig/ failed, reason: no response",
+      )
     );
   });
 
@@ -301,8 +326,10 @@ describe('loadSupergraphSdlFromStorage', () => {
         fetcher,
         compositionId: null,
       }),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"An error occurred while fetching your schema from Apollo: 502 Bad Gateway"`,
+    ).rejects.toThrowError(
+      new UplinkFetcherError(
+        "An error occurred while fetching your schema from Apollo: 502 Bad Gateway",
+      )
     );
   });
 
@@ -320,8 +347,10 @@ describe('loadSupergraphSdlFromStorage', () => {
         fetcher,
         compositionId: null,
       }),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `"An error occurred while fetching your schema from Apollo: 503 Service Unavailable"`,
+    ).rejects.toThrowError(
+      new UplinkFetcherError(
+        "An error occurred while fetching your schema from Apollo: 503 Service Unavailable",
+      )
     );
   });
 
@@ -341,3 +370,28 @@ describe('loadSupergraphSdlFromStorage', () => {
   });
 });
 
+
+describe("loadSupergraphSdlFromUplinks", () => {
+  beforeEach(nockBeforeEach);
+  afterEach(nockAfterEach);
+
+  it("doesn't retry in the unchanged / null case", async () => {
+    mockSupergraphSdlRequestIfAfterUnchanged("id-1234", mockCloudConfigUrl1);
+
+    const fetcher = jest.fn(getDefaultFetcher());
+    const result = await loadSupergraphSdlFromUplinks({
+      graphRef,
+      apiKey,
+      endpoints: [mockCloudConfigUrl1, mockCloudConfigUrl2],
+      errorReportingEndpoint: mockOutOfBandReporterUrl,
+      fetcher: fetcher as any,
+      compositionId: "id-1234",
+      maxRetries: 5,
+      roundRobinSeed: 0,
+    });
+
+    expect(result).toBeNull();
+    expect(fetcher).toHaveBeenCalledTimes(1);
+  });
+});
+

package/src/supergraphManagers/UplinkFetcher/index.ts

@@ -30,6 +30,7 @@ export class UplinkFetcher implements SupergraphManager {
   private errorReportingEndpoint: string | undefined =
     process.env.APOLLO_OUT_OF_BAND_REPORTER_ENDPOINT ?? undefined;
   private compositionId?: string;
+  private fetchCount: number = 0;
 
   constructor(options: UplinkFetcherOptions) {
     this.config = options;
@@ -81,6 +82,7 @@ export class UplinkFetcher implements SupergraphManager {
       fetcher: this.config.fetcher,
       compositionId: this.compositionId ?? null,
       maxRetries: this.config.maxRetries,
+      roundRobinSeed: this.fetchCount++,
     });
 
     if (!result) {