Skip to content

core/runtime/v2: remove uses of otelgrpc.UnaryClientInterceptor#12606

Merged
mxpv merged 1 commit intocontainerd:mainfrom
thaJeztah:otel_deprecations
Dec 1, 2025
Merged

core/runtime/v2: remove uses of otelgrpc.UnaryClientInterceptor#12606
mxpv merged 1 commit intocontainerd:mainfrom
thaJeztah:otel_deprecations

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Dec 1, 2025 •
edited
Loading

The otelgrpc.UnaryClientInterceptor and otelgrpc.StreamClientInterceptor options were deprecated and removed in favor of NewClientHandler.

@thaJeztah
core/runtime/v2: remove uses of otelgrpc.UnaryClientInterceptor
459a952 
The otelgrpc.UnaryClientInterceptor and otelgrpc.StreamClientInterceptor
options were deprecated and removed in favor of NewClientHandler.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Dec 1, 2025
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 1, 2025

@cpuguy83 I see you added the //nolint comments in #10186, but it looks like these functions have now been removed in OTEL, and (apparently) this should be the replacement. Not sure how to verify fi this all works as intended though; perhaps you could have a look?

@thaJeztah thaJeztah requested review from Copilot and cpuguy83 December 1, 2025 13:37
Copilot AI reviewed Dec 1, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the containerd codebase to use the new OpenTelemetry gRPC instrumentation API by replacing deprecated interceptor functions with the modern stats handler approach.

  • Replaces otelgrpc.UnaryClientInterceptor() and otelgrpc.StreamClientInterceptor() with otelgrpc.NewClientHandler()
  • Removes obsolete nolint:staticcheck directives that were suppressing deprecation warnings
  • Updates documentation to reflect the new API usage

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
core/runtime/v2/shim.go Updates gRPC client connection setup to use the new otelgrpc.NewClientHandler() instead of deprecated interceptors
docs/tracing.md Updates the client tracing example to demonstrate the new API usage

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@cpuguy83
Copy link
Copy Markdown
Member

cpuguy83 commented Dec 1, 2025

Seems correct.

@thaJeztah thaJeztah marked this pull request as ready for review December 1, 2025 16:39
@dosubot dosubot Bot added the area/runtime Runtime label Dec 1, 2025
@thaJeztah thaJeztah added cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch and removed area/runtime Runtime labels Dec 1, 2025
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 1, 2025

Thanks! Let me move this one out of draft 👍

@dmcgowan dmcgowan moved this from Needs Triage to Review In Progress in Pull Request Review Dec 1, 2025
@mxpv mxpv added this pull request to the merge queue Dec 1, 2025
Merged via the queue into containerd:main with commit 017ae81 Dec 1, 2025
58 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Dec 1, 2025
@thaJeztah thaJeztah mentioned this pull request Dec 4, 2025
Merged
1 task
@thaJeztah thaJeztah deleted the otel_deprecations branch December 4, 2025 08:27
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 4, 2025

/cherry-pick release/2.2

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 4, 2025

/cherry-pick release/2.1

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Dec 4, 2025

@thaJeztah: new pull request created: #12622

Details

In response to this:

/cherry-pick release/2.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 4, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Dec 4, 2025

@thaJeztah: new pull request created: #12623

Details

In response to this:

/cherry-pick release/2.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 4, 2025
Merged
@austinvazquez austinvazquez added cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch and removed cherry-pick/2.1.x Change to be cherry picked to release/2.1 branch cherry-pick/2.2.x Change to be cherry picked to release/2.2 branch labels Dec 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@dmcgowan dmcgowan dmcgowan approved these changes

@mxpv mxpv mxpv approved these changes

@cpuguy83 cpuguy83 Awaiting requested review from cpuguy83

@austinvazquez austinvazquez Awaiting requested review from austinvazquez

Assignees

No one assigned

Labels

cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch cherry-picked/2.2.x PR commits are cherry-picked into release/2.2 branch size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@thaJeztah @cpuguy83 @k8s-infra-cherrypick-robot @dmcgowan @mxpv @k8s-ci-robot @austinvazquez