From 9b5aee7b2f412b401ab09889ef5f35740daddd1a Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:20:33 -0700
Subject: [PATCH] chore(deps): update ghcr.io/apollographql/router docker tag
 to v1.59.0 (#64)

* chore(deps): update ghcr.io/apollographql/router docker tag to v1.59.0

* Update router config schema

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .apollo/router_config_schema.json | 79 ++++++++++++++++++++++++-------
 Dockerfile                        |  2 +-
 2 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/.apollo/router_config_schema.json b/.apollo/router_config_schema.json
index 39b0341..ea4aade 100644
--- a/.apollo/router_config_schema.json
+++ b/.apollo/router_config_schema.json
@@ -49,6 +49,10 @@
       "default": false,
       "type": "boolean"
     },
+    "fleet_detector": {
+      "description": "#/definitions/Conf4",
+      "$ref": "#/definitions/Conf4"
+    },
     "forbid_mutations": {
       "description": "#/definitions/ForbidMutationsConfig",
       "$ref": "#/definitions/ForbidMutationsConfig"
@@ -74,8 +78,8 @@
       "$ref": "#/definitions/Config"
     },
     "override_subgraph_url": {
-      "description": "#/definitions/Conf4",
-      "$ref": "#/definitions/Conf4"
+      "description": "#/definitions/Conf5",
+      "$ref": "#/definitions/Conf5"
     },
     "persisted_queries": {
       "description": "#/definitions/PersistedQueries",
@@ -98,8 +102,8 @@
       "$ref": "#/definitions/Config8"
     },
     "rhai": {
-      "description": "#/definitions/Conf5",
-      "$ref": "#/definitions/Conf5"
+      "description": "#/definitions/Conf6",
+      "$ref": "#/definitions/Conf6"
     },
     "sandbox": {
       "description": "#/definitions/Sandbox",
@@ -114,8 +118,8 @@
       "$ref": "#/definitions/Supergraph"
     },
     "telemetry": {
-      "description": "#/definitions/Conf6",
-      "$ref": "#/definitions/Conf6"
+      "description": "#/definitions/Conf7",
+      "$ref": "#/definitions/Conf7"
     },
     "tls": {
       "description": "#/definitions/Tls",
@@ -1375,6 +1379,9 @@
       "additionalProperties": false
     },
     "Conf4": {
+      "type": "object"
+    },
+    "Conf5": {
       "description": "Subgraph URL mappings",
       "anyOf": [
         {
@@ -1386,7 +1393,7 @@
         }
       ]
     },
-    "Conf5": {
+    "Conf6": {
       "description": "Configuration for the Rhai Plugin",
       "type": "object",
       "properties": {
@@ -1403,7 +1410,7 @@
       },
       "additionalProperties": false
     },
-    "Conf6": {
+    "Conf7": {
       "description": "Telemetry configuration",
       "type": "object",
       "properties": {
@@ -1665,15 +1672,15 @@
         "span_metrics": {
           "description": "Which spans will be eligible for span stats to be collected for viewing in the APM view. Defaults to true for `request`, `router`, `query_parsing`, `supergraph`, `execution`, `query_planning`, `subgraph`, `subgraph_request` and `http_request`.",
           "default": {
-            "http_request": true,
-            "execution": true,
+            "request": true,
+            "parse_query": true,
             "router": true,
-            "subgraph": true,
+            "subgraph_request": true,
+            "http_request": true,
             "supergraph": true,
-            "parse_query": true,
             "query_planning": true,
-            "request": true,
-            "subgraph_request": true
+            "execution": true,
+            "subgraph": true
           },
           "type": "object",
           "additionalProperties": {
@@ -1852,7 +1859,7 @@
           "minimum": 1.0
         },
         "client_name_header": {
-          "description": "The name of the header to extract from requests when populating 'client nane' for traces and metrics in Apollo Studio.",
+          "description": "The name of the header to extract from requests when populating 'client name' for traces and metrics in Apollo Studio.",
           "default": "apollographql-client-name",
           "type": "string",
           "nullable": true
@@ -4581,6 +4588,13 @@
           "enum": [
             "both_best_effort"
           ]
+        },
+        {
+          "description": "Use the new Rust-based implementation but fall back to the legacy one for supergraph schemas composed with legacy Apollo Federation 1.",
+          "type": "string",
+          "enum": [
+            "new_best_effort"
+          ]
         }
       ]
     },
@@ -5814,6 +5828,11 @@
     "SubgraphAttributes": {
       "type": "object",
       "properties": {
+        "http.request.resend_count": {
+          "description": "#/definitions/StandardAttribute",
+          "$ref": "#/definitions/StandardAttribute",
+          "nullable": true
+        },
         "subgraph.graphql.document": {
           "description": "#/definitions/StandardAttribute",
           "$ref": "#/definitions/StandardAttribute",
@@ -6308,6 +6327,24 @@
           },
           "additionalProperties": false
         },
+        {
+          "type": "object",
+          "required": [
+            "subgraph_resend_count"
+          ],
+          "properties": {
+            "default": {
+              "description": "#/definitions/AttributeValue",
+              "$ref": "#/definitions/AttributeValue",
+              "nullable": true
+            },
+            "subgraph_resend_count": {
+              "description": "The subgraph http resend count",
+              "type": "boolean"
+            }
+          },
+          "additionalProperties": false
+        },
         {
           "type": "object",
           "required": [
@@ -6691,7 +6728,7 @@
           "type": "boolean"
         },
         "experimental_reuse_query_fragments": {
-          "description": "Enable reuse of query fragments Default: depends on the federation version",
+          "description": "Enable reuse of query fragments This feature is deprecated and will be removed in next release. The config can only be set when the legacy query planner is explicitly enabled.",
           "default": null,
           "type": "boolean",
           "nullable": true
@@ -7807,6 +7844,11 @@
     "extendable_attribute_apollo_router::plugins::telemetry::config_new::attributes::SubgraphAttributes_apollo_router::plugins::telemetry::config_new::conditional::Conditional<apollo_router::plugins::telemetry::config_new::selectors::SubgraphSelector>": {
       "type": "object",
       "properties": {
+        "http.request.resend_count": {
+          "description": "#/definitions/StandardAttribute",
+          "$ref": "#/definitions/StandardAttribute",
+          "nullable": true
+        },
         "subgraph.graphql.document": {
           "description": "#/definitions/StandardAttribute",
           "$ref": "#/definitions/StandardAttribute",
@@ -7836,6 +7878,11 @@
     "extendable_attribute_apollo_router::plugins::telemetry::config_new::attributes::SubgraphAttributes_apollo_router::plugins::telemetry::config_new::selectors::SubgraphSelector": {
       "type": "object",
       "properties": {
+        "http.request.resend_count": {
+          "description": "#/definitions/StandardAttribute",
+          "$ref": "#/definitions/StandardAttribute",
+          "nullable": true
+        },
         "subgraph.graphql.document": {
           "description": "#/definitions/StandardAttribute",
           "$ref": "#/definitions/StandardAttribute",
diff --git a/Dockerfile b/Dockerfile
index 8fea5d9..9b033f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/apollographql/router:v1.58.1
+FROM ghcr.io/apollographql/router:v1.59.0
 
 COPY router.yaml /config.yaml