Log subscriptions

Author: smyrick

router/router.yaml

@@ -25,10 +25,6 @@ subscription:
         reviews:
           protocol: graphql_ws
 
-telemetry:
-  instrumentation:
-    spans:
-      mode: spec_compliant
 
 # Enable health check endpoint on all interfaces
 health_check:

scripts/port-forward-utils.sh

@@ -10,9 +10,11 @@
 # =============================================================================
 
 # Source shared utilities
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/utils.sh"
-source "$SCRIPT_DIR/config.sh"
+if [ -z "$SCRIPT_DIR" ]; then
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+fi
+source "$SCRIPT_DIR/scripts/utils.sh"
+source "$SCRIPT_DIR/scripts/config.sh"
 
 # Configuration (now from config)
 NAMESPACE=$(get_k8s_namespace)

scripts/test-utils.sh

@@ -10,9 +10,11 @@
 # =============================================================================
 
 # Source shared utilities
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/utils.sh"
-source "$SCRIPT_DIR/config.sh"
+if [ -z "$SCRIPT_DIR" ]; then
+    SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+fi
+source "$SCRIPT_DIR/scripts/utils.sh"
+source "$SCRIPT_DIR/scripts/config.sh"
 
 # Default values (now from config)
 ROUTER_URL=$(get_router_graphql_url | sed 's|/graphql$||')

subgraphs/reviews/resolvers.js

@@ -15,9 +15,14 @@ export const resolvers = {
   Subscription: {
     reviewAdded: {
       subscribe: async function* () {
+        // Log the pod ID when subscription starts
+        const podId = process.env.HOSTNAME || 'unknown';
+        console.log(`🚀 [${podId}] Reviews subscription connection established`);
+        
         let count = 0;
         while (true) {
           const review = REVIEWS[count++];
+          console.log(`📤 [${podId}] Sending review: ${review.id} - ${review.title}`);
           yield { reviewAdded: review };
           await new Promise((resolve) => setTimeout(resolve, 3000));
           if (count === REVIEWS.length) count = 0;

subgraphs/subgraphs.js

@@ -34,6 +34,10 @@ const getLocalSubgraphConfig = (subgraphName) =>
   LOCAL_SUBGRAPH_CONFIG.find(it => it.name === subgraphName);
 
 export const startSubgraphs = async (httpPort) => {
+  // Log pod ID for Kubernetes identification
+  const podId = process.env.HOSTNAME || 'unknown';
+  console.log(`🚀 [${podId}] Starting subgraphs server...`);
+  
   // Create a monolith express app for all subgraphs
   const app = express();
   const httpServer = http.createServer(app);
@@ -66,6 +70,21 @@ export const startSubgraphs = async (httpPort) => {
         server: httpServer,
         path,
       });
+      
+      // Add WebSocket connection logging
+      wsServer.on('connection', (socket, request) => {
+        console.log(`🔌 [${podId}] WebSocket connection established for [${subgraphConfig.name}] subgraph`);
+        console.log(`🔌 [${podId}] Client IP: ${request.socket.remoteAddress}`);
+        
+        socket.on('close', () => {
+          console.log(`🔌 [${podId}] WebSocket connection closed for [${subgraphConfig.name}] subgraph`);
+        });
+        
+        socket.on('error', (error) => {
+          console.log(`❌ [${podId}] WebSocket error for [${subgraphConfig.name}] subgraph:`, error.message);
+        });
+      });
+      
       const serverCleanup = useServer({ schema }, wsServer);
       wsPlugin = {
         async serverWillStart() {
@@ -76,10 +95,10 @@ export const startSubgraphs = async (httpPort) => {
           };
         },
       };
-      console.log(`Setting up WebSocket server for [${subgraphConfig.name}] subgraph at ws://localhost:${serverPort}/${path}`);
+      console.log(`🚀 [${podId}] Setting up WebSocket server for [${subgraphConfig.name}] subgraph at ws://localhost:${serverPort}${path}`);
     }
 
-    console.log(`Setting up HTTP server for [${subgraphConfig.name}] subgraph at http://localhost:${serverPort}${path}`);
+    console.log(`🚀 [${podId}] Setting up HTTP server for [${subgraphConfig.name}] subgraph at http://localhost:${serverPort}${path}`);
 
     const server = new ApolloServer({
       schema,
@@ -110,4 +129,5 @@ export const startSubgraphs = async (httpPort) => {
 
   // Start entire monolith at given port
   await new Promise((resolve) => httpServer.listen({ port: serverPort }, resolve));
+  console.log(`🚀 [${podId}] All subgraphs started and listening on port ${serverPort}`);
 };

test-k8s.sh

@@ -36,6 +36,9 @@ done
 
 show_script_header "Apollo Supergraph Kubernetes Testing" "Testing Apollo Supergraph deployment in minikube"
 
+# Get namespace
+NAMESPACE=$(get_k8s_namespace)
+
 # Check if namespace exists
 if ! namespace_exists "$NAMESPACE"; then
     print_error "Namespace $NAMESPACE does not exist. Please deploy first:"