Skip to content

vendor: go.opentelemetry.io/otel/exporters v1.38.0, go.opentelemetry.io/contrib v0.63.0#12604

Merged
mikebrow merged 2 commits intocontainerd:mainfrom
thaJeztah:bump_otels
Dec 8, 2025
Merged

vendor: go.opentelemetry.io/otel/exporters v1.38.0, go.opentelemetry.io/contrib v0.63.0#12604
mikebrow merged 2 commits intocontainerd:mainfrom
thaJeztah:bump_otels

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Dec 1, 2025 •
edited
Loading

@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Dec 1, 2025
@dosubot dosubot Bot added the dependencies Pull requests that update a dependency file label Dec 1, 2025
@thaJeztah thaJeztah mentioned this pull request Dec 1, 2025
Merged
1 task
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 1, 2025 •
edited
Loading

Ugh. So much for SemVer; the otelgrpc.UnaryClientInterceptor() and otelgrpc.StreamClientInterceptor() options have been removed now?

containerd/core/runtime/v2/shim.go

Lines 306 to 310 in f37f951

gopts := []grpc.DialOption{
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()), //nolint:staticcheck // Ignore SA1019. Deprecation assumes use of [grpc.NewClient] but we are not using that here.
grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()), //nolint:staticcheck // Ignore SA1019. Deprecation assumes use of [grpc.NewClient] but we are not using that here.
}

@thaJeztah thaJeztah marked this pull request as draft December 1, 2025 13:29
@thaJeztah thaJeztah mentioned this pull request Dec 1, 2025
Merged
@thaJeztah thaJeztah marked this pull request as ready for review December 4, 2025 08:31
mikebrow
mikebrow approved these changes Dec 7, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

akhilerm
akhilerm approved these changes Dec 8, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@akhilerm akhilerm left a comment

Choose a reason for hiding this comment

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

LGTM

Need to rebase with the fuzz changes from main for the CI to pass.

@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Dec 8, 2025
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 8, 2025

Rebased to get a fresh run of CI with the Fuzzing fixes in

@mikebrow mikebrow added this pull request to the merge queue Dec 8, 2025
Merged via the queue into containerd:main with commit d255706 Dec 8, 2025
52 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Dec 8, 2025
@thaJeztah thaJeztah deleted the bump_otels branch December 8, 2025 14:46
@thaJeztah thaJeztah mentioned this pull request Dec 17, 2025
Merged
@corhere corhere mentioned this pull request Apr 22, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akhilerm akhilerm akhilerm approved these changes

@mikebrow mikebrow mikebrow approved these changes

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency file size/XXL

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @akhilerm @mikebrow @k8s-ci-robot