feat(all): Update to use the new components registry in go-orb 0.1.1.

Author: jochumdev

README.md

@@ -40,11 +40,15 @@ To run an example you need to have `go1.23.6` installed. You can get it with [gv
 
 All the examples have a cmd folder you can run it with `go run "./cmd/handler/..."`.
 
+You can run all examples at once by running `./scripts/test.sh`, this is what we do in CI.
+
 ## Development
 
 You need:
 - go1.23.6
+- docker for dagger
 - our custom fork of [wire](https://github.com/go-orb/wire) `go install github.com/go-orb/wire/cmd/wire@latest`
+- [protoc-gen-go](https://protobuf.dev/reference/go/go-generated/) `go install google.golang.org/protobuf/cmd/protoc-gen-go@latest`
 - [protoc-gen-go-orb](https://github.com/go-orb/plugins/server/cmd/protoc-gen-go-orb) `go install github.com/go-orb/plugins/server/cmd/protoc-gen-go-orb@latest`
 
 Now you'r able to run `go generate ./...` in the examples to update `cmd/xyz/wire_gen.go` as well as the `proto` files.

Taskfile.yml

@@ -17,6 +17,7 @@ tasks:
       - cmd: dagger call update --root=. source export --path=.
 
   test:
-    desc: Run "go test ./..." in all packages
+    desc: Run "go test ./..." in all packages and then "./scripts/test.sh" to test all binaries.
     cmds:
       - cmd: dagger call test --root=.
+      - cmd: ./scripts/test.sh

benchmarks/event/cmd/handler/main.go

@@ -17,6 +17,9 @@ import (
 )
 
 func runner(
+	serviceName types.ServiceName,
+	serviceVersion types.ServiceVersion,
+	logger log.Logger,
 	eventWire event.Handler,
 	done chan os.Signal,
 ) error {
@@ -28,17 +31,21 @@ func runner(
 
 	event.HandleRequest(ctx, eventWire, "echo.echo", echoHandler)
 
+	logger.Info("Started", "name", serviceName, "version", serviceVersion)
+
 	// Blocks until sigterm/sigkill.
 	<-done
 
+	logger.Info("Stopping", "name", serviceName, "version", serviceVersion)
+
 	cancel()
 
 	return nil
 }
 
 func main() {
 	var (
-		serviceName    = types.ServiceName("orb.examples.event.bench_handler")
+		serviceName    = types.ServiceName("benchmarks.event.handler")
 		serviceVersion = types.ServiceVersion("v0.0.1")
 	)
 

benchmarks/event/cmd/handler/wire.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"net/url"
 	"os"
 	"os/signal"
@@ -34,39 +35,31 @@ func provideConfigData(
 	return data, err
 }
 
-// provideComponents creates a slice of components out of the arguments.
-func provideComponents(
-	logger log.Logger,
-	event event.Handler,
-) ([]types.Component, error) {
-	components := []types.Component{}
-	components = append(components, logger)
-	components = append(components, event)
-
-	return components, nil
-}
-
+// wireRunResult is here so "wire" has a type for the return value of wireRun.
+// wire needs a explicit type for each provider including "wireRun".
 type wireRunResult string
 
+// wireRunCallback is the actual code that runs the business logic.
 type wireRunCallback func(
+	serviceName types.ServiceName,
+	serviceVersion types.ServiceVersion,
+	logger log.Logger,
 	event event.Handler,
 	done chan os.Signal,
 ) error
 
 func wireRun(
-	_ types.ServiceName,
-	components []types.Component,
-	_ types.ConfigData,
-	_ log.Logger,
+	serviceName types.ServiceName,
+	serviceVersion types.ServiceVersion,
+	logger log.Logger,
 	event event.Handler,
 	cb wireRunCallback,
 ) (wireRunResult, error) {
-	//
 	// Orb start
-	for _, c := range components {
+	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			log.Error("Failed to start", err, "component", c.Type())
+			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 			os.Exit(1)
 		}
 	}
@@ -76,18 +69,15 @@ func wireRun(
 
 	//
 	// Actual code
-	runErr := cb(event, done)
+	runErr := cb(serviceName, serviceVersion, logger, event, done)
 
-	//
 	// Orb shutdown.
 	ctx := context.Background()
 
-	for k := range components {
-		c := components[len(components)-1-k]
-
+	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			log.Error("Failed to stop", err, "component", c.Type())
+			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 
@@ -106,7 +96,6 @@ func run(
 		log.Provide,
 		wire.Value([]event.Option{}),
 		event.Provide,
-		provideComponents,
 		wireRun,
 	))
 }

benchmarks/event/cmd/handler/wire_gen.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"net/url"
 	"os"
 	"os/signal"
@@ -34,42 +35,30 @@ func provideConfigData(
 	return data, err
 }
 
-// provideComponents creates a slice of components out of the arguments.
-func provideComponents(
-	logger log.Logger,
-	event event.Handler,
-) ([]types.Component, error) {
-	components := []types.Component{}
-	components = append(components, logger)
-	components = append(components, event)
-
-	return components, nil
-}
-
+// wireRunResult is here so "wire" has a type for the return value of wireRun.
 type wireRunResult string
 
+// wireRunCallback is the actual code that runs the business logic.
 type wireRunCallback func(
 	serviceName types.ServiceName,
 	configs types.ConfigData,
 	logger log.Logger,
-	event event.Handler,
+	eventHandler event.Handler,
 	done chan os.Signal,
 ) error
 
 func wireRun(
 	serviceName types.ServiceName,
-	components []types.Component,
 	configs types.ConfigData,
 	logger log.Logger,
 	event event.Handler,
 	cb wireRunCallback,
 ) (wireRunResult, error) {
-	//
 	// Orb start
-	for _, c := range components {
+	for _, c := range types.Components.Iterate(false) {
 		err := c.Start()
 		if err != nil {
-			log.Error("Failed to start", err, "component", c.Type())
+			logger.Error("Failed to start", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 			os.Exit(1)
 		}
 	}
@@ -81,16 +70,13 @@ func wireRun(
 	// Actual code
 	runErr := cb(serviceName, configs, logger, event, done)
 
-	//
 	// Orb shutdown.
 	ctx := context.Background()
 
-	for k := range components {
-		c := components[len(components)-1-k]
-
+	for _, c := range types.Components.Iterate(true) {
 		err := c.Stop(ctx)
 		if err != nil {
-			log.Error("Failed to stop", err, "component", c.Type())
+			logger.Error("Failed to stop", err, "component", fmt.Sprintf("%s/%s", c.Type(), c.String()))
 		}
 	}
 
@@ -109,7 +95,6 @@ func run(
 		log.Provide,
 		wire.Value([]event.Option{}),
 		event.Provide,
-		provideComponents,
 		wireRun,
 	))
 }