Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(pubsub): respect gRPC dial option when PUBSUB_EMULATOR_HOST is set #10040

Merged
merged 6 commits into from May 6, 2024
Merged

fix(pubsub): respect gRPC dial option when PUBSUB_EMULATOR_HOST is set #10040

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
886bdd8
fix(pubsub): respect gRPC dial option when PUBSUB_EMULATOR_HOST is set
toga4 Apr 25, 2024
1eb8950
Merge branch 'main' into pubsub-emulator-grpc-dial-option
hongalex Apr 30, 2024
211e865
Merge branch 'main' into pubsub-emulator-grpc-dial-option
hongalex May 3, 2024
02e73bf
Merge branch 'main' into pubsub-emulator-grpc-dial-option
hongalex May 3, 2024
4aac393
Merge branch 'main' into pubsub-emulator-grpc-dial-option
hongalex May 4, 2024
23dff11
Merge branch 'main' into pubsub-emulator-grpc-dial-option
hongalex May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions pubsub/pubsub.go
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ import (
"cloud.google.com/go/pubsub/internal"
gax "github.com/googleapis/gax-go/v2"
"google.golang.org/api/option"
"google.golang.org/api/option/internaloption"
"google.golang.org/grpc"
"google.golang.org/grpc/keepalive"
)
Expand Down Expand Up @@ -143,12 +144,14 @@ func NewClientWithConfig(ctx context.Context, projectID string, config *ClientCo
// Environment variables for gcloud emulator:
// https://cloud.google.com/sdk/gcloud/reference/beta/emulators/pubsub/
if addr := os.Getenv("PUBSUB_EMULATOR_HOST"); addr != "" {
conn, err := grpc.Dial(addr, grpc.WithInsecure())
if err != nil {
return nil, fmt.Errorf("grpc.Dial: %w", err)
emulatorOpts := []option.ClientOption{
option.WithEndpoint(addr),
option.WithGRPCDialOption(grpc.WithInsecure()),
option.WithoutAuthentication(),
option.WithTelemetryDisabled(),
internaloption.SkipDialSettingsValidation(),
}
o = []option.ClientOption{option.WithGRPCConn(conn)}
o = append(o, option.WithTelemetryDisabled())
opts = append(emulatorOpts, opts...)
} else {
numConns := runtime.GOMAXPROCS(0)
if numConns > 4 {
Expand Down