Allow configuration of GRPC client middleware. #406
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jeschkies
force-pushed
the
karsten/configure-grpc-client-middleware
branch
from
1f0f6d1
to
ec732c0
Compare
jeschkies
commented
Oct 16, 2023
grpcclient/grpcclient.go
Outdated
Comment on lines
41
to
42
| GRPCMiddleware []grpc.UnaryClientInterceptor `yaml:"-"` | ||
| GRPCStreamMiddleware []grpc.StreamClientInterceptor `yaml:"-"` |
There was a problem hiding this comment.
We could also call it Middleware to avoid repeating GRPCClientConfig.GRPCMiddleware.
There was a problem hiding this comment.
I think calling it Middleware makes sense since this is already a grpc* package but I don't feel strongly about it.
56quarters
approved these changes
Oct 16, 2023
grpcclient/grpcclient.go
Outdated
| @@ -100,6 +103,9 @@ func (cfg *Config) DialOption(unaryClientInterceptors []grpc.UnaryClientIntercep | |||
| } | |||
| opts = append(opts, tlsOpts...) | |||
|
|
|||
| unaryClientInterceptors = append(unaryClientInterceptors, cfg.GRPCMiddleware...) | |||
There was a problem hiding this comment.
Could you document how the configured interceptors are ordered with respect to the ones passed to this method?
grpcclient/grpcclient.go
Outdated
Comment on lines
41
to
42
| GRPCMiddleware []grpc.UnaryClientInterceptor `yaml:"-"` | ||
| GRPCStreamMiddleware []grpc.StreamClientInterceptor `yaml:"-"` |
There was a problem hiding this comment.
I think calling it Middleware makes sense since this is already a grpc* package but I don't feel strongly about it.
jeschkies
force-pushed
the
karsten/configure-grpc-client-middleware
branch
from
ec732c0
to
68caf56
Compare
…c-client-middleware
7 tasks
jeschkies
added a commit
to grafana/loki
that referenced
this pull request
Oct 18, 2023
**What this PR does / why we need it**: This is a small update to dskit that includes grafana/dskit#406 which will allow us to intercept gRPC request in call clients. **Checklist** - [ ] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [ ] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md` - [ ] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](d10549e) --------- Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
ying-jeanne
pushed a commit
that referenced
this pull request
Nov 2, 2023
Similar to the server [config](https://github.com/grafana/dskit/blob/dcd7c1e06a38c25d44664a91cc8794b0d557b77d/server/server.go#L105-L106) one should be able to configure GRPC interceptors for the clients. Loki's ingester client [config](https://github.com/grafana/loki/blob/1ac7410b78416e25179b4fe589e9035793d67025/pkg/ingester/client/client.go#L45-L46) allows this but it should be available for any client.
rhnasc
pushed a commit
to inloco/loki
that referenced
this pull request
Apr 12, 2024
**What this PR does / why we need it**: This is a small update to dskit that includes grafana/dskit#406 which will allow us to intercept gRPC request in call clients. **Checklist** - [ ] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [ ] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md` - [ ] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](grafana@d10549e) --------- Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does:
Similar to the server config one should be able to configure GRPC interceptors for the clients. Loki's ingester client config allows this but it should be available for any client.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]