Skip to content

Commit

Permalink
httpgrpc/server: Update NewClient to not use WithBalancerName
Browse files Browse the repository at this point in the history
This is a simplified version of weaveworks#240, without touching the gRPC versions.

Fixes weaveworks#239

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
  • Loading branch information
jpkrohling committed Aug 29, 2022
1 parent c65105d commit 3082d6a
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 36 deletions.
67 changes: 34 additions & 33 deletions go.mod
Expand Up @@ -3,37 +3,38 @@ module github.com/weaveworks/common
go 1.14

require (
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/aws/aws-sdk-go v1.27.0
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
github.com/davecgh/go-spew v1.1.1
github.com/felixge/httpsnoop v1.0.1
github.com/go-kit/log v0.1.0
github.com/gogo/googleapis v1.1.0
github.com/gogo/protobuf v1.3.0
github.com/gogo/status v1.0.3
github.com/golang/protobuf v1.4.3
github.com/gorilla/mux v1.7.3
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
github.com/mattn/go-colorable v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
github.com/opentracing/opentracing-go v1.1.0
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/exporter-toolkit v0.7.0
github.com/sercand/kuberesolver v2.4.0+incompatible
github.com/sirupsen/logrus v1.6.0
github.com/stretchr/testify v1.4.0
github.com/uber/jaeger-client-go v2.28.0+incompatible
github.com/uber/jaeger-lib v2.2.0+incompatible
github.com/weaveworks/promrus v1.2.0
go.uber.org/atomic v1.5.1 // indirect
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d
google.golang.org/grpc v1.31.0
gopkg.in/yaml.v2 v2.4.0
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
github.com/aws/aws-sdk-go v1.27.0
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
github.com/davecgh/go-spew v1.1.1
github.com/felixge/httpsnoop v1.0.1
github.com/go-kit/kit v0.9.0
github.com/go-kit/log v0.1.0
github.com/gogo/googleapis v1.1.0
github.com/gogo/protobuf v1.3.0
github.com/gogo/status v1.0.3
github.com/golang/protobuf v1.4.3
github.com/gorilla/mux v1.7.3
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
github.com/mattn/go-colorable v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.4 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
github.com/opentracing/opentracing-go v1.1.0
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/exporter-toolkit v0.7.0
github.com/sercand/kuberesolver v2.4.0+incompatible
github.com/sirupsen/logrus v1.6.0
github.com/stretchr/testify v1.4.0
github.com/uber/jaeger-client-go v2.28.0+incompatible
github.com/uber/jaeger-lib v2.2.0+incompatible
github.com/weaveworks/promrus v1.2.0
go.uber.org/atomic v1.5.1 // indirect
golang.org/x/net v0.0.0-20210525063256-abc453219eb5
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d
google.golang.org/grpc v1.31.0
gopkg.in/yaml.v2 v2.4.0
)
1 change: 1 addition & 0 deletions go.sum
Expand Up @@ -69,6 +69,7 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/log v0.1.0 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
Expand Down
6 changes: 3 additions & 3 deletions httpgrpc/server/server.go
Expand Up @@ -11,13 +11,12 @@ import (
"strings"
"sync"

"github.com/grpc-ecosystem/go-grpc-middleware"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
otgrpc "github.com/opentracing-contrib/go-grpc"
"github.com/opentracing/opentracing-go"
"github.com/sercand/kuberesolver"
"golang.org/x/net/context"
"google.golang.org/grpc"
"google.golang.org/grpc/balancer/roundrobin"

"github.com/weaveworks/common/httpgrpc"
"github.com/weaveworks/common/logging"
Expand Down Expand Up @@ -132,9 +131,10 @@ func NewClient(address string) (*Client, error) {
if err != nil {
return nil, err
}
const grpcServiceConfig = `{"loadBalancingPolicy":"round_robin"}`

dialOptions := []grpc.DialOption{
grpc.WithBalancerName(roundrobin.Name),
grpc.WithDefaultServiceConfig(grpcServiceConfig),
grpc.WithInsecure(),
grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(
otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()),
Expand Down

0 comments on commit 3082d6a

Please sign in to comment.