Skip to content

Commit 0783aa4

Browse files
authored
Update Otel and it's deps. (#333)
1 parent ea5b75d commit 0783aa4

File tree

4 files changed

+132
-149
lines changed

4 files changed

+132
-149
lines changed

controllers/installation_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ func (r *InstallationReconciler) applyDeletionPolicy(ctx context.Context, log lo
460460
func CreatePorterGRPCClient(ctx context.Context) (porterv1alpha1.PorterClient, ClientConn, error) {
461461
// TODO: Make this not a hard coded value of grpc deployment/service.
462462
// Have a controller create deployment of grpc server and service
463-
conn, err := grpc.DialContext(ctx, "porter-grpc-service:3001", grpc.WithTransportCredentials(insecure.NewCredentials()))
463+
conn, err := grpc.NewClient("porter-grpc-service:3001", grpc.WithTransportCredentials(insecure.NewCredentials()))
464464
if err != nil {
465465
return nil, nil, fmt.Errorf("error setting up listener for porter grpc client")
466466
}

go.mod

+38-40
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ replace (
1515

1616
require (
1717
get.porter.sh/magefiles v0.6.8
18-
get.porter.sh/porter v1.0.17
18+
get.porter.sh/porter v1.1.0
1919
github.com/carolynvs/aferox v0.3.0
2020
github.com/carolynvs/magex v0.9.0
21-
github.com/go-logr/logr v1.4.1
21+
github.com/go-logr/logr v1.4.2
2222
github.com/magefile/mage v1.15.0
2323
github.com/mitchellh/mapstructure v1.5.0
2424
github.com/onsi/ginkgo/v2 v2.17.3
@@ -27,11 +27,11 @@ require (
2727
github.com/pkg/errors v0.9.1
2828
github.com/spf13/afero v1.11.0
2929
github.com/stretchr/testify v1.9.0
30-
github.com/tidwall/gjson v1.17.0
30+
github.com/tidwall/gjson v1.17.1
3131
github.com/tidwall/pretty v1.2.1
3232
golang.org/x/sync v0.7.0
33-
google.golang.org/grpc v1.59.0
34-
google.golang.org/protobuf v1.33.0
33+
google.golang.org/grpc v1.64.0
34+
google.golang.org/protobuf v1.34.1
3535
gopkg.in/yaml.v3 v3.0.1
3636
k8s.io/api v0.29.3
3737
k8s.io/apimachinery v0.29.3
@@ -48,7 +48,7 @@ require (
4848
github.com/andybalholm/cascadia v1.3.2 // indirect
4949
github.com/beorn7/perks v1.0.1 // indirect
5050
github.com/cbroglie/mustache v1.4.0 // indirect
51-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
51+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5252
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5353
github.com/cnabio/cnab-go v0.25.1 // indirect
5454
github.com/cnabio/cnab-to-oci v0.4.0 // indirect
@@ -82,15 +82,15 @@ require (
8282
github.com/golang/snappy v0.0.4 // indirect
8383
github.com/google/gnostic-models v0.6.8 // indirect
8484
github.com/google/go-cmp v0.6.0 // indirect
85-
github.com/google/go-containerregistry v0.19.0 // indirect
85+
github.com/google/go-containerregistry v0.19.2 // indirect
8686
github.com/google/gofuzz v1.2.0 // indirect
8787
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
88-
github.com/google/uuid v1.4.0 // indirect
88+
github.com/google/uuid v1.6.0 // indirect
8989
github.com/gorilla/mux v1.8.0 // indirect
9090
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
91-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
91+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
9292
github.com/hashicorp/errwrap v1.1.0 // indirect
93-
github.com/hashicorp/go-hclog v1.5.0 // indirect
93+
github.com/hashicorp/go-hclog v1.6.3 // indirect
9494
github.com/hashicorp/go-multierror v1.1.1 // indirect
9595
github.com/hashicorp/go-plugin v1.4.0 // indirect
9696
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -99,19 +99,18 @@ require (
9999
github.com/jeremywohl/flatten v1.0.1 // indirect
100100
github.com/josharian/intern v1.0.0 // indirect
101101
github.com/json-iterator/go v1.1.12 // indirect
102-
github.com/klauspost/compress v1.17.7 // indirect
102+
github.com/klauspost/compress v1.17.8 // indirect
103103
github.com/klauspost/pgzip v1.2.6 // indirect
104104
github.com/magiconair/properties v1.8.7 // indirect
105105
github.com/mailru/easyjson v0.7.7 // indirect
106106
github.com/mattn/go-colorable v0.1.13 // indirect
107-
github.com/mattn/go-isatty v0.0.19 // indirect
108-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
107+
github.com/mattn/go-isatty v0.0.20 // indirect
109108
github.com/mholt/archiver/v3 v3.5.1 // indirect
110109
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37 // indirect
111110
github.com/mitchellh/go-homedir v1.1.0 // indirect
112111
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
113-
github.com/mmcdole/gofeed v1.2.1 // indirect
114-
github.com/mmcdole/goxpp v1.1.0 // indirect
112+
github.com/mmcdole/gofeed v1.3.0 // indirect
113+
github.com/mmcdole/goxpp v1.1.1-0.20240225020742-a0c311522b23 // indirect
115114
github.com/moby/docker-image-spec v1.3.1 // indirect
116115
github.com/moby/sys/user v0.1.0 // indirect
117116
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -121,15 +120,15 @@ require (
121120
github.com/nwaples/rardecode v1.1.3 // indirect
122121
github.com/oklog/run v1.1.0 // indirect
123122
github.com/oklog/ulid v1.3.1 // indirect
124-
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
125-
github.com/osteele/liquid v1.3.0 // indirect
123+
github.com/opencontainers/image-spec v1.1.0 // indirect
124+
github.com/osteele/liquid v1.4.0 // indirect
126125
github.com/osteele/tuesday v1.0.3 // indirect
127126
github.com/pelletier/go-toml v1.9.5 // indirect
128127
github.com/pierrec/lz4/v4 v4.1.21 // indirect
129128
github.com/pmezard/go-difflib v1.0.0 // indirect
130-
github.com/prometheus/client_golang v1.18.0 // indirect
129+
github.com/prometheus/client_golang v1.19.1 // indirect
131130
github.com/prometheus/client_model v0.5.0 // indirect
132-
github.com/prometheus/common v0.45.0 // indirect
131+
github.com/prometheus/common v0.48.0 // indirect
133132
github.com/prometheus/procfs v0.12.0 // indirect
134133
github.com/qri-io/jsonpointer v0.1.1 // indirect
135134
github.com/qri-io/jsonschema v0.2.2-0.20210831022256-780655b2ba0e // indirect
@@ -143,7 +142,7 @@ require (
143142
github.com/subosito/gotenv v1.4.2 // indirect
144143
github.com/tidwall/match v1.1.1 // indirect
145144
github.com/tidwall/sjson v1.2.5 // indirect
146-
github.com/ulikunitz/xz v0.5.11 // indirect
145+
github.com/ulikunitz/xz v0.5.12 // indirect
147146
github.com/vbatts/tar-split v0.11.3 // indirect
148147
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
149148
github.com/xdg-go/scram v1.1.2 // indirect
@@ -154,32 +153,31 @@ require (
154153
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
155154
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
156155
go.mongodb.org/mongo-driver v1.13.1 // indirect
157-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
158-
go.opentelemetry.io/otel v1.19.0 // indirect
159-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
160-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
161-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
162-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect
163-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
164-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
165-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
166-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
156+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect
157+
go.opentelemetry.io/otel v1.27.0 // indirect
158+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
159+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 // indirect
160+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0 // indirect
161+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.27.0 // indirect
162+
go.opentelemetry.io/otel/metric v1.27.0 // indirect
163+
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
164+
go.opentelemetry.io/otel/trace v1.27.0 // indirect
165+
go.opentelemetry.io/proto/otlp v1.2.0 // indirect
167166
go.uber.org/multierr v1.11.0 // indirect
168-
go.uber.org/zap v1.26.0 // indirect
169-
golang.org/x/crypto v0.22.0 // indirect
167+
go.uber.org/zap v1.27.0 // indirect
168+
golang.org/x/crypto v0.23.0 // indirect
170169
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
171-
golang.org/x/net v0.24.0 // indirect
172-
golang.org/x/oauth2 v0.15.0 // indirect
173-
golang.org/x/sys v0.19.0 // indirect
174-
golang.org/x/term v0.19.0 // indirect
175-
golang.org/x/text v0.14.0 // indirect
170+
golang.org/x/net v0.25.0 // indirect
171+
golang.org/x/oauth2 v0.20.0 // indirect
172+
golang.org/x/sys v0.21.0 // indirect
173+
golang.org/x/term v0.20.0 // indirect
174+
golang.org/x/text v0.15.0 // indirect
176175
golang.org/x/time v0.5.0 // indirect
177176
golang.org/x/tools v0.20.0 // indirect
178177
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
179178
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
180-
google.golang.org/appengine v1.6.7 // indirect
181-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
182-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
179+
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
180+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
183181
gopkg.in/inf.v0 v0.9.1 // indirect
184182
gopkg.in/ini.v1 v1.67.0 // indirect
185183
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect

0 commit comments

Comments
 (0)