0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cmd/dockerd: Fix overriding OTEL resource

Browse source 
e358792815
changed that field to a function and added an `OverrideResource`
function that allows to override it.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski 2024-02-09 15:28:43 +01:00
parent a79bb1e832
commit bc6d88c09a
No known key found for this signature in database
GPG key ID: B85EFCFE26DEF92A
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builder/builder-next/controller.go
View file

@ -67,11 +67,11 @@ func newController(ctx context.Context, rt http.RoundTripper, opt Opt) (*control
}
func getTraceExporter(ctx context.Context) trace.SpanExporter {
exp, err := detect.Exporter()
span, _, err := detect.Exporter()
if err != nil {
log.G(ctx).WithError(err).Error("Failed to detect trace exporter for buildkit controller")
}
return exp
return span
}
func newSnapshotterController(ctx context.Context, rt http.RoundTripper, opt Opt) (*control.Controller, error) {

2
cmd/dockerd/daemon.go
View file

@ -242,7 +242,7 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
// Override BuildKit's default Resource so that it matches the semconv
// version that is used in our code.
detect.Resource = resource.Default()
detect.OverrideResource(resource.Default())
detect.Recorder = detect.NewTraceRecorder()
tp, err := detect.TracerProvider()