Update buildkit take2

[thaJeztah]

quick try to make #3232 work

[thaJeztah]

Arf.. looks like this is causing issues; google/gnostic@896953e.

error: unable to create file OpenAPIv2/OpenAPIv2.pb.go: File exists
error: unable to create file OpenAPIv2/OpenAPIv2.proto: File exists
error: unable to create file OpenAPIv2/README.md: File exists
error: unable to create file OpenAPIv2/openapi-2.0.json: File exists
error: unable to create file OpenAPIv3/OpenAPIv3.go: File exists
error: unable to create file OpenAPIv3/OpenAPIv3.pb.go: File exists
error: unable to create file OpenAPIv3/OpenAPIv3.proto: File exists
error: unable to create file OpenAPIv3/README.md: File exists
error: unable to create file OpenAPIv3/openapi-3.0.json: File exists
error: unable to create file OpenAPIv3/schema-generator/3.0.0.md: File exists
error: unable to create file OpenAPIv3/schema-generator/3.0.1.md: File exists
error: unable to create file OpenAPIv3/schema-generator/README.md: File exists
error: unable to create file OpenAPIv3/schema-generator/main.go: File exists
fatal: Could not reset index file to revision '7c663266750e7d82587642f65e60bc4083f1f84e'.

[thaJeztah]

And more errors currently;

/go/src/github.com/docker/cli/vendor/go.opentelemetry.io/proto/otlp/trace/v1/trace.pb.go:25:6: could not import go.opentelemetry.io/proto/otlp/common/v1 /go/src/github.com/docker/cli/vendor/go.opentelemetry.io/proto/otlp/common/v1/common.pb.go:40:17: ProtoPackageIsVersion4 not declared by package proto)

Those should be because the version that was specified is too old (needs v1.4 or above; golang/protobuf@ae97035)

[thaJeztah]

oh! this one is weird

/go/src/github.com/docker/cli/cli/command/image/build_buildkit.go:403:9: v declared but not used 

also

could not import go.opentelemetry.io/proto/otlp/collector/trace/v1
/go/src/github.com/docker/cli/vendor/go.opentelemetry.io/proto/otlp/collector/trace/v1/trace_service.pb.gw.go:164:132:
AssumeColonVerbOpt not declared by package runtime

Last one; runtime refers to github.com/grpc-ecosystem/grpc-gateway/runtime. Probably needs an update. https://github.com/moby/buildkit/blob/v0.9.0/vendor/modules.txt#L280 shows:

# github.com/grpc-ecosystem/grpc-gateway v1.16.0
github.com/grpc-ecosystem/grpc-gateway/internal
github.com/grpc-ecosystem/grpc-gateway/runtime
github.com/grpc-ecosystem/grpc-gateway/utilities

and

# github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
github.com/grpc-ecosystem/go-grpc-middleware

Getting closer;

vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/marshal_httpbodyproto.go:4:2: cannot find package "google.golang.org/genproto/googleapis/api/httpbody" in any of:
/go/src/github.com/docker/cli/vendor/google.golang.org/genproto/googleapis/api/httpbody (vendor tree)
/usr/local/go/src/google.golang.org/genproto/googleapis/api/httpbody (from $GOROOT)
/go/src/google.golang.org/genproto/googleapis/api/httpbody (from $GOPATH)
vendor/github.com/grpc-ecosystem/grpc-gateway/runtime/fieldmask.go:10:2: cannot find package "google.golang.org/genproto/protobuf/field_mask" in any of:
/go/src/github.com/docker/cli/vendor/google.golang.org/genproto/protobuf/field_mask (vendor tree)
/usr/local/go/src/google.golang.org/genproto/protobuf/field_mask (from $GOROOT)
/go/src/google.golang.org/genproto/protobuf/field_mask (from $GOPATH)

https://github.com/moby/buildkit/blob/v0.9.0/vendor/modules.txt#L280

# google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a
google.golang.org/genproto/googleapis/api/httpbody
google.golang.org/genproto/googleapis/rpc/errdetails
google.golang.org/genproto/googleapis/rpc/status
google.golang.org/genproto/protobuf/field_mask

And closer;

#14 33.38 # github.com/docker/cli/vendor/go.opentelemetry.io/proto/otlp/collector/trace/v1
#14 33.38 vendor/go.opentelemetry.io/proto/otlp/collector/trace/v1/trace_service_grpc.pb.go:14:11: undefined: grpc.SupportPackageIsVersion7
#14 33.38 vendor/go.opentelemetry.io/proto/otlp/collector/trace/v1/trace_service_grpc.pb.go:68:35: undefined: grpc.ServiceRegistrar

https://github.com/moby/buildkit/blob/v0.9.0/vendor/modules.txt#L486

# google.golang.org/grpc v1.38.0

[thaJeztah]

We need to check if we need the fork for this; https://github.com/moby/buildkit/blob/v0.9.0/go.mod#L79-L83

[crazy-max]

Yes indeed I didn't take these ones into account. Hopefully should be fixed upstream soon:

• otelhttp: get tracer from current context if not set in constructor open-telemetry/opentelemetry-go-contrib#873
• otelhttptrace: get tracer from request if available open-telemetry/opentelemetry-go-contrib#874
• otelhttp: add WithClientTrace to connect with otelhttptrace  open-telemetry/opentelemetry-go-contrib#875

[thaJeztah]

Added a commit to use that fork

[codecov-commenter]

Codecov Report

Merging #3237 (e2487f9) into master (56e5910) will not change coverage.
The diff coverage is n/a.

❗ Current head e2487f9 differs from pull request most recent head ae797e8. Consider uploading reports for the commit ae797e8 to get more accurate results

@@ Coverage Diff @@## master #3237 +/- ##
=======================================
Coverage 57.99% 57.99% =======================================
Files 302 302 Lines 21764 21764 =======================================
Hits 12621 12621 Misses 8219 8219 Partials 924 924