From adc5c9fe0676f72ef0cafc5f11d073a559c3c764 Mon Sep 17 00:00:00 2001
From: Eric Zorn <zornwebdev@gmail.com>
Date: Mon, 6 Jan 2025 18:42:13 -0500
Subject: [PATCH] fix: router config

---
 apps/services/apollo-router/router-prod.yaml     | 7 ++++++-
 apps/services/apollo-router/supergraph-prod.yaml | 6 ------
 graphql/router-dev.yaml                          | 6 +++++-
 graphql/supergraph-dev.yaml                      | 6 ------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/apps/services/apollo-router/router-prod.yaml b/apps/services/apollo-router/router-prod.yaml
index 13c9afc..f5e9ef0 100644
--- a/apps/services/apollo-router/router-prod.yaml
+++ b/apps/services/apollo-router/router-prod.yaml
@@ -15,7 +15,12 @@ sandbox:
 homepage:
   enabled: false
 include_subgraph_errors:
-  all: true # Propagate errors from all subgraphs
+  all: true
+telemetry:
+  instrumentation:
+    spans:
+      mode: spec_compliant
+
 plugins:
   experimental.expose_query_plan: true
 
diff --git a/apps/services/apollo-router/supergraph-prod.yaml b/apps/services/apollo-router/supergraph-prod.yaml
index 9176365..88ca21f 100644
--- a/apps/services/apollo-router/supergraph-prod.yaml
+++ b/apps/services/apollo-router/supergraph-prod.yaml
@@ -5,9 +5,3 @@ subgraphs:
     routing_url: http://accounts-graphql-prod.internal:8080/graphql  # <- can be omitted if the same as introspection URL
     schema:
       subgraph_url: http://localhost:3003/graphql
-include_subgraph_errors:
-  all: true
-telemetry:
-  instrumentation:
-    spans:
-      mode: spec_compliant
diff --git a/graphql/router-dev.yaml b/graphql/router-dev.yaml
index d51338e..dc1a550 100644
--- a/graphql/router-dev.yaml
+++ b/graphql/router-dev.yaml
@@ -15,7 +15,11 @@ sandbox:
 homepage:
   enabled: true
 include_subgraph_errors:
-  all: true # Propagate errors from all subgraphs
+  all: true
+telemetry:
+  instrumentation:
+    spans:
+      mode: spec_compliant
 plugins:
   experimental.expose_query_plan: true
 
diff --git a/graphql/supergraph-dev.yaml b/graphql/supergraph-dev.yaml
index 55ac7d5..2c098fb 100644
--- a/graphql/supergraph-dev.yaml
+++ b/graphql/supergraph-dev.yaml
@@ -5,9 +5,3 @@ subgraphs:
     routing_url: http://accounts-graphql:3000/graphql  # <- can be omitted if the same as introspection URL
     schema:
       subgraph_url: http://localhost:3003/graphql
-include_subgraph_errors:
-  all: true
-telemetry:
-  instrumentation:
-    spans:
-      mode: spec_compliant