Skip to content

Commit fe808b8

Browse files
shyamjesalshyamjesal
committed
fix cilint
Signed-off-by: Shyam Jesal <[email protected]>
1 parent 39ee7cc commit fe808b8

File tree

11 files changed

+126
-148
lines changed

11 files changed

+126
-148
lines changed

‎benchmarks/chained-function-serving/consumer/consumer.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"os"
3434
"strconv"
3535

36-
ctrdlog "github.com/containerd/containerd/log"
36+
ctrdlog "github.com/containerd/log"
3737
log "github.com/sirupsen/logrus"
3838
"google.golang.org/grpc"
3939

‎benchmarks/chained-function-serving/driver/driver.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
pb_client "tests/chained-functions-serving/proto"
1818

19-
ctrdlog "github.com/containerd/containerd/log"
19+
ctrdlog "github.com/containerd/log"
2020
log "github.com/sirupsen/logrus"
2121
"google.golang.org/grpc"
2222

@@ -152,11 +152,11 @@ func main() {
152152
}
153153

154154
func SayHello(ctx context.Context, address string) {
155-
dialOptions := []grpc.DialOption{grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials())}
155+
dialOptions := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
156156
if *withTracing {
157157
dialOptions = append(dialOptions, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
158158
}
159-
conn, err := grpc.Dial(address, dialOptions...)
159+
conn, err := grpc.NewClient(address, dialOptions...)
160160
if err != nil {
161161
log.Fatalf("did not connect: %v", err)
162162
}
@@ -175,7 +175,7 @@ func SayHello(ctx context.Context, address string) {
175175

176176
func benchFanIn(ctx context.Context, prodAddr, consAddr string, fanInAmount int) {
177177
log.Infof("using fanIn ubench")
178-
dialOptions := []grpc.DialOption{grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials())}
178+
dialOptions := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
179179
if *withTracing {
180180
dialOptions = append(dialOptions, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
181181
}
@@ -186,7 +186,7 @@ func benchFanIn(ctx context.Context, prodAddr, consAddr string, fanInAmount int)
186186
errorChannel := make(chan error, fanInAmount)
187187
for i := 0; i < fanInAmount; i++ {
188188
go func() {
189-
conn, err := grpc.Dial(prodAddr, dialOptions...)
189+
conn, err := grpc.NewClient(prodAddr, dialOptions...)
190190
if err != nil {
191191
log.Fatalf("did not connect: %v", err)
192192
}
@@ -219,11 +219,11 @@ func benchFanIn(ctx context.Context, prodAddr, consAddr string, fanInAmount int)
219219

220220
func reduce(ctx context.Context, consEndpoint string, capabilities []string) {
221221
log.Infof("Attempting reduction using addr:%s", consEndpoint)
222-
dialOptions := []grpc.DialOption{grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials())}
222+
dialOptions := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
223223
if *withTracing {
224224
dialOptions = append(dialOptions, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
225225
}
226-
conn, err := grpc.Dial(consEndpoint, dialOptions...)
226+
conn, err := grpc.NewClient(consEndpoint, dialOptions...)
227227
if err != nil {
228228
log.Fatalf("did not connect: %v", err)
229229
}
@@ -241,11 +241,11 @@ func reduce(ctx context.Context, consEndpoint string, capabilities []string) {
241241

242242
func benchFanOut(ctx context.Context, prodAddr string, fanOutAmount int) {
243243
log.Infof("using fanOut ubench")
244-
dialOptions := []grpc.DialOption{grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials())}
244+
dialOptions := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
245245
if *withTracing {
246246
dialOptions = append(dialOptions, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
247247
}
248-
conn, err := grpc.Dial(prodAddr, dialOptions...)
248+
conn, err := grpc.NewClient(prodAddr, dialOptions...)
249249
if err != nil {
250250
log.Fatalf("did not connect: %v", err)
251251
}
@@ -264,11 +264,11 @@ func benchFanOut(ctx context.Context, prodAddr string, fanOutAmount int) {
264264

265265
func benchBroadcast(ctx context.Context, prodAddr string, broadcast int) {
266266
log.Infof("using broadcast ubench")
267-
dialOptions := []grpc.DialOption{grpc.WithBlock(), grpc.WithTransportCredentials(insecure.NewCredentials())}
267+
dialOptions := []grpc.DialOption{grpc.WithTransportCredentials(insecure.NewCredentials())}
268268
if *withTracing {
269269
dialOptions = append(dialOptions, grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
270270
}
271-
conn, err := grpc.Dial(prodAddr, dialOptions...)
271+
conn, err := grpc.NewClient(prodAddr, dialOptions...)
272272
if err != nil {
273273
log.Fatalf("did not connect: %v", err)
274274
}

‎benchmarks/chained-function-serving/go.mod‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module tests/chained-functions-serving
22

3-
go 1.21
3+
go 1.21.4
4+
5+
toolchain go1.23.6
46

57
replace (
68
github.com/ease-lab/vhive-xdt/proto/crossXDT => github.com/ease-lab/vhive-xdt/proto/crossXDT v0.0.0-20221107151004-a0940018d178
@@ -22,39 +24,36 @@ require (
2224
github.com/vhive-serverless/vSwarm/examples/protobuf/helloworld v0.0.0-00010101000000-000000000000
2325
github.com/vhive-serverless/vSwarm/utils/storage/go v0.0.0-00010101000000-000000000000
2426
github.com/vhive-serverless/vSwarm/utils/tracing/go v0.0.0-00010101000000-000000000000
25-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0
26-
google.golang.org/grpc v1.63.2
27-
google.golang.org/protobuf v1.34.1
27+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0
28+
google.golang.org/grpc v1.65.0
29+
google.golang.org/protobuf v1.34.2
2830
)
2931

3032
require (
31-
capnproto.org/go/capnp/v3 v3.0.0-alpha-29 // indirect
32-
github.com/aws/aws-sdk-go v1.52.6 // indirect
33+
github.com/aws/aws-sdk-go v1.55.3 // indirect
3334
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3435
github.com/containerd/log v0.1.0 // indirect
3536
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
3637
github.com/ease-lab/vSwarm/utils/tracing/go v0.0.0-20220609140039-b4da20ea6b36 // indirect
3738
github.com/ease-lab/vhive-xdt/proto/crossXDT v0.0.0-00010101000000-000000000000 // indirect
3839
github.com/ease-lab/vhive-xdt/proto/downXDT v0.0.0-00010101000000-000000000000 // indirect
3940
github.com/ease-lab/vhive-xdt/proto/upXDT v0.0.0-00010101000000-000000000000 // indirect
40-
github.com/go-logr/logr v1.4.1 // indirect
41+
github.com/go-logr/logr v1.4.2 // indirect
4142
github.com/go-logr/stdr v1.2.2 // indirect
4243
github.com/go-redis/redis/v8 v8.11.5 // indirect
43-
github.com/golang/protobuf v1.5.4 // indirect
44+
github.com/google/uuid v1.6.0 // indirect
4445
github.com/jmespath/go-jmespath v0.4.0 // indirect
4546
github.com/kelseyhightower/envconfig v1.4.0 // indirect
4647
github.com/openzipkin/zipkin-go v0.4.3 // indirect
4748
github.com/pkg/errors v0.9.1 // indirect
48-
go.opentelemetry.io/otel v1.26.0 // indirect
49-
go.opentelemetry.io/otel/exporters/zipkin v1.26.0 // indirect
50-
go.opentelemetry.io/otel/metric v1.26.0 // indirect
51-
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
52-
go.opentelemetry.io/otel/trace v1.26.0 // indirect
49+
go.opentelemetry.io/otel v1.28.0 // indirect
50+
go.opentelemetry.io/otel/exporters/zipkin v1.28.0 // indirect
51+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
52+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
53+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
5354
go.uber.org/atomic v1.11.0 // indirect
54-
golang.org/x/net v0.25.0 // indirect
55-
golang.org/x/sync v0.7.0 // indirect
56-
golang.org/x/sys v0.20.0 // indirect
57-
golang.org/x/text v0.15.0 // indirect
58-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240509183442-62759503f434 // indirect
59-
zenhack.net/go/util v0.0.0-20230607025951-8b02fee814ae // indirect
55+
golang.org/x/net v0.27.0 // indirect
56+
golang.org/x/sys v0.22.0 // indirect
57+
golang.org/x/text v0.16.0 // indirect
58+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f // indirect
6059
)

0 commit comments

Comments
 (0)