Skip to content

Commit

Permalink
Merge pull request #181 from marcoshuck/bump/go_dependencies
Browse files Browse the repository at this point in the history
Bump Go dependencies
  • Loading branch information
marcoshuck authored Jul 28, 2024
2 parents fa680a1 + c9818eb commit fba7db8
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 78 deletions.
2 changes: 1 addition & 1 deletion build/app.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /build

Expand Down
2 changes: 1 addition & 1 deletion build/gateway.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21 AS builder
FROM golang:1.22 AS builder

WORKDIR /build

Expand Down
48 changes: 24 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/marcoshuck/todo

go 1.21
go 1.22

require (
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.34.1-20240508200655-46a4cf4ba109.1
Expand All @@ -11,24 +11,24 @@ require (
github.com/go-chi/cors v1.2.1
github.com/gojaguar/jaguar v0.6.1
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
github.com/mennanov/fieldmask-utils v1.1.2
github.com/prometheus/client_golang v1.19.1
github.com/stretchr/testify v1.9.0
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.2.4
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0
go.opentelemetry.io/otel v1.27.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.24.0
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.3.1
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0
go.opentelemetry.io/otel v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
go.opentelemetry.io/otel/metric v1.27.0
go.opentelemetry.io/otel/sdk v1.27.0
go.opentelemetry.io/otel/sdk/metric v1.27.0
go.opentelemetry.io/otel/trace v1.27.0
go.opentelemetry.io/otel/metric v1.28.0
go.opentelemetry.io/otel/sdk v1.28.0
go.opentelemetry.io/otel/sdk/metric v1.28.0
go.opentelemetry.io/otel/trace v1.28.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.34.1
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
gorm.io/driver/sqlite v1.5.5
gorm.io/gorm v1.25.10
)
Expand All @@ -40,9 +40,9 @@ require (
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-sql-driver/mysql v1.7.0 // indirect
github.com/google/cel-go v0.20.1 // indirect
Expand All @@ -62,18 +62,18 @@ require (
github.com/prometheus/procfs v0.12.0 // indirect
github.com/sosodev/duration v1.2.0 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.2.4 // indirect
github.com/vektah/gqlparser/v2 v2.5.14 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.1 // indirect
github.com/vektah/gqlparser/v2 v2.5.11 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/mysql v1.5.0 // indirect
gorm.io/driver/postgres v1.5.0 // indirect
Expand Down
95 changes: 48 additions & 47 deletions go.sum

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion internal/gateway/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ func Setup(ctx context.Context, cfg conf.GatewayConfig) (Gateway, error) {

opts := []grpc.DialOption{
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithBlock(),
interceptors.NewClientUnaryInterceptors(telemeter),
interceptors.NewClientStreamInterceptors(telemeter),
grpc.WithStatsHandler(
Expand Down
4 changes: 2 additions & 2 deletions internal/telemetry/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ func newResource(ctx context.Context, cfg config.Config) (*resource.Resource, er
)
}

func newConn(ctx context.Context, addr string) (*grpc.ClientConn, error) {
conn, err := grpc.DialContext(ctx, addr,
func newClient(addr string) (*grpc.ClientConn, error) {
conn, err := grpc.NewClient(addr,
grpc.WithTransportCredentials(insecure.NewCredentials()),
)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/telemetry/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func newMetrics(cfg config.Config, metrics conf.Metrics) (metric.MeterProvider,
if err != nil {
return nil, nil, err
}
conn, err := newConn(ctx, metrics.Address())
conn, err := newClient(metrics.Address())
if err != nil {
return nil, nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/telemetry/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func newTracing(cfg config.Config, tracing conf.Tracing) (trace.TracerProvider,
if err != nil {
return nil, nil, err
}
conn, err := newConn(ctx, tracing.Address())
conn, err := newClient(tracing.Address())
if err != nil {
return nil, nil, err
}
Expand Down

0 comments on commit fba7db8

Please sign in to comment.