chore: Renaming github.com/bytecodealliance/wrpc to wrpc.io/go (#33)

Signed-off-by: Lucas Fontes <[email protected]>
wasmCloud · Sep 4, 2024 · 7f5aa62 · 7f5aa62
1 parent fb55a25
commit 7f5aa62
Show file tree

Hide file tree

Showing 8 changed files with 185 additions and 111 deletions.
diff --git a/examples/keyvalue-inmemory/bindings/exports/wrpc/keyvalue/store/bindings.wrpc.go b/examples/keyvalue-inmemory/bindings/exports/wrpc/keyvalue/store/bindings.wrpc.go
diff --git a/examples/keyvalue-inmemory/bindings/server.wrpc.go b/examples/keyvalue-inmemory/bindings/server.wrpc.go
@@ -1,10 +1,10 @@
-// Generated by `wit-bindgen-wrpc-go` 0.5.0. DO NOT EDIT!
+// Generated by `wit-bindgen-wrpc-go` 0.8.0. DO NOT EDIT!
 // server package contains wRPC bindings for `server` world
 package server
 
 import (
-	wrpc "github.com/bytecodealliance/wrpc/go"
 	exports__wrpc__keyvalue__store "github.com/wasmCloud/provider-sdk-go/examples/keyvalue-inmemory/bindings/exports/wrpc/keyvalue/store"
+	wrpc "wrpc.io/go"
 )
 
 func Serve(s wrpc.Server, h0 exports__wrpc__keyvalue__store.Handler) (stop func() error, err error) {

diff --git a/examples/keyvalue-inmemory/go.mod b/examples/keyvalue-inmemory/go.mod
@@ -40,6 +40,7 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
 	google.golang.org/grpc v1.65.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
+	wrpc.io/go v0.0.3 // indirect
 )
 
 replace go.wasmcloud.dev/provider => ../..
diff --git a/examples/keyvalue-inmemory/go.sum b/examples/keyvalue-inmemory/go.sum
@@ -81,3 +81,5 @@ google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6h
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+wrpc.io/go v0.0.3 h1:clf0KiO8WTjYwkyorrZQ4sSf7k/7xP5gdL4934A4L7s=
+wrpc.io/go v0.0.3/go.mod h1:3EZdmAh0pp6uNJ8RG4aciP3LLIDWlT2fJP6qd9Z/O6U=
diff --git a/examples/keyvalue-inmemory/keyvalue.go b/examples/keyvalue-inmemory/keyvalue.go
@@ -5,10 +5,10 @@ import (
 	"context"
 	"sync"
 
-	wrpc "github.com/bytecodealliance/wrpc/go"
 	"github.com/wasmCloud/provider-sdk-go/examples/keyvalue-inmemory/bindings/exports/wrpc/keyvalue/store"
 	"go.opentelemetry.io/otel/trace"
 	"go.wasmcloud.dev/provider"
+	wrpc "wrpc.io/go"
 )
 
 var (

diff --git a/go.mod b/go.mod
@@ -5,7 +5,6 @@ go 1.22.2
 toolchain go1.22.3
 
 require (
-	github.com/bytecodealliance/wrpc/go v0.0.0-20240821200644-5f4408308a27
 	github.com/nats-io/nats.go v1.37.0
 	github.com/nats-io/nkeys v0.4.7
 	go.opentelemetry.io/otel v1.28.0
@@ -19,6 +18,7 @@ require (
 	go.opentelemetry.io/otel/sdk v1.28.0
 	go.opentelemetry.io/otel/sdk/log v0.4.0
 	go.opentelemetry.io/otel/sdk/metric v1.28.0
+	wrpc.io/go v0.0.3
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -1,9 +1,3 @@
-github.com/bytecodealliance/wrpc/go v0.0.0-20240821140339-1a19079b99a3 h1:boG8swY0eGdU/COFpztzvp7zNz1B7tWb9R3ZkUiqOI0=
-github.com/bytecodealliance/wrpc/go v0.0.0-20240821140339-1a19079b99a3/go.mod h1:Zny2i1MyPOpQvP50fhFa+p55yTe+3n5C7J4kUptFYHg=
-github.com/bytecodealliance/wrpc/go v0.0.0-20240821145323-723a8c2b1b7f h1:gUw8o1OIQsSjYXuBV0yN1XPXqPyp/Jhkwu67lraKBSI=
-github.com/bytecodealliance/wrpc/go v0.0.0-20240821145323-723a8c2b1b7f/go.mod h1:Zny2i1MyPOpQvP50fhFa+p55yTe+3n5C7J4kUptFYHg=
-github.com/bytecodealliance/wrpc/go v0.0.0-20240821200644-5f4408308a27 h1:ejfi/wUXgl5KJpn3Hx3801WuLwScBqjckfz/j8O8vio=
-github.com/bytecodealliance/wrpc/go v0.0.0-20240821200644-5f4408308a27/go.mod h1:Zny2i1MyPOpQvP50fhFa+p55yTe+3n5C7J4kUptFYHg=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -81,3 +75,5 @@ google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6h
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+wrpc.io/go v0.0.3 h1:clf0KiO8WTjYwkyorrZQ4sSf7k/7xP5gdL4934A4L7s=
+wrpc.io/go v0.0.3/go.mod h1:3EZdmAh0pp6uNJ8RG4aciP3LLIDWlT2fJP6qd9Z/O6U=
diff --git a/provider.go b/provider.go
@@ -14,11 +14,11 @@ import (
 	"syscall"
 	"time"
 
-	wrpcnats "github.com/bytecodealliance/wrpc/go/nats"
 	nats "github.com/nats-io/nats.go"
 	"github.com/nats-io/nkeys"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/log/global"
+	wrpcnats "wrpc.io/go/nats"
 )
 
 type WasmcloudProvider struct {
@@ -199,7 +199,7 @@ func New(options ...ProviderHandler) (*WasmcloudProvider, error) {
 	}
 
 	prefix := fmt.Sprintf("%s.%s", hostData.LatticeRPCPrefix, hostData.ProviderKey)
-	wrpc := wrpcnats.NewClientWithQueueGroup(nc, prefix, prefix)
+	wrpc := wrpcnats.NewClient(nc, wrpcnats.WithPrefix(prefix), wrpcnats.WithGroup(prefix))
 
 	signalCh := make(chan os.Signal, 1)
 	signal.Notify(signalCh, syscall.SIGINT)
@@ -276,7 +276,7 @@ func (wp *WasmcloudProvider) NatsConnection() *nats.Conn {
 }
 
 func (wp *WasmcloudProvider) OutgoingRpcClient(target string) *wrpcnats.Client {
-	return wrpcnats.NewClient(wp.natsConnection, fmt.Sprintf("%s.%s", wp.hostData.LatticeRPCPrefix, target))
+	return wrpcnats.NewClient(wp.natsConnection, wrpcnats.WithPrefix(fmt.Sprintf("%s.%s", wp.hostData.LatticeRPCPrefix, target)))
 }
 
 func (wp *WasmcloudProvider) Start() error {