Remove stage1-specific URL test (buildBackendURL not in stage2)

Author: odysseus0

backend.go

@@ -755,23 +755,14 @@ func (b *Backend) doForward(ctx context.Context, rpcReqs []*RPCReq, isBatch bool
 		return nil, wrapErr(err, "error creating backend request")
 	}
 
+	// Forward all collected headers (includes URL-derived and request headers)
 	headersToForward := GetHeadersToForward(ctx)
-	if len(headersToForward) != 0 {
-		for k, v := range headersToForward {
-			for _, value := range v {
-				httpReq.Header.Add(k, value)
-			}
+	for k, v := range headersToForward {
+		for _, value := range v {
+			httpReq.Header.Add(k, value)
 		}
 	}
 
-	// Forward original URL context as headers for all methods
-	if path, ok := ctx.Value(ContextKeyPath).(string); ok && path != "" && path != "/" {
-		httpReq.Header.Set("X-Original-Path", path)
-	}
-	if rawQuery, ok := ctx.Value(ContextKeyRawQuery).(string); ok && rawQuery != "" {
-		httpReq.Header.Set("X-Original-Query", rawQuery)
-	}
-
 	if b.authPassword != "" {
 		httpReq.SetBasicAuth(b.authUsername, b.authPassword)
 	}

backend_test.go

@@ -240,25 +240,31 @@ func TestHeaderForwarding(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			// Create context with path and query
+			// Create context with headers to forward (unified approach)
 			ctx := context.Background()
+			headersToForward := make(map[string][]string)
+
 			if tt.path != "" && tt.path != "/" {
-				ctx = context.WithValue(ctx, ContextKeyPath, tt.path)
+				headersToForward["X-Original-Path"] = []string{tt.path}
 			}
 			if tt.query != "" {
-				ctx = context.WithValue(ctx, ContextKeyRawQuery, tt.query)
+				headersToForward["X-Original-Query"] = []string{tt.query}
+			}
+
+			if len(headersToForward) > 0 {
+				ctx = context.WithValue(ctx, ContextKeyHeadersToForward, headersToForward)
 			}
 
 			// Create a mock HTTP request to verify headers are set
 			req, err := http.NewRequestWithContext(ctx, "POST", "http://backend:8080", nil)
 			require.NoError(t, err)
 
 			// Simulate the header forwarding logic from doForward()
-			if path, ok := ctx.Value(ContextKeyPath).(string); ok && path != "" && path != "/" {
-				req.Header.Set("X-Original-Path", path)
-			}
-			if rawQuery, ok := ctx.Value(ContextKeyRawQuery).(string); ok && rawQuery != "" {
-				req.Header.Set("X-Original-Query", rawQuery)
+			headersToForwardFromCtx := GetHeadersToForward(ctx)
+			for k, v := range headersToForwardFromCtx {
+				for _, value := range v {
+					req.Header.Add(k, value)
+				}
 			}
 
 			// Verify the expected headers are set correctly

backend_url_edge_cases_test.go

@@ -39,8 +39,6 @@ const (
 	ContextKeyOpTxProxyAuth                         = "op_txproxy_auth"
 	ContextKeyInteropValidationStrategy             = "interop_validation_strategy"
 	ContextKeyHeadersToForward                      = "headers_to_forward"
-	ContextKeyRawQuery                              = "raw_query"
-	ContextKeyPath                                  = "path"
 	DefaultOpTxProxyAuthHeader                      = "X-Optimism-Signature"
 	FlashbotsAuthHeader                             = "X-Flashbots-Signature"
 	DefaultMaxBatchRPCCallsLimit                    = 100
@@ -782,10 +780,6 @@ func (s *Server) populateContext(w http.ResponseWriter, r *http.Request) context
 
 	ctx := context.WithValue(r.Context(), ContextKeyXForwardedFor, xff) // nolint:staticcheck
 
-	// Store query parameters and path for forwarding to backend
-	ctx = context.WithValue(ctx, ContextKeyRawQuery, r.URL.RawQuery) // nolint:staticcheck
-	ctx = context.WithValue(ctx, ContextKeyPath, r.URL.Path)         // nolint:staticcheck
-
 	opTxProxyAuth := r.Header.Get(DefaultOpTxProxyAuthHeader)
 	if opTxProxyAuth != "" {
 		ctx = context.WithValue(ctx, ContextKeyOpTxProxyAuth, opTxProxyAuth) // nolint:staticcheck
@@ -802,19 +796,26 @@ func (s *Server) populateContext(w http.ResponseWriter, r *http.Request) context
 		ctx = context.WithValue(ctx, ContextKeyAuth, s.authenticatedPaths[authorization]) // nolint:staticcheck
 	}
 
-	if len(s.allowedDynamicHeaders) > 0 {
-		filteredHeaderValues := make(map[string][]string)
-		for _, h := range s.allowedDynamicHeaders {
-			values := r.Header.Values(h)
-			if len(values) > 0 {
-				filteredHeaderValues[h] = values
-			}
-		}
-		if len(filteredHeaderValues) > 0 {
-			log.Info("proxying dynamic headers")
-			ctx = context.WithValue(ctx, ContextKeyHeadersToForward, filteredHeaderValues) // nolint:staticcheck
+	// Collect all headers to forward to backends
+	headersToForward := make(map[string][]string)
+
+	// Always include URL context as synthetic headers
+	if r.URL.Path != "" && r.URL.Path != "/" {
+		headersToForward["X-Original-Path"] = []string{r.URL.Path}
+	}
+	if r.URL.RawQuery != "" {
+		headersToForward["X-Original-Query"] = []string{r.URL.RawQuery}
+	}
+
+	// Conditionally include allowed request headers
+	for _, h := range s.allowedDynamicHeaders {
+		if values := r.Header.Values(h); len(values) > 0 {
+			headersToForward[h] = values
 		}
+	}
 
+	if len(headersToForward) > 0 {
+		ctx = context.WithValue(ctx, ContextKeyHeadersToForward, headersToForward) // nolint:staticcheck
 	}
 
 	return context.WithValue(