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

#50)

* chore(deps): update ghcr.io/apollographql/router docker tag to v1.53.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

@@ -32,6 +32,10 @@
       "description": "#/definitions/CSRFConfig",
       "$ref": "#/definitions/CSRFConfig"
     },
+    "demand_control": {
+      "description": "#/definitions/DemandControlConfig",
+      "$ref": "#/definitions/DemandControlConfig"
+    },
     "experimental_apollo_metrics_generation_mode": {
       "description": "#/definitions/ApolloMetricsGenerationMode",
       "$ref": "#/definitions/ApolloMetricsGenerationMode"
@@ -85,10 +89,6 @@
       "description": "#/definitions/Plugins",
       "$ref": "#/definitions/Plugins"
     },
-    "preview_demand_control": {
-      "description": "#/definitions/DemandControlConfig",
-      "$ref": "#/definitions/DemandControlConfig"
-    },
     "preview_entity_cache": {
       "description": "#/definitions/Config7",
       "$ref": "#/definitions/Config7"
@@ -1677,15 +1677,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,
+            "parse_query": true,
             "request": true,
-            "subgraph": true,
-            "supergraph": true,
             "query_planning": true,
-            "parse_query": true,
             "router": true,
+            "http_request": true,
             "execution": true,
-            "subgraph_request": true
+            "supergraph": true,
+            "subgraph_request": true,
+            "subgraph": true
           },
           "type": "object",
           "additionalProperties": {
@@ -1816,7 +1816,6 @@
       "description": "Configuration for entity caching",
       "type": "object",
       "required": [
-        "redis",
         "subgraph"
       ],
       "properties": {
@@ -1825,14 +1824,15 @@
           "default": false,
           "type": "boolean"
         },
+        "invalidation": {
+          "description": "#/definitions/InvalidationEndpointConfig",
+          "$ref": "#/definitions/InvalidationEndpointConfig",
+          "nullable": true
+        },
         "metrics": {
           "description": "#/definitions/Metrics",
           "$ref": "#/definitions/Metrics"
         },
-        "redis": {
-          "description": "#/definitions/RedisCache",
-          "$ref": "#/definitions/RedisCache"
-        },
         "subgraph": {
           "description": "#/definitions/SubgraphConfiguration_for_Subgraph",
           "$ref": "#/definitions/SubgraphConfiguration_for_Subgraph"
@@ -2292,6 +2292,17 @@
         "disabled"
       ]
     },
+    "DisplayTraceIdFormat": {
+      "anyOf": [
+        {
+          "description": "#/definitions/TraceIdFormat",
+          "$ref": "#/definitions/TraceIdFormat"
+        },
+        {
+          "type": "boolean"
+        }
+      ]
+    },
     "Enabled": {
       "type": "string",
       "enum": [
@@ -2705,8 +2716,8 @@
           "type": "boolean"
         },
         "format": {
-          "description": "#/definitions/TraceIdFormat2",
-          "$ref": "#/definitions/TraceIdFormat2"
+          "description": "#/definitions/TraceIdFormat",
+          "$ref": "#/definitions/TraceIdFormat"
         },
         "header_name": {
           "description": "Choose the header name to expose trace_id (default: apollo-trace-id)",
@@ -3696,6 +3707,24 @@
       },
       "additionalProperties": false
     },
