Remove envelope<->weavelet pipes. (ServiceWeaver#712)

Initialization info sent by the envelope to the weavelet is now sent in an environment variable. Initialization info sent by the weavelet to the envelope is now sent as the response to a control.WeaveletControl.InitWeavelet() call. This call is made by NewEnvelope() as an initial hand-shake right after creating the weavelet. Deleted all the envelope/weavlet connection management code. Deleted low-level tests that were testing details of the connection management protocol. Dropped unnecessary code that carried a Bootstrap object in a context. We had switched away from our use of a Bootstrap context value a long time ago.
shixinghong · Jan 12, 2024 · 1d50a15 · 1d50a15
1 parent df33c7e
commit 1d50a15
Show file tree

Hide file tree

Showing 21 changed files with 1,045 additions and 2,264 deletions.
diff --git a/godeps.txt b/godeps.txt
@@ -307,19 +307,6 @@ github.com/ServiceWeaver/weaver/internal/control
 github.com/ServiceWeaver/weaver/internal/env
     fmt
     strings
-github.com/ServiceWeaver/weaver/internal/envelope/conn
-    context
-    fmt
-    github.com/ServiceWeaver/weaver/internal/queue
-    github.com/ServiceWeaver/weaver/runtime
-    github.com/ServiceWeaver/weaver/runtime/protomsg
-    github.com/ServiceWeaver/weaver/runtime/protos
-    github.com/ServiceWeaver/weaver/runtime/version
-    golang.org/x/sync/errgroup
-    google.golang.org/protobuf/proto
-    io
-    net
-    sync
 github.com/ServiceWeaver/weaver/internal/files
     fmt
     os
@@ -700,7 +687,6 @@ github.com/ServiceWeaver/weaver/internal/weaver
     github.com/ServiceWeaver/weaver/internal/config
     github.com/ServiceWeaver/weaver/internal/control
     github.com/ServiceWeaver/weaver/internal/env
-    github.com/ServiceWeaver/weaver/internal/envelope/conn
     github.com/ServiceWeaver/weaver/internal/metrics
     github.com/ServiceWeaver/weaver/internal/net/call
     github.com/ServiceWeaver/weaver/internal/register
@@ -716,6 +702,7 @@ github.com/ServiceWeaver/weaver/internal/weaver
     github.com/ServiceWeaver/weaver/runtime/protos
     github.com/ServiceWeaver/weaver/runtime/retry
     github.com/ServiceWeaver/weaver/runtime/traces
+    github.com/ServiceWeaver/weaver/runtime/version
     github.com/google/uuid
     github.com/lightstep/varopt
     go.opentelemetry.io/otel
@@ -751,12 +738,11 @@ github.com/ServiceWeaver/weaver/runtime
     fmt
     github.com/BurntSushi/toml
     github.com/ServiceWeaver/weaver/internal/env
+    github.com/ServiceWeaver/weaver/internal/proto
     github.com/ServiceWeaver/weaver/runtime/protos
-    io
     os
     os/signal
     path/filepath
-    strconv
     strings
     sync
     syscall
@@ -821,13 +807,12 @@ github.com/ServiceWeaver/weaver/runtime/deployers
 github.com/ServiceWeaver/weaver/runtime/envelope
     bufio
     context
-    errors
     fmt
     github.com/ServiceWeaver/weaver
     github.com/ServiceWeaver/weaver/internal/control
-    github.com/ServiceWeaver/weaver/internal/envelope/conn
     github.com/ServiceWeaver/weaver/internal/net/call
     github.com/ServiceWeaver/weaver/internal/pipe
+    github.com/ServiceWeaver/weaver/internal/proto
     github.com/ServiceWeaver/weaver/runtime
     github.com/ServiceWeaver/weaver/runtime/codegen
     github.com/ServiceWeaver/weaver/runtime/deployers
@@ -840,7 +825,6 @@ github.com/ServiceWeaver/weaver/runtime/envelope
     log/slog
     net
     os
-    strconv
     sync
 github.com/ServiceWeaver/weaver/runtime/graph
     fmt
@@ -1087,18 +1071,6 @@ github.com/ServiceWeaver/weaver/website/blog/deployers/multi
     github.com/google/uuid
     os
     sync
-github.com/ServiceWeaver/weaver/website/blog/deployers/pipes
-    context
-    flag
-    fmt
-    github.com/ServiceWeaver/weaver/runtime
-    github.com/ServiceWeaver/weaver/runtime/deployers
-    github.com/ServiceWeaver/weaver/runtime/protomsg
-    github.com/ServiceWeaver/weaver/runtime/protos
-    github.com/google/uuid
-    google.golang.org/protobuf/encoding/prototext
-    os
-    os/exec
 github.com/ServiceWeaver/weaver/website/blog/deployers/single
     context
     flag

diff --git a/internal/control/weavelet.go b/internal/control/weavelet.go
@@ -31,6 +31,9 @@ const WeaveletPath = "github.com/ServiceWeaver/weaver/weaveletControl"
 // Arguments and results are protobufs to allow deployers to evolve independently of
 // application binaries.
 type WeaveletControl interface {
+	// InitWeavelet initializes the weavelet.
+	InitWeavelet(context.Context, *protos.InitWeaveletRequest) (*protos.WeaveletInfo, error)
+
 	// UpdateComponents updates the weavelet with the latest set of components it
 	// should be running.
 	UpdateComponents(context.Context, *protos.UpdateComponentsRequest) (*protos.UpdateComponentsReply, error)

diff --git a/internal/envelope/conn/conn.go b/internal/envelope/conn/conn.go