From d6631f5f2370cfc3a49efce312491031fb387600 Mon Sep 17 00:00:00 2001 From: "Ben B." Date: Thu, 3 Oct 2024 17:14:46 +0200 Subject: [PATCH] [grpc storage]: Propagate tenant to grpc backend (#6030) ## Which problem is this PR solving? - Missing tenant information in a gRPC remote backend. ![image](https://github.com/user-attachments/assets/fea54fe0-5785-4225-a8cc-29b705a8be24) ## Description of the changes Before the gRPC plugins were removed in Jaeger 1.58, tenant information was distributed in via the internal context. With this change, the tenant information is also propagated to a removed grpc backend. ## How was this change tested? - Manually with jaeger-query, tempo-query and wireshark. ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` --- cc @albertteoh do you think we can get this into the next jaeger release tomorrow? ^^ --------- Signed-off-by: Benedikt Bongartz --- plugin/storage/grpc/config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/plugin/storage/grpc/config.go b/plugin/storage/grpc/config.go index c1242d641e0..dd095d7e57a 100644 --- a/plugin/storage/grpc/config.go +++ b/plugin/storage/grpc/config.go @@ -38,6 +38,7 @@ func DefaultConfigV2() ConfigV2 { func (c *Configuration) TranslateToConfigV2() *ConfigV2 { return &ConfigV2{ + Tenancy: c.TenancyOpts, ClientConfig: configgrpc.ClientConfig{ Endpoint: c.RemoteServerAddr, TLSSetting: c.RemoteTLS.ToOtelClientConfig(),