+    "InvalidationEndpointConfig": {
+      "type": "object",
+      "required": [
+        "listen",
+        "path"
+      ],
+      "properties": {
+        "listen": {
+          "description": "#/definitions/ListenAddr",
+          "$ref": "#/definitions/ListenAddr"
+        },
+        "path": {
+          "description": "Specify on which path you want to listen for invalidation endpoint.",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
     "JWTConf": {
       "type": "object",
       "required": [
@@ -4462,7 +4491,7 @@
       "description": "Query planner modes.",
       "oneOf": [
         {
-          "description": "Use the new Rust-based implementation.",
+          "description": "Use the new Rust-based implementation.\n\nRaises an error at Router startup if the the new planner does not support the schema (such as using legacy Apollo Federation 1)",
           "type": "string",
           "enum": [
             "new"
@@ -4476,11 +4505,18 @@
           ]
         },
         {
-          "description": "Use Rust-based and Javascript-based implementations side by side, logging warnings if the implementations disagree.",
+          "description": "Use primarily the Javascript-based implementation, but also schedule background jobs to run the Rust implementation and compare results, logging warnings if the implementations disagree.\n\nRaises an error at Router startup if the the new planner does not support the schema (such as using legacy Apollo Federation 1)",
           "type": "string",
           "enum": [
             "both"
           ]
+        },
+        {
+          "description": "Use primarily the Javascript-based implementation, but also schedule on a best-effort basis background jobs to run the Rust implementation and compare results, logging warnings if the implementations disagree.\n\nFalls back to `legacy` with a warning if the the new planner does not support the schema (such as using legacy Apollo Federation 1)",
+          "type": "string",
+          "enum": [
+            "both_best_effort"
+          ]
         }
       ]
     },
@@ -4697,6 +4733,10 @@
         "header_name"
       ],
       "properties": {
+        "format": {
+          "description": "#/definitions/TraceIdFormat",
+          "$ref": "#/definitions/TraceIdFormat"
+        },
         "header_name": {
           "description": "Choose the header name to expose trace_id (default: apollo-trace-id)",
           "type": "string"
@@ -5650,14 +5690,25 @@
       "properties": {
         "enabled": {
           "description": "activates caching for this subgraph, overrides the global configuration",
-          "type": "boolean",
+          "default": true,
+          "type": "boolean"
+        },
+        "invalidation": {
+          "description": "#/definitions/SubgraphInvalidationConfig",
+          "$ref": "#/definitions/SubgraphInvalidationConfig",
           "nullable": true
         },
         "private_id": {
           "description": "Context key used to separate cache sections per user",
+          "default": null,
           "type": "string",
           "nullable": true
         },
+        "redis": {
+          "description": "#/definitions/RedisCache",
+          "$ref": "#/definitions/RedisCache",
+          "nullable": true
+        },
         "ttl": {
           "description": "#/definitions/Ttl",
           "$ref": "#/definitions/Ttl",
@@ -5857,6 +5908,22 @@
       },
       "additionalProperties": false
     },
+    "SubgraphInvalidationConfig": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "description": "Enable the invalidation",
+          "default": false,
+          "type": "boolean"
+        },
+        "shared_key": {
+          "description": "Shared key needed to request the invalidation endpoint",
+          "default": "",
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
     "SubgraphPassthroughMode": {
       "type": "object",
       "properties": {
@@ -7163,28 +7230,17 @@
     "TraceIdFormat": {
       "oneOf": [
         {
-          "description": "Open Telemetry trace ID, a hex string.",
+          "description": "Format the Trace ID as a hexadecimal number\n\n(e.g. Trace ID 16 -> 00000000000000000000000000000010)",
           "type": "string",
           "enum": [
-            "open_telemetry"
+            "hexadecimal"
           ]
         },
-        {
-          "description": "Datadog trace ID, a u64.",
-          "type": "string",
-          "enum": [
-            "datadog"
-          ]
-        }
-      ]
-    },
-    "TraceIdFormat2": {
-      "oneOf": [
         {
           "description": "Format the Trace ID as a hexadecimal number\n\n(e.g. Trace ID 16 -> 00000000000000000000000000000010)",
           "type": "string",
           "enum": [
-            "hexadecimal"
+            "open_telemetry"
           ]
         },
         {
@@ -7200,6 +7256,13 @@
           "enum": [
             "datadog"
           ]
+        },
+        {
+          "description": "UUID format with dashes (eg. 67e55044-10b1-426f-9247-bb680e5fe0c8)",
+          "type": "string",
+          "enum": [
+            "uuid"
+          ]
         }
       ]
     },
@@ -8151,9 +8214,8 @@
                   "type": "boolean"
                 },
                 "display_trace_id": {
-                  "description": "Include the trace id (if any) with the log event. (default: true)",
-                  "default": true,
-                  "type": "boolean"
+                  "description": "#/definitions/DisplayTraceIdFormat",
+                  "$ref": "#/definitions/DisplayTraceIdFormat"
                 }
               },
               "additionalProperties": false
@@ -8249,9 +8311,8 @@
                   "type": "boolean"
                 },
                 "display_trace_id": {
-                  "description": "Include the trace id (if any) with the log event. (default: false)",
-                  "default": false,
-                  "type": "boolean"
+                  "description": "#/definitions/DisplayTraceIdFormat",
+                  "$ref": "#/definitions/DisplayTraceIdFormat"
                 }
               },
               "additionalProperties": false

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/apollographql/router:v1.52.1
+FROM ghcr.io/apollographql/router:v1.53.0
 
 COPY router.yaml /config.yaml