Skip to content

Commit 5a4cfa9

Browse files
Merge pull request #2138 from marioferh/OCPBUGS-22515
OCPBUGS-22742: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp to 0.44.0
2 parents 31196ff + e5bf20c commit 5a4cfa9

File tree

222 files changed

+16931
-4774
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

222 files changed

+16931
-4774
lines changed

go.mod

+17-16
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/prometheus/prometheus v0.44.0
2222
github.com/stretchr/testify v1.8.4
2323
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
24-
golang.org/x/sync v0.2.0
24+
golang.org/x/sync v0.3.0
2525
golang.org/x/text v0.13.0
2626
gopkg.in/yaml.v2 v2.4.0
2727
gopkg.in/yaml.v3 v3.0.1
@@ -44,7 +44,7 @@ require (
4444
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
4545
github.com/aws/aws-sdk-go v1.44.245 // indirect
4646
github.com/beorn7/perks v1.0.1 // indirect
47-
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
47+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
4848
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4949
github.com/coreos/go-semver v0.3.0 // indirect
5050
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -81,7 +81,7 @@ require (
8181
github.com/google/uuid v1.3.0 // indirect
8282
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
8383
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
84-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
84+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
8585
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8686
github.com/jmespath/go-jmespath v0.4.0 // indirect
8787
github.com/josharian/intern v1.0.0 // indirect
@@ -114,29 +114,30 @@ require (
114114
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
115115
go.mongodb.org/mongo-driver v1.11.3 // indirect
116116
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
117-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
118-
go.opentelemetry.io/otel v1.14.0 // indirect
119-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
120-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
121-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
122-
go.opentelemetry.io/otel/metric v0.37.0 // indirect
123-
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
124-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
125-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
118+
go.opentelemetry.io/otel v1.19.0 // indirect
119+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
120+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
121+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
122+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
123+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
124+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
126125
go.uber.org/atomic v1.10.0 // indirect
127126
go.uber.org/goleak v1.2.1 // indirect
128127
go.uber.org/multierr v1.9.0 // indirect
129128
go.uber.org/zap v1.24.0 // indirect
130129
golang.org/x/crypto v0.14.0 // indirect
131130
golang.org/x/net v0.17.0 // indirect
132-
golang.org/x/oauth2 v0.8.0 // indirect
131+
golang.org/x/oauth2 v0.10.0 // indirect
133132
golang.org/x/sys v0.13.0 // indirect
134133
golang.org/x/term v0.13.0 // indirect
135134
golang.org/x/time v0.3.0 // indirect
136135
google.golang.org/appengine v1.6.7 // indirect
137-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
138-
google.golang.org/grpc v1.53.0 // indirect
139-
google.golang.org/protobuf v1.30.0 // indirect
136+
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
137+
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
138+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
139+
google.golang.org/grpc v1.58.2 // indirect
140+
google.golang.org/protobuf v1.31.0 // indirect
140141
gopkg.in/inf.v0 v0.9.1 // indirect
141142
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
142143
k8s.io/kms v0.27.2 // indirect

go.sum

+40-49
Large diffs are not rendered by default.

vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/BUILD.bazel

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/fieldmask.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/mux.go

+10-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/grpc-ecosystem/grpc-gateway/v2/runtime/query.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/common.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/config.go

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/handler.go

+45-34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil/gen.go

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)