Skip to content

Commit

Permalink
vendor: pin OTEL to version that is compatible with BuildKit
Browse files Browse the repository at this point in the history
    Building static bundles/binary-daemon/dockerd (linux/arm64)...
    # github.com/docker/docker/vendor/github.com/moby/buildkit/worker/containerd
    vendor/github.com/moby/buildkit/worker/containerd/containerd.go:56:74: cannot use &gogoptypes.Empty{} (value of type *"github.com/docker/docker/vendor/github.com/gogo/protobuf/types".Empty) as *emptypb.Empty value in argument to client.IntrospectionService().Server

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Mar 14, 2023
1 parent c87daa5 commit 829779f
Show file tree
Hide file tree
Showing 161 changed files with 6,493 additions and 6,028 deletions.
53 changes: 40 additions & 13 deletions vendor.mod
Expand Up @@ -99,6 +99,11 @@ require (
resenje.org/singleflight v0.3.0
)

require (
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.18.0 // indirect
Expand Down Expand Up @@ -147,7 +152,6 @@ require (
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-msgpack v0.5.5 // indirect
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
Expand Down Expand Up @@ -175,18 +179,18 @@ require (
go.etcd.io/etcd/raft/v3 v3.5.6 // indirect
go.etcd.io/etcd/server/v3 v3.5.6 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
go.opentelemetry.io/otel v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0 // indirect
go.opentelemetry.io/otel/metric v0.37.0 // indirect
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
go.opentelemetry.io/otel/trace v1.14.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/otel v1.14.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.14.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/otel/metric v0.37.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/otel/sdk v1.14.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/otel/trace v1.14.0 // indirect; indirect // replaced: see replace section for version used
go.opentelemetry.io/proto/otlp v0.19.0 // indirect; indirect // replaced: see replace section for version used
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
Expand All @@ -198,3 +202,26 @@ require (
google.golang.org/appengine v1.6.7 // indirect
k8s.io/klog/v2 v2.90.1 // indirect
)

replace (
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc => go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0
//go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace => go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.29.0
//go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0
//go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.4.1
//go.opentelemetry.io/otel/exporters/jaeger => go.opentelemetry.io/otel/exporters/jaeger v1.4.1
go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.1
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.1
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.4.1
//go.opentelemetry.io/otel/exporters/otlp/internal/retry => go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.1
go.opentelemetry.io/otel/internal/metric => go.opentelemetry.io/otel/internal/metric v0.27.0
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.27.0
//go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.4.1
//go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.4.1
go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.12.0
// pinning to older version to fix compatibility with BuildKit v0.11;
// - https://github.com/moby/buildkit/blob/v0.11.4/go.mod#L71-L81
// - https://github.com/moby/buildkit/blob/v0.11.4/go.mod#L148-L151
// see https://github.com/moby/moby/pull/44530#issuecomment-1460561806
// FIXME(thaJeztah): remove once we update to BuildKit v0.12.x
google.golang.org/grpc => google.golang.org/grpc v1.50.1
)

0 comments on commit 829779f

Please sign in to comment.