Skip to content

util/tracing/otlptracegrpc: remove errNoClient, and use consistent alias #6494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thaJeztah wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −8
Open

util/tracing/otlptracegrpc: remove errNoClient, and use consistent alias #6494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7cb9d3
util/tracing/otlptracegrpc: remove errNoClient
thaJeztah Jan 27, 2026
d01bea1
golangci-lint: force consistent alias for stdlib "error" imports
thaJeztah Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ linters:
- unusedwrite
importas:
alias:
- pkg: errors
alias: stderrors
- pkg: github.com/containerd/errdefs
alias: cerrdefs
- pkg: github.com/opencontainers/image-spec/specs-go/v1
Expand Down
4 changes: 3 additions & 1 deletion util/tracing/otlptracegrpc/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package otlptracegrpc

import (
"context"
stderrors "errors"
"sync"
"time"

Expand Down Expand Up @@ -80,7 +81,8 @@ func (c *client) UploadTraces(ctx context.Context, protoSpans []*tracepb.Resourc
c.lock.Lock()
defer c.lock.Unlock()
if c.tracesClient == nil {
return errNoClient
// Intentionally using a stdlib error here; see https://github.com/moby/buildkit/commit/f57b3ef89b3053048e7f46d0296d98bcef79448b
return stderrors.New("no client")
Comment on lines -83 to +85
Copy link
Member Author

@thaJeztah thaJeztah Jan 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @tonistiigi in case it was not required to use stdlib errors for this; if so, we can drop the extra import and just use errors.New() from pkg/errors.

Copy link
Member

@tonistiigi tonistiigi Feb 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, just leave pkg/errors to get stacktrace.

}

_, err := c.tracesClient.Export(ctx, &coltracepb.ExportTraceServiceRequest{
Expand Down
7 changes: 0 additions & 7 deletions util/tracing/otlptracegrpc/errors.go
View file
Open in desktop

This file was deleted.

Loading