Consolidate gRPC and HTTP server #7049

grahamplata · 2025-04-02T19:25:59Z

Resolves: https://github.com/rilldata/rill-private-issues/issues/1341

Deprecates the current dual port set up using grpc-gateway in favor of a single port solution using vanguard.

Checklist:

Covered by tests
Ran it and it works as intended
Reviewed the diff before requesting a review
Checked for unhandled edge cases
Linked the issues it closes
Checked if the docs need to be updated
Intend to cherry-pick into the release branch
I'm proud of this work!

…function

… warnings

…er component

…in WatchResourcesHandler

… and file watchers

…lesHandler

… use streaming

admin/provisioner/kubernetes/README.md

admin/server/auth/middleware.go

admin/server/server.go

admin/testadmin/testadmin.go

cli/cmd/admin/start.go

runtime/server/server.go

runtime/server/repos.go

runtime/server/controller.go

…ization header

…improve context cancellation

…se and behavior

begelundmuller · 2025-04-24T13:30:20Z

cli/cmd/admin/start.go

-	GRPCPort                  int                    `default:"8080" split_words:"true"`
+	Port                      int                    `default:"8080" split_words:"true"`


Can you update our Helm charts now to have this new property (so it's there before we merge)? https://github.com/rilldata/rill-helm-charts.

Probably also best to double check with @kaspersjo if we need to update anywhere else.

cli/pkg/local/server.go

runtime/server/controller.go

runtime/server/server.go

…sourcesHandler

…rrors as client errors

…rated files

grahamplata force-pushed the gplata/grpc-server-config branch from 306dd74 to 1fb9ff0 Compare April 7, 2025 19:52

grahamplata self-assigned this Apr 7, 2025

grahamplata requested a review from begelundmuller April 14, 2025 21:24

grahamplata force-pushed the gplata/grpc-server-config branch 2 times, most recently from 3959e8f to 937c422 Compare April 15, 2025 18:43

grahamplata added 23 commits April 17, 2025 15:02

feat: migrate from gateway to vanguard

409f840

fix: update external URL to use HTTP port instead of GRPC port

c3a7d28

fix: update ports and remove "hacks"

0f2ce52

feat: add WatchFilesHandler for file watching via HTTP

b196c8e

feat: add WatchResourcesHandler for resource watching via HTTP

9c46448

fix: update localhost runtime port references from 9091 to 8081

2d20fea

fix: add error handling for file reading and clean up unused test code

3ca727e

fix: simplify error handling in WatchFilesHandler

9774e21

feat: adjust WatchResourcesHandler with SSE support and heartbeat

98cd2bd

refactor: remove unused writeJSONResponse function from controller

7ddb6b6

Refactor code structure for improved readability and maintainability

0e0604f

feat: implement server-sent events (SSE) for resource and file watching

ab5f954

fix: close request body in ServeHTTP and remove unused writeSSEEvent …

e49edbe

…function

fix: add nolint directive for bodyclose in ServeHTTP to suppress lint…

a1da30b

… warnings

fix: clarify nolint directive for bodyclose in ServeHTTP

d0c75c2

fix: correct variable assignment for resourceWatcher in ResourceWatch…

36eef6d

…er component

fix: update DefaultHeartbeat duration and improve response structure …

8b1834c

…in WatchResourcesHandler

fix: update SSE integration and add streaming parameters for resource…

916acc7

… and file watchers

fix: streamline event publishing in WatchResourcesHandler and WatchFi…

076f4af

…lesHandler

fix: format fileWatcher.watch

95fdad3

fix: add support for SSE in WatchRequestClient and update watchers to…

4ec630d

… use streaming

fix: update HTTP handler path for gRPC-gateway to include versioning

0a9f60b

fix: update HTTP handler to route gRPC-gateway requests correctly

b56e27d

grahamplata force-pushed the gplata/grpc-server-config branch from b9128e1 to b56e27d Compare April 17, 2025 19:05

grahamplata marked this pull request as ready for review April 17, 2025 19:13

grahamplata requested a review from briangregoryholmes April 17, 2025 19:13

grahamplata changed the title ~~WIP: Consolidate gRPC and HTTP server~~ Consolidate gRPC and HTTP server Apr 17, 2025

begelundmuller requested changes Apr 21, 2025

View reviewed changes

grahamplata added 9 commits April 21, 2025 11:19

fix: update CookieToAuthHeader middleware to conditionally set Author…

4c7cc94

…ization header

fix: refactor ServeHTTP to use channel for server error handling and …

6252461

…improve context cancellation

fix: remove redundant error logging in UploadMultipartFile handler

6d8dea4

fix: improve documentation for WatchFilesHandler to clarify its purpo…

252eb62

…se and behavior

fix: refactor WatchFilesHandler to and add shim

199dad3

fix: refactor WatchResourcesHandler to use shim for SSE integration

794da12

Refactor to use a single port

14f7521

fix: handle server errors in goroutine for Serve method

5f6742a

feat: add tracing middleware to HTTP handler for trace ID propagation

d0b7da3

grahamplata requested a review from begelundmuller April 21, 2025 20:22

begelundmuller requested changes Apr 24, 2025

View reviewed changes

grahamplata added 5 commits April 25, 2025 09:41

fix: update error handling in WatchResourcesHandler

cbc5854

fix: run WatchResources in a goroutine to prevent blocking in WatchRe…

9f3ed99

…sourcesHandler

feat: add pkg trace middleware to HTTP handler for trace ID propagation

2c1aee1

fix: update error handling in mapGRPCError to classify unclassified e…

bb814e4

…rrors as client errors

Rename grpc_port to port in GetMetadataResponse across proto and gene…

2ee799c

…rated files

grahamplata requested a review from begelundmuller April 25, 2025 15:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate gRPC and HTTP server #7049

Consolidate gRPC and HTTP server #7049

grahamplata commented Apr 2, 2025 •

edited

Loading

begelundmuller Apr 24, 2025

		GRPCPort int `default:"8080" split_words:"true"`
		Port int `default:"8080" split_words:"true"`

Consolidate gRPC and HTTP server #7049

Are you sure you want to change the base?

Consolidate gRPC and HTTP server #7049

Conversation

grahamplata commented Apr 2, 2025 • edited Loading

begelundmuller Apr 24, 2025

Choose a reason for hiding this comment

grahamplata commented Apr 2, 2025 •

edited

Loading