diff options
| author | Eric Ju <eju@gitlab.com> | 2023-11-23 01:09:48 +0300 |
|---|---|---|
| committer | Eric Ju <eju@gitlab.com> | 2023-11-29 01:03:31 +0300 |
| commit | d37553f7834ae936fd06f8249724a67d444b25dd (patch) | |
| tree | f7c74e353644c4bbce5285420d0ca3ff0e9c213d | |
| parent | d76feb3e6d006d2f1bffa153b474481c50d5c6d1 (diff) | |
requestinfohandler: Remove grpc middleware v1 tagsej-5661_grpc-middleware-to-v2-messageproducer
During grpc middleware v2 migration, a defect
https://gitlab.com/gitlab-org/gitaly/-/issues/5694 is
caused by that v1 interceptor can't retrieved v2 fields in the context.
To fix that,
https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6534 brought
v1 tags back.
Now, with v2 interceptor ready to use, v1 tags can be removed again
| -rw-r--r-- | internal/grpc/middleware/requestinfohandler/requestinfohandler.go | 11 | ||||
| -rw-r--r-- | internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go | 13 |
2 files changed, 1 insertions, 23 deletions
diff --git a/internal/grpc/middleware/requestinfohandler/requestinfohandler.go b/internal/grpc/middleware/requestinfohandler/requestinfohandler.go index 0d738c98e..f91fddf5b 100644 --- a/internal/grpc/middleware/requestinfohandler/requestinfohandler.go +++ b/internal/grpc/middleware/requestinfohandler/requestinfohandler.go @@ -4,7 +4,6 @@ import ( "context" "strings" - grpcmwtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" @@ -197,18 +196,10 @@ func (i *RequestInfo) extractRequestInfo(request any) { } func (i *RequestInfo) injectTags(ctx context.Context) context.Context { - tags := grpcmwtags.NewTags() - for key, value := range i.Tags() { ctx = logging.InjectLogField(ctx, key, value) - tags.Set(key, value) + // tags.Set(key, value) } - - // This maintains backward compatibility for tags in the v1 grpc-go-middleware. - // This can be removed when the v1 interceptors are removed: - // https://gitlab.com/gitlab-org/gitaly/-/work_items/5661 - ctx = grpcmwtags.SetInContext(ctx, tags) - return ctx } diff --git a/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go b/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go index 38e40faeb..5e62707cd 100644 --- a/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go +++ b/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go @@ -7,7 +7,6 @@ import ( "testing" "time" - grpcmwtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/stretchr/testify/require" gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log" @@ -284,18 +283,6 @@ func TestGRPCTags(t *testing.T) { "grpc.request.fullMethod": "/gitaly.RepositoryService/OptimizeRepository", }, gitalylog.ConvertLoggingFields(fields)) - legacyFields := grpcmwtags.Extract(ctx).Values() - - require.Equal(t, map[string]any{ - "correlation_id": correlationID, - "grpc.meta.client_name": clientName, - "grpc.meta.deadline_type": "none", - "grpc.meta.method_type": "unary", - "grpc.meta.method_operation": "maintenance", - "grpc.meta.method_scope": "repository", - "grpc.request.fullMethod": "/gitaly.RepositoryService/OptimizeRepository", - }, legacyFields) - return nil, nil }) require.NoError(t, err) |