Skip to content
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.

Sign up for GitHub

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

Return 400 instead of 500 on incorrect OTLP payload #6599

Merged
merged 10 commits into from
Jan 25, 2025
Merged

Return 400 instead of 500 on incorrect OTLP payload #6599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1932a2b
Return 400
ADI-ROXX Jan 23, 2025
48a1d6f
Added a new test
ADI-ROXX Jan 24, 2025
6c4b8e7
Remove binaries
ADI-ROXX Jan 24, 2025
69bf467
Regex code
ADI-ROXX Jan 24, 2025
18466d3
Lint
ADI-ROXX Jan 24, 2025
0a9b4f0
Directly check StatusCode
ADI-ROXX Jan 24, 2025
13652f4
require.NoError
ADI-ROXX Jan 25, 2025
c9e997d
simpify
yurishkuro Jan 25, 2025
4f63e86
Merge branch 'main' into statusCode
yurishkuro Jan 25, 2025
e5dae10
fix-errors
yurishkuro Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/query/app/http_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func (aH *APIHandler) transformOTLP(w http.ResponseWriter, r *http.Request) {
}

traces, err := otlp2traces(body)
if aH.handleError(w, err, http.StatusInternalServerError) {
if aH.handleError(w, err, http.StatusBadRequest) {
return
}

Expand Down
23 changes: 22 additions & 1 deletion cmd/query/app/http_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,15 @@ func TestTransformOTLPBadPayload(t *testing.T) {
}, querysvc.QueryServiceOptions{})
}

func TestBadOTLPReturns400(t *testing.T) {
withTestServer(t, func(ts *testServer) {
err := postJSON(ts.server.URL+"/api/transform", "Bad Payload", nil)
var httpErr *HTTPError
require.ErrorAs(t, err, &httpErr)
require.Equal(t, 400, httpErr.StatusCode)
}, querysvc.QueryServiceOptions{})
}

func TestGetMetricsSuccess(t *testing.T) {
mr := &metricsmocks.Reader{}
apiHandlerOptions := []HandlerOption{
Expand Down Expand Up @@ -980,6 +989,15 @@ func postJSON(url string, req any, out any) error {
return execJSON(r, make(map[string]string), out)
}

type HTTPError struct {
StatusCode int
Body string
}

func (e *HTTPError) Error() string {
return fmt.Sprintf("%d error from server: %s", e.StatusCode, e.Body)
}

// execJSON executes an http request against a server and parses response as JSON
func execJSON(req *http.Request, additionalHeaders map[string]string, out any) error {
req.Header.Add("Accept", "application/json")
Expand All @@ -999,7 +1017,10 @@ func execJSON(req *http.Request, additionalHeaders map[string]string, out any) e
if err != nil {
return err
}
return fmt.Errorf("%d error from server: %s", resp.StatusCode, body)
return &HTTPError{
StatusCode: resp.StatusCode,
Body: string(body),
}
}

if out == nil {
Expand Down
Loading