-
Notifications
You must be signed in to change notification settings - Fork 692
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.
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
fix prometheus interceptors not converting context errors to gRPC codes #571
fix prometheus interceptors not converting context errors to gRPC codes #571
Conversation
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, could you make this change against v2? v1 is kinda maintenance mode.
d80851e
to
e4751c0
Compare
@johanbrandhorst - is this what you meant? (I didn't realise v2 branch was current given Edit: But how does that work with the releases for the prometheus interceptor - e.g. here it's against the main branch not v2 - from what I can tell. How will that work with the |
The unit & lint test checks don't run for some reason. Any chance one of the maintainers could take a look why that is? (I don't believe I have access to see.) |
@johanbrandhorst - apologies for the ping but it would be great to for this to be considered. The unit & lint test checks don't run for some reason (they do pass). Any chance you or one of the maintainers could take a look why that is? (I don't believe I have access to see/re-run the tests) |
Sorry to have missed this - we merged v2 into main so this should be targeted at main now. Please update again 😅. |
e4751c0
to
8779b13
Compare
8779b13
to
87b051a
Compare
note: Do not merge - the added failing test still shows the suite as passing (which obv. is wrong). I'll try to figure out what is wrong. |
- Previously context.(Canceled|DeadlineExceeded) would result in an "Unknown" grpc_code
87b051a
to
a5213e5
Compare
Ok, now it passes:
Ready for review |
Thanks for your contribution! |
[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/grpc-ecosystem/go-grpc-middleware](https://togithub.com/grpc-ecosystem/go-grpc-middleware) | `v1.4.0` -> `v2.1.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fgrpc-ecosystem%2fgo-grpc-middleware/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fgrpc-ecosystem%2fgo-grpc-middleware/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fgrpc-ecosystem%2fgo-grpc-middleware/v1.4.0/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fgrpc-ecosystem%2fgo-grpc-middleware/v1.4.0/v2.1.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>grpc-ecosystem/go-grpc-middleware (github.com/grpc-ecosystem/go-grpc-middleware)</summary> ### [`v2.1.0`](https://togithub.com/grpc-ecosystem/go-grpc-middleware/releases/tag/v2.1.0) [Compare Source](https://togithub.com/grpc-ecosystem/go-grpc-middleware/compare/v2.0.1...v2.1.0) #### What's Changed - Support for subsystem in grpc prometheus counter and histogram metrics by [@​rohsaini](https://togithub.com/rohsaini) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/643](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/643) - doc: update client interceptors chaining example with grpc functions by [@​dethi](https://togithub.com/dethi) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/669](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/669) - adds fields from durationFieldFunc to request/response log entries by [@​vroldanbet](https://togithub.com/vroldanbet) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/670](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/670) - add doc for disabling log opts by [@​coleenquadros](https://togithub.com/coleenquadros) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/680](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/680) - Middleware for determining the real ip of the client by [@​MadsRC](https://togithub.com/MadsRC) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/682](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/682) - protovalidate: add option to ignore certain message types by [@​igor-tsiglyar](https://togithub.com/igor-tsiglyar) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/684](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/684) - Update README.md by [@​zeroboo](https://togithub.com/zeroboo) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/688](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/688) - Fix `InitializeMetrics` signature to allow use with `xds.GRPCServer` by [@​bozaro](https://togithub.com/bozaro) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/689](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/689) - Support retriable func condition by [@​tamayika](https://togithub.com/tamayika) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/687](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/687) - Extend realip parsing of GRPC peer address to handle IPv6 by [@​surik](https://togithub.com/surik) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/692](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/692) - Fix logging Example : log only first field by [@​arckadious](https://togithub.com/arckadious) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/694](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/694) - Extent realip interceptors with ip selection based on proxy count and list by [@​surik](https://togithub.com/surik) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/695](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/695) - Fix for vulnerability CVE-2023-44487 by [@​vkaushik](https://togithub.com/vkaushik) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/696](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/696) #### New Contributors - [@​rohsaini](https://togithub.com/rohsaini) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/643](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/643) - [@​dethi](https://togithub.com/dethi) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/669](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/669) - [@​vroldanbet](https://togithub.com/vroldanbet) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/670](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/670) - [@​MadsRC](https://togithub.com/MadsRC) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/682](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/682) - [@​igor-tsiglyar](https://togithub.com/igor-tsiglyar) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/684](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/684) - [@​zeroboo](https://togithub.com/zeroboo) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/688](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/688) - [@​bozaro](https://togithub.com/bozaro) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/689](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/689) - [@​tamayika](https://togithub.com/tamayika) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/687](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/687) - [@​surik](https://togithub.com/surik) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/692](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/692) - [@​arckadious](https://togithub.com/arckadious) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/694](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/694) - [@​vkaushik](https://togithub.com/vkaushik) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/696](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/696) **Full Changelog**: grpc-ecosystem/go-grpc-middleware@v2.0.1...v2.1.0 ### [`v2.0.1`](https://togithub.com/grpc-ecosystem/go-grpc-middleware/releases/tag/v2.0.1) [Compare Source](https://togithub.com/grpc-ecosystem/go-grpc-middleware/compare/v2.0.0...v2.0.1) #### What's Changed - Fix outdated 'make proto' command by [@​takp](https://togithub.com/takp) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/623](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/623) - Fix linting errors by [@​takp](https://togithub.com/takp) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/624](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/624) - Logging: Add missing variadic operator for fields by [@​olivierlemasle](https://togithub.com/olivierlemasle) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/629](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/629) - feat: Support extracting fields from CallMeta by [@​fsaintjacques](https://togithub.com/fsaintjacques) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/628](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/628) - Fix "make test" and "make lint" by [@​olivierlemasle](https://togithub.com/olivierlemasle) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/627](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/627) - Do not set timeout for stream initialization by [@​DavyJohnes](https://togithub.com/DavyJohnes) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/645](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/645) - Add logging option to disable fields in log entry by [@​coleenquadros](https://togithub.com/coleenquadros) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/631](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/631) - Update logging adapter docs by [@​aboryslawski](https://togithub.com/aboryslawski) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/647](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/647) #### New Contributors - [@​takp](https://togithub.com/takp) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/623](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/623) - [@​olivierlemasle](https://togithub.com/olivierlemasle) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/629](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/629) - [@​fsaintjacques](https://togithub.com/fsaintjacques) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/628](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/628) - [@​DavyJohnes](https://togithub.com/DavyJohnes) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/645](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/645) - [@​coleenquadros](https://togithub.com/coleenquadros) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/631](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/631) - [@​aboryslawski](https://togithub.com/aboryslawski) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/647](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/647) **Full Changelog**: grpc-ecosystem/go-grpc-middleware@v2.0.0...v2.0.1 ### [`v2.0.0`](https://togithub.com/grpc-ecosystem/go-grpc-middleware/releases/tag/v2.0.0) [Compare Source](https://togithub.com/grpc-ecosystem/go-grpc-middleware/compare/v1.4.0...v2.0.0) This is the first stable release of the new v2 release branch 🎉 Many of the interceptors have been rewritten from scratch and the project has been upgraded to use the Go Protobuf v2 API. See the project README for details and migration guide. Thanks to all contributors who made this possible! 💪🏽 #### What's Changed - Initial change for v2. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/276](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/276) - Updated README with note that it's under development. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/278](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/278) - Fix typo in field extractor (splices -> slices) ([#​287](https://togithub.com/grpc-ecosystem/go-grpc-middleware/issues/287)) by [@​bvwells](https://togithub.com/bvwells) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/289](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/289) - Moved imports to v2; Moved to Go 1.14.2 by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/290](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/290) - Formatted code; Added goimports to Makefile, Renamed pb_testproto to testpb. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/291](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/291) - Fixed providers go modules, examples and consistency. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/292](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/292) - added example for AuthFuncOverride v2 branch by [@​tegk](https://togithub.com/tegk) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/294](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/294) - Added some description of the Makefile in the contributing.md by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/298](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/298) - v2: Add support for the zerolog logging provider by [@​irridia](https://togithub.com/irridia) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/299](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/299) - proto: fix gogoproto import by [@​johanbrandhorst](https://togithub.com/johanbrandhorst) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/302](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/302) - Retry dial and connection errors for grpc stream. by [@​kartlee](https://togithub.com/kartlee) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/308](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/308) - Moved to GH actions; Added lint; Added issue/PR templates. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/296](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/296) - inline localhost certificate into go file by [@​bmon](https://togithub.com/bmon) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/318](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/318) - Update streaming interceptor example by [@​G07cha](https://togithub.com/G07cha) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/322](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/322) - Do not stop retrying based on earlier good message from the stream by [@​kartlee](https://togithub.com/kartlee) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/323](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/323) - test certs - cherry-pick PR325 on v2 by [@​dmitris](https://togithub.com/dmitris) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/331](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/331) - add all make target, reword instructions by [@​dmitris](https://togithub.com/dmitris) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/335](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/335) - remove 1.12.x from build config for consistency with master by [@​dmitris](https://togithub.com/dmitris) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/337](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/337) - \[v2] Fix the special case for jaeger format traceid extraction by [@​nvx](https://togithub.com/nvx) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/340](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/340) - \[v2] Fix ctxtags TagBasedRequestFieldExtractor extracting from fields in a oneof by [@​nvx](https://togithub.com/nvx) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/339](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/339) - Request Logging by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/311](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/311) - Bug fix for data race by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/354](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/354) - make ratelimit interface context aware by [@​xinxiao](https://togithub.com/xinxiao) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/367](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/367) - Add error param to the decider method of logging middleware by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/372](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/372) - \[v2] Add skip interceptor by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/364](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/364) - Chain middleware by [@​drewwells](https://togithub.com/drewwells) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/385](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/385) - Update travis ci badget to Github actions badge. by [@​drewwells](https://togithub.com/drewwells) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/384](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/384) - Upgraded proto related deps: grpc and protobuf; removed gogo from core. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/321](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/321) - improve v2 rate-limiter by [@​MalloZup](https://togithub.com/MalloZup) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/380](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/380) - Moved to buf; Added buf lint; Fixed ping service to match standards; … by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/383](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/383) - Add timer interface for OpenMetrics(Prometheus) Provider by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/387](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/387) - \[Rate-limit provider]: Add token bucket implementation of rate-limiter by [@​MalloZup](https://togithub.com/MalloZup) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/386](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/386) - Add OpenMetrics(Prometheus) in the provider module by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/379](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/379) - v2: Client unary interceptor timeout on v2 branch by [@​instabledesign](https://togithub.com/instabledesign) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/330](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/330) - add onRetryCallback callback function by [@​shamil](https://togithub.com/shamil) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/405](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/405) - v2: validator support for protoc-gen-validate 0.6.0 by [@​danielhochman](https://togithub.com/danielhochman) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/418](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/418) - v2: Refactor metrics interceptor and fix tests by [@​ash2k](https://togithub.com/ash2k) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/413](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/413) - Support customization of timestamp format (v2 branch) by [@​stanhu](https://togithub.com/stanhu) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/399](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/399) - Fixed misleading comments in the interceptor file by [@​iamrajiv](https://togithub.com/iamrajiv) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/424](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/424) - v2: Switch from github.com/go-kit/kit to github.com/go-kit/log interfaces by [@​liggitt](https://togithub.com/liggitt) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/427](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/427) - v2: Add support for the phuslog logging provider by [@​ogimenezb](https://togithub.com/ogimenezb) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/425](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/425) - v2:providers/zap: fix caller annotation by [@​jkawamoto](https://togithub.com/jkawamoto) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/432](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/432) - Added Dependabot by [@​iamrajiv](https://togithub.com/iamrajiv) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/376](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/376) - Added a Copyright check in the Makefile by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/420](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/420) - Cleanup v2 with some updates by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/419](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/419) - openmetrics: forward server context by [@​amenzhinsky](https://togithub.com/amenzhinsky) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/434](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/434) - recovery: change the default behavior by [@​amenzhinsky](https://togithub.com/amenzhinsky) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/439](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/439) - Add all-validator support by [@​leventeliu](https://togithub.com/leventeliu) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/443](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/443) - Remove backoffutils and added the files to retry package by [@​yashrsharma44](https://togithub.com/yashrsharma44) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/390](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/390) - v2:interceptors/logging: allow to separate request response payload logging by [@​michaljemala](https://togithub.com/michaljemala) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/442](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/442) - Removed tags; Simplified interceptor code; Added logging fields editability. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/394](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/394) - InterceptorTestSuite client connection optimize by [@​HUSTtoKTH](https://togithub.com/HUSTtoKTH) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/455](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/455) - Remove opentracing from go.mod by [@​jpkrohling](https://togithub.com/jpkrohling) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/477](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/477) - Replace two old Go versions with two new ones by [@​jpkrohling](https://togithub.com/jpkrohling) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/478](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/478) - Move util/metautils to root-level package metadata, fixes [#​392](https://togithub.com/grpc-ecosystem/go-grpc-middleware/issues/392) by [@​rahulkhairwar](https://togithub.com/rahulkhairwar) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/474](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/474) - Remove data race from zerolog provider by [@​ecordell](https://togithub.com/ecordell) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/487](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/487) - Update provider/kit by [@​metalmatze](https://togithub.com/metalmatze) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/490](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/490) - Refactor tracing interceptor by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/450](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/450) - Add opentracing provider by [@​XSAM](https://togithub.com/XSAM) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/492](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/492) - update phuslog to fix typo by [@​ogimenezb](https://togithub.com/ogimenezb) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/499](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/499) - Added logr as logging Library provider by [@​mcdoker18](https://togithub.com/mcdoker18) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/510](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/510) - ✨ new feat: selector middleware by [@​aimuz](https://togithub.com/aimuz) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/511](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/511) - Add 1.18.x and 1.19.x unit tests by [@​aimuz](https://togithub.com/aimuz) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/513](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/513) - change the doc.go to the latest format by [@​aimuz](https://togithub.com/aimuz) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/512](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/512) - fix provider examples by [@​forsaken628](https://togithub.com/forsaken628) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/529](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/529) - docs: add `logging.InjectFields` usage description by [@​aimuz](https://togithub.com/aimuz) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/541](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/541) - Bump golang.org/x/net from 0.0.0-20201021035429-f5854403a974 to 0.7.0 by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/537](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/537) - v2: All for v2: Exemplars, Cleanup, Docs, Lint, Proto upgrades and more by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/543](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/543) - \[interceptors/validator] feat: add error logging in validator by [@​rohanraj7316](https://togithub.com/rohanraj7316) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/544](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/544) - fix auto-generated docs by [@​peczenyj](https://togithub.com/peczenyj) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/548](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/548) - fix vulnerability GO-2022-0603 by [@​peczenyj](https://togithub.com/peczenyj) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/549](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/549) - add support to trace on grpc_logrus.DefaultMessageProducer by [@​peczenyj](https://togithub.com/peczenyj) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/547](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/547) - Simplified logging middleware; Fields are now "any" type; Moved logging providers to examples only. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/552](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/552) - Removed deciders; Cleaned up validators. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/554](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/554) - Adjustments to README and consistency of callback options. by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/555](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/555) - Merge v2 into main (with -X theirs) by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/556](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/556) - Bump golang.org/x/net from 0.5.0 to 0.7.0 in /providers/prometheus by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/561](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/561) - Fix overwritten logger in zerolog example by [@​longshine](https://togithub.com/longshine) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/574](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/574) - Changed for for mapping fields, different var for logger in zap example by [@​MichalFikejs](https://togithub.com/MichalFikejs) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/581](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/581) - cleanup: no cap definition required by [@​aimuz](https://togithub.com/aimuz) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/582](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/582) - providers/prometheus: Add WithHistogramOpts for native histograms by [@​metalmatze](https://togithub.com/metalmatze) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/584](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/584) - fix: Refactor logger initialization in example_test.go by [@​aimuz](https://togithub.com/aimuz) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/580](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/580) - Minor code cleanups by [@​ash2k](https://togithub.com/ash2k) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/586](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/586) - fix prometheus interceptors not converting context errors to gRPC codes by [@​vtermanis](https://togithub.com/vtermanis) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/571](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/571) - Update README.md by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/600](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/600) - Update PULL_REQUEST_TEMPLATE.md by [@​bwplotka](https://togithub.com/bwplotka) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/601](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/601) - Add Client rate limit interceptors 520 by [@​rahulkhairwar](https://togithub.com/rahulkhairwar) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/599](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/599) - Use default go errors package instead of github.com/pkg/errors by [@​rifkyazizf](https://togithub.com/rifkyazizf) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/608](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/608) - fix bug : should drain channel of timer after stop by [@​ikenchina](https://togithub.com/ikenchina) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/612](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/612) - feat: add interceptor for bufbuild/protovalidate by [@​gvencadze](https://togithub.com/gvencadze) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/614](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/614) - Enhancement: Introduce Option Interface for Future Interceptor Customization by [@​elliotmjackson](https://togithub.com/elliotmjackson) in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/615](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/615) #### New Contributors - [@​irridia](https://togithub.com/irridia) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/299](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/299) - [@​xinxiao](https://togithub.com/xinxiao) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/367](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/367) - [@​XSAM](https://togithub.com/XSAM) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/364](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/364) - [@​MalloZup](https://togithub.com/MalloZup) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/380](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/380) - [@​instabledesign](https://togithub.com/instabledesign) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/330](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/330) - [@​shamil](https://togithub.com/shamil) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/405](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/405) - [@​ash2k](https://togithub.com/ash2k) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/413](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/413) - [@​ogimenezb](https://togithub.com/ogimenezb) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/425](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/425) - [@​amenzhinsky](https://togithub.com/amenzhinsky) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/434](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/434) - [@​leventeliu](https://togithub.com/leventeliu) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/443](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/443) - [@​michaljemala](https://togithub.com/michaljemala) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/442](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/442) - [@​HUSTtoKTH](https://togithub.com/HUSTtoKTH) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/455](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/455) - [@​jpkrohling](https://togithub.com/jpkrohling) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/477](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/477) - [@​rahulkhairwar](https://togithub.com/rahulkhairwar) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/474](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/474) - [@​ecordell](https://togithub.com/ecordell) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/487](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/487) - [@​metalmatze](https://togithub.com/metalmatze) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/490](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/490) - [@​mcdoker18](https://togithub.com/mcdoker18) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/510](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/510) - [@​aimuz](https://togithub.com/aimuz) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/511](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/511) - [@​forsaken628](https://togithub.com/forsaken628) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/529](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/529) - [@​dependabot](https://togithub.com/dependabot) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/537](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/537) - [@​rohanraj7316](https://togithub.com/rohanraj7316) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/544](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/544) - [@​peczenyj](https://togithub.com/peczenyj) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/548](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/548) - [@​longshine](https://togithub.com/longshine) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/574](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/574) - [@​MichalFikejs](https://togithub.com/MichalFikejs) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/581](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/581) - [@​vtermanis](https://togithub.com/vtermanis) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/571](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/571) - [@​rifkyazizf](https://togithub.com/rifkyazizf) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/608](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/608) - [@​ikenchina](https://togithub.com/ikenchina) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/612](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/612) - [@​gvencadze](https://togithub.com/gvencadze) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/614](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/614) - [@​elliotmjackson](https://togithub.com/elliotmjackson) made their first contribution in [https://github.com/grpc-ecosystem/go-grpc-middleware/pull/615](https://togithub.com/grpc-ecosystem/go-grpc-middleware/pull/615) **Full Changelog**: grpc-ecosystem/go-grpc-middleware@v1.4.0...v2.0.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/jaegertracing/jaeger). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zOTMuMCIsInVwZGF0ZWRJblZlciI6IjM3LjM5My4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJjaGFuZ2Vsb2c6ZGVwZW5kZW5jaWVzIl19--> --------- Signed-off-by: Mend Renovate <bot@renovateapp.com> Signed-off-by: Yuri Shkuro <github@ysh.us> Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Co-authored-by: Yuri Shkuro <github@ysh.us>
First of all - thank you for a great library!
Changes
fix prometheus interceptors not converting context errors to gRPC codes
context.(Canceled|DeadlineExceeded)
would result in an "Unknown" grpc_code.We use the interceptors to not only track failures but also identify when we've accidentally passed back non-grpc errors. With this fix the context errors are correctly mapped to their gRPS status counterparts. This behaves the same as what happens in the golang server code. Something similar but old existed in your deprecated repo (grpc-ecosystem/go-grpc-prometheus#84) but it was never released nor did it make it across, it would appear.
Verification
Added unit test which triggers
context.Canceled
to verify it's no longer recorded asgrpc_code="Unknown"