chore: upgrade Connect to 1.11.1 (#445)

This is part of some yak shaving needed for OTEL.
block · Oct 5, 2023 · 15956ca · 15956ca
1 parent 47fac31
commit 15956ca
Show file tree

Hide file tree

Showing 31 changed files with 403 additions and 333 deletions.
diff --git a/...arty/protos/opentelemetry/proto/collector/metrics/v1/v1connect/metrics_service.connect.go b/...arty/protos/opentelemetry/proto/collector/metrics/v1/v1connect/metrics_service.connect.go
diff --git a/backend/common/download/download.go b/backend/common/download/download.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 
 	"github.com/TBD54566975/ftl/backend/common/log"
 	"github.com/TBD54566975/ftl/backend/common/model"

diff --git a/backend/common/plugin/serve.go b/backend/common/plugin/serve.go
@@ -13,10 +13,10 @@ import (
 	"syscall"
 	"time"
 
+	"connectrpc.com/connect"
+	"connectrpc.com/grpcreflect"
 	"github.com/alecthomas/errors"
 	"github.com/alecthomas/kong"
-	"github.com/bufbuild/connect-go"
-	grpcreflect "github.com/bufbuild/connect-grpcreflect-go"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 

diff --git a/backend/common/plugin/spawn.go b/backend/common/plugin/spawn.go
@@ -10,8 +10,8 @@ import (
 	"syscall"
 	"time"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 	"github.com/jpillora/backoff"
 
 	"github.com/TBD54566975/ftl/backend/common/exec"

diff --git a/backend/common/rpc/context.go b/backend/common/rpc/context.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"net/http"
 
+	"connectrpc.com/connect"
+	"connectrpc.com/otelconnect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
-	otelconnect "github.com/bufbuild/connect-opentelemetry-go"
 
 	"github.com/TBD54566975/ftl/backend/common/log"
 	"github.com/TBD54566975/ftl/backend/common/model"

diff --git a/backend/common/rpc/rpc.go b/backend/common/rpc/rpc.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 	"github.com/jpillora/backoff"
 	"golang.org/x/net/http2"
 

diff --git a/backend/common/rpc/server.go b/backend/common/rpc/server.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"time"
 
+	"connectrpc.com/connect"
+	"connectrpc.com/grpcreflect"
 	"github.com/alecthomas/concurrency"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
-	grpcreflect "github.com/bufbuild/connect-grpcreflect-go"
 	"github.com/rs/cors"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"

diff --git a/backend/controller/console.go b/backend/controller/console.go
@@ -5,9 +5,9 @@ import (
 	"encoding/json"
 	"time"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
 	"github.com/alecthomas/types"
-	"github.com/bufbuild/connect-go"
 	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 

diff --git a/backend/controller/controller.go b/backend/controller/controller.go
@@ -14,11 +14,11 @@ import (
 	"sync"
 	"time"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/concurrency"
 	"github.com/alecthomas/errors"
 	"github.com/alecthomas/kong"
 	"github.com/alecthomas/types"
-	"github.com/bufbuild/connect-go"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 	"github.com/jellydator/ttlcache/v3"

diff --git a/backend/runner/runner.go b/backend/runner/runner.go
@@ -13,10 +13,10 @@ import (
 	"syscall"
 	"time"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/atomic"
 	"github.com/alecthomas/errors"
 	"github.com/alecthomas/types"
-	"github.com/bufbuild/connect-go"
 	"github.com/jpillora/backoff"
 	"github.com/otiai10/copy"
 	"google.golang.org/protobuf/types/known/structpb"

diff --git a/bin/.protoc-gen-connect-go-1.8.0.pkg → bin/.protoc-gen-connect-go-1.11.1.pkg b/bin/.protoc-gen-connect-go-1.8.0.pkg → bin/.protoc-gen-connect-go-1.11.1.pkg
diff --git a/bin/protoc-gen-connect-go b/bin/protoc-gen-connect-go
@@ -1 +1 @@
-.protoc-gen-connect-go-1.8.0.pkg
+.protoc-gen-connect-go-1.11.1.pkg
diff --git a/cmd/ftl-go/main.go b/cmd/ftl-go/main.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
 	"github.com/alecthomas/kong"
-	"github.com/bufbuild/connect-go"
 	"github.com/radovskyb/watcher"
 	"golang.org/x/mod/modfile"
 	"golang.org/x/sync/errgroup"

diff --git a/cmd/ftl/cmd_call.go b/cmd/ftl/cmd_call.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 	"github.com/titanous/json5"
 
 	"github.com/TBD54566975/ftl/go-runtime/sdk"

diff --git a/cmd/ftl/cmd_deploy.go b/cmd/ftl/cmd_deploy.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 	"golang.org/x/exp/maps"
 	"google.golang.org/protobuf/types/known/timestamppb"
 

diff --git a/cmd/ftl/cmd_kill.go b/cmd/ftl/cmd_kill.go
@@ -3,8 +3,8 @@ package main
 import (
 	"context"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 
 	"github.com/TBD54566975/ftl/backend/common/model"
 	ftlv1 "github.com/TBD54566975/ftl/protos/xyz/block/ftl/v1"

diff --git a/cmd/ftl/cmd_ps.go b/cmd/ftl/cmd_ps.go
@@ -7,8 +7,8 @@ import (
 	"sort"
 	"strings"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 	"github.com/golang/protobuf/jsonpb"
 	"golang.org/x/exp/maps"
 

diff --git a/cmd/ftl/cmd_schema.go b/cmd/ftl/cmd_schema.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 
 	"github.com/TBD54566975/ftl/backend/schema"
 	ftlv1 "github.com/TBD54566975/ftl/protos/xyz/block/ftl/v1"

diff --git a/cmd/ftl/cmd_status.go b/cmd/ftl/cmd_status.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"os"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 	"github.com/golang/protobuf/jsonpb"
 
 	ftlv1 "github.com/TBD54566975/ftl/protos/xyz/block/ftl/v1"

diff --git a/cmd/ftl/cmd_update.go b/cmd/ftl/cmd_update.go
@@ -3,8 +3,8 @@ package main
 import (
 	"context"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/errors"
-	"github.com/bufbuild/connect-go"
 
 	"github.com/TBD54566975/ftl/backend/common/model"
 	ftlv1 "github.com/TBD54566975/ftl/protos/xyz/block/ftl/v1"

diff --git a/cmd/ftl/main.go b/cmd/ftl/main.go
@@ -8,9 +8,9 @@ import (
 	"runtime"
 	"syscall"
 
+	"connectrpc.com/connect"
 	"github.com/alecthomas/kong"
 	kongtoml "github.com/alecthomas/kong-toml"
-	"github.com/bufbuild/connect-go"
 
 	_ "github.com/TBD54566975/ftl/backend/common/automaxprocs" // Set GOMAXPROCS to match Linux container CPU quota.
 	"github.com/TBD54566975/ftl/backend/common/log"

diff --git a/examples/go.mod b/examples/go.mod
@@ -7,14 +7,14 @@ replace github.com/TBD54566975/ftl => ../
 require github.com/TBD54566975/ftl v0.0.0-00010101000000-000000000000
 
 require (
+	connectrpc.com/connect v1.11.1 // indirect
+	connectrpc.com/grpcreflect v1.2.0 // indirect
+	connectrpc.com/otelconnect v0.5.0 // indirect
 	github.com/alecthomas/concurrency v0.0.2 // indirect
 	github.com/alecthomas/errors v0.4.0 // indirect
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
 	github.com/alecthomas/types v0.7.1 // indirect
 	github.com/alessio/shellescape v1.4.1 // indirect
-	github.com/bufbuild/connect-go v1.8.0 // indirect
-	github.com/bufbuild/connect-grpcreflect-go v1.1.0 // indirect
-	github.com/bufbuild/connect-opentelemetry-go v0.3.0 // indirect
 	github.com/danieljoos/wincred v1.1.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -37,5 +37,5 @@ require (
 	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 )
diff --git a/examples/go.sum b/examples/go.sum
diff --git a/examples/online-boutique/go.mod b/examples/online-boutique/go.mod
@@ -13,13 +13,13 @@ require (
 )
 
 require (
+	connectrpc.com/connect v1.11.1 // indirect
+	connectrpc.com/grpcreflect v1.2.0 // indirect
+	connectrpc.com/otelconnect v0.5.0 // indirect
 	github.com/alecthomas/concurrency v0.0.2 // indirect
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
 	github.com/alecthomas/types v0.7.1 // indirect
 	github.com/alessio/shellescape v1.4.1 // indirect
-	github.com/bufbuild/connect-go v1.8.0 // indirect
-	github.com/bufbuild/connect-grpcreflect-go v1.1.0 // indirect
-	github.com/bufbuild/connect-opentelemetry-go v0.3.0 // indirect
 	github.com/danieljoos/wincred v1.1.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -40,5 +40,5 @@ require (
 	golang.org/x/sync v0.3.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/text v0.12.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 )
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		.protoc-gen-connect-go-1.8.0.pkg
		.protoc-gen-connect-go-1.11.1.pkg