Correctly report status code and operation ID on S3 gateway #4293
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
arielshaqed
added
area/gateway
nopcoder
requested changes
Oct 2, 2022
pkg/gateway/handler.go
Outdated
| @@ -126,7 +126,7 @@ func NewHandler(region string, catalog catalog.Interface, multipartsTracker mult | |||
| func (h *handler) ServeHTTP(w http.ResponseWriter, req *http.Request) { | |||
| setDefaultContentType(w, req) | |||
| o := req.Context().Value(ContextKeyOperation).(*operations.Operation) | |||
| operationHandler := h.operationHandlers[o.OperationID] | |||
| operationHandler := h.operationHandlers[o.FooOperationID] | |||
There was a problem hiding this comment.
can we revert this change?
pkg/gateway/middleware.go
Outdated
| @@ -127,7 +127,8 @@ func DurationHandler(next http.Handler) http.Handler { | |||
| o := ctx.Value(ContextKeyOperation).(*operations.Operation) | |||
| start := time.Now() | |||
| mrw := httputil.NewMetricResponseWriter(w) | |||
| next.ServeHTTP(w, req) | |||
| next.ServeHTTP(mrw, req) | |||
| operationID := o.OperationID | |||
There was a problem hiding this comment.
Still we don't use this one, based on diff
pkg/gateway/middleware.go
Outdated
| @@ -175,7 +176,7 @@ func OperationLookupHandler(next http.Handler) http.Handler { | |||
| ctx := req.Context() | |||
| o := ctx.Value(ContextKeyOperation).(*operations.Operation) | |||
| repoID := ctx.Value(ContextKeyRepositoryID).(string) | |||
| var operationID operations.OperationID | |||
| operationID := operations.OperationIDOperationNotFound | |||
There was a problem hiding this comment.
I think we need to update the structure (o.OperationID) at this point as we do return in case of an error.
There was a problem hiding this comment.
removed operationID entirely :-)
arielshaqed
commented
Oct 3, 2022
pkg/gateway/middleware.go
Outdated
| @@ -175,7 +176,7 @@ func OperationLookupHandler(next http.Handler) http.Handler { | |||
| ctx := req.Context() | |||
| o := ctx.Value(ContextKeyOperation).(*operations.Operation) | |||
| repoID := ctx.Value(ContextKeyRepositoryID).(string) | |||
| var operationID operations.OperationID | |||
| operationID := operations.OperationIDOperationNotFound | |||
There was a problem hiding this comment.
removed operationID entirely :-)
nopcoder
approved these changes
Oct 3, 2022
pkg/gateway/middleware.go
Outdated
| @@ -127,7 +127,8 @@ func DurationHandler(next http.Handler) http.Handler { | |||
| o := ctx.Value(ContextKeyOperation).(*operations.Operation) | |||
| start := time.Now() | |||
| mrw := httputil.NewMetricResponseWriter(w) | |||
| next.ServeHTTP(w, req) | |||
| next.ServeHTTP(mrw, req) | |||
| operationID := o.OperationID | |||
There was a problem hiding this comment.
Still we don't use this one, based on diff
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.
Previously we incorrectly reported only status 200. Also some unknown
operations are misreported as "", meaning Grafana makes up a long
incomprehensible list of labels for them.