-
Notifications
You must be signed in to change notification settings - Fork 454
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.
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
[query] add list tags endpoint #1565
Changes from all commits
ee5f565
e3e001d
fd7fe63
09c47e2
efe5ed9
559fff0
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -304,6 +304,35 @@ func renderDefaultTagCompletionResultsJSON( | |
return jw.Close() | ||
} | ||
|
||
// RenderListTagResultsJSON renders list tag results to json format. | ||
func RenderListTagResultsJSON( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also, is there a scenario where There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No; if it errors, it won't use this render function but rather the default error printer There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the point of having a status field then lol There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's expected in the Prom output unfortunately |
||
w io.Writer, | ||
result *storage.CompleteTagsResult, | ||
) error { | ||
if !result.CompleteNameOnly { | ||
return errors.ErrWithNames | ||
} | ||
|
||
jw := json.NewWriter(w) | ||
jw.BeginObject() | ||
|
||
jw.BeginObjectField("status") | ||
jw.WriteString("success") | ||
|
||
jw.BeginObjectField("data") | ||
jw.BeginArray() | ||
|
||
for _, t := range result.CompletedTags { | ||
jw.WriteString(string(t.Name)) | ||
} | ||
|
||
jw.EndArray() | ||
|
||
jw.EndObject() | ||
|
||
return jw.Close() | ||
} | ||
|
||
// RenderTagCompletionResultsJSON renders tag completion results to json format. | ||
func RenderTagCompletionResultsJSON( | ||
w io.Writer, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
// Copyright (c) 2019 Uber Technologies, Inc. | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
// in the Software without restriction, including without limitation the rights | ||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
// copies of the Software, and to permit persons to whom the Software is | ||
// furnished to do so, subject to the following conditions: | ||
// | ||
// The above copyright notice and this permission notice shall be included in | ||
// all copies or substantial portions of the Software. | ||
// | ||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
// THE SOFTWARE. | ||
|
||
package native | ||
|
||
import ( | ||
"context" | ||
"net/http" | ||
"time" | ||
|
||
"github.com/m3db/m3/src/query/api/v1/handler" | ||
"github.com/m3db/m3/src/query/api/v1/handler/prometheus" | ||
"github.com/m3db/m3/src/query/models" | ||
"github.com/m3db/m3/src/query/storage" | ||
"github.com/m3db/m3/src/query/util/logging" | ||
"github.com/m3db/m3/src/x/net/http" | ||
|
||
"go.uber.org/zap" | ||
) | ||
|
||
const ( | ||
// ListTagsURL is the url for listing tags. | ||
ListTagsURL = handler.RoutePrefixV1 + "/labels" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: name There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd rather be consistent internally here; we've been renaming prom |
||
) | ||
|
||
var ( | ||
// ListTagsHTTPMethods are the HTTP methods used with this resource. | ||
ListTagsHTTPMethods = []string{http.MethodGet, http.MethodPost} | ||
) | ||
|
||
// ListTagsHandler represents a handler for list tags endpoint. | ||
type ListTagsHandler struct { | ||
storage storage.Storage | ||
} | ||
|
||
// NewListTagsHandler returns a new instance of handler. | ||
func NewListTagsHandler( | ||
storage storage.Storage, | ||
) http.Handler { | ||
return &ListTagsHandler{ | ||
storage: storage, | ||
} | ||
} | ||
|
||
func (h *ListTagsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { | ||
ctx := context.WithValue(r.Context(), handler.HeaderKey, r.Header) | ||
logger := logging.WithContext(ctx) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This using the new logging (zap) stuff? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should be, same as the other handlers afaik |
||
w.Header().Set("Content-Type", "application/json") | ||
|
||
query := &storage.CompleteTagsQuery{ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do you want to add the ability to restrict to only a given set of tag field names? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the implementation of the Prom endpoint here, which expects no args and returns all valid tag names only: https://prometheus.io/docs/prometheus/latest/querying/api/#getting-label-names |
||
CompleteNameOnly: true, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. more a question: what is this for? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This restricts search results to only give tag names rather than tag names and values |
||
TagMatchers: models.Matchers{{Type: models.MatchAll}}, | ||
|
||
// NB: necessarily spans entire possible query range. | ||
Start: time.Time{}, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is fine for default but should it be overridable from the incoming request? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Generally yes, but this particular endpoint is intended to work across all time |
||
End: time.Now(), | ||
} | ||
|
||
opts := storage.NewFetchOptions() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this might be a silly question: what are these options/how come we can just use the defaults? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Default is fine here; for context, this includes:
|
||
result, err := h.storage.CompleteTags(ctx, query, opts) | ||
if err != nil { | ||
logger.Error("unable to complete tags", zap.Error(err)) | ||
xhttp.Error(w, err, http.StatusBadRequest) | ||
return | ||
} | ||
|
||
if err = prometheus.RenderListTagResultsJSON(w, result); err != nil { | ||
logger.Error("unable to render results", zap.Error(err)) | ||
xhttp.Error(w, err, http.StatusBadRequest) | ||
return | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,145 @@ | ||
// Copyright (c) 2019 Uber Technologies, Inc. | ||
// | ||
// Permission is hereby granted, free of charge, to any person obtaining a copy | ||
// of this software and associated documentation files (the "Software"), to deal | ||
// in the Software without restriction, including without limitation the rights | ||
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
// copies of the Software, and to permit persons to whom the Software is | ||
// furnished to do so, subject to the following conditions: | ||
// | ||
// The above copyright notice and this permission notice shall be included in | ||
// all copies or substantial portions of the Software. | ||
// | ||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
// THE SOFTWARE. | ||
|
||
package native | ||
|
||
import ( | ||
"errors" | ||
"fmt" | ||
"io/ioutil" | ||
"math" | ||
"net/http/httptest" | ||
"testing" | ||
"time" | ||
|
||
"github.com/m3db/m3/src/query/models" | ||
"github.com/m3db/m3/src/query/storage" | ||
"github.com/m3db/m3/src/query/util/logging" | ||
|
||
"github.com/golang/mock/gomock" | ||
"github.com/stretchr/testify/require" | ||
) | ||
|
||
type listTagsMatcher struct{} | ||
|
||
func (m *listTagsMatcher) String() string { return "list tags query" } | ||
func (m *listTagsMatcher) Matches(x interface{}) bool { | ||
q, ok := x.(*storage.CompleteTagsQuery) | ||
if !ok { | ||
return false | ||
} | ||
|
||
if !q.Start.Equal(time.Time{}) { | ||
return false | ||
} | ||
|
||
// NB: end time for the query should be roughly `Now` | ||
diff := q.End.Sub(time.Now()) | ||
absDiff := time.Duration(math.Abs(float64(diff))) | ||
if absDiff > time.Second { | ||
return false | ||
} | ||
|
||
if !q.CompleteNameOnly { | ||
return false | ||
} | ||
|
||
if len(q.FilterNameTags) != 0 { | ||
return false | ||
} | ||
|
||
if len(q.TagMatchers) != 1 { | ||
return false | ||
} | ||
|
||
return models.MatchAll == q.TagMatchers[0].Type | ||
} | ||
|
||
var _ gomock.Matcher = &listTagsMatcher{} | ||
|
||
func b(s string) []byte { return []byte(s) } | ||
|
||
func TestListTags(t *testing.T) { | ||
logging.InitWithCores(nil) | ||
|
||
ctrl := gomock.NewController(t) | ||
defer ctrl.Finish() | ||
|
||
// setup storage and handler | ||
store := storage.NewMockStorage(ctrl) | ||
storeResult := &storage.CompleteTagsResult{ | ||
CompleteNameOnly: true, | ||
CompletedTags: []storage.CompletedTag{ | ||
{Name: b("bar")}, | ||
{Name: b("baz")}, | ||
{Name: b("foo")}, | ||
}, | ||
} | ||
|
||
handler := NewListTagsHandler(store) | ||
for _, method := range []string{"GET", "POST"} { | ||
store.EXPECT().CompleteTags(gomock.Any(), &listTagsMatcher{}, gomock.Any()). | ||
Return(storeResult, nil) | ||
|
||
req := httptest.NewRequest(method, "/labels", nil) | ||
w := httptest.NewRecorder() | ||
|
||
handler.ServeHTTP(w, req) | ||
body := w.Result().Body | ||
defer body.Close() | ||
|
||
r, err := ioutil.ReadAll(body) | ||
require.NoError(t, err) | ||
|
||
ex := `{"status":"success","data":["bar","baz","foo"]}` | ||
require.Equal(t, ex, string(r)) | ||
} | ||
} | ||
|
||
func TestListErrorTags(t *testing.T) { | ||
logging.InitWithCores(nil) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. been trying to push the standard stuff we have for zap now, could you use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Called out in #1590 as well; all our other handlers are doing this at the moment, may be nicer to fix them all at once? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we're currently using zap for logging; although we may do it in a bit of a weird way with a global zap logger rather than passing it down There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added this to #1590 under "General":
|
||
|
||
ctrl := gomock.NewController(t) | ||
defer ctrl.Finish() | ||
|
||
// setup storage and handler | ||
store := storage.NewMockStorage(ctrl) | ||
handler := NewListTagsHandler(store) | ||
|
||
for _, method := range []string{"GET", "POST"} { | ||
store.EXPECT().CompleteTags(gomock.Any(), &listTagsMatcher{}, gomock.Any()). | ||
Return(nil, errors.New("err")) | ||
|
||
req := httptest.NewRequest(method, "/labels", nil) | ||
w := httptest.NewRecorder() | ||
|
||
handler.ServeHTTP(w, req) | ||
body := w.Result().Body | ||
defer body.Close() | ||
|
||
r, err := ioutil.ReadAll(body) | ||
require.NoError(t, err) | ||
|
||
ex := `{"error":"err"}` | ||
// NB: error handler adds a newline to the output. | ||
ex = fmt.Sprintf("%s\n", ex) | ||
require.Equal(t, ex, string(r)) | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,6 +38,8 @@ func (m MatchType) String() string { | |
return "=~" | ||
case MatchNotRegexp: | ||
return "!~" | ||
case MatchAll: | ||
return "*" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this String() method is only used for debugging yea? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah |
||
default: | ||
return "unknown match type" | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we rely on
json.Marshal
with the appropriate struct instead of defining our own?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, it's an issue with a bunch of our stuff; called out removing json.Marshal in #1590
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added a response on that issue, for any endpoints where we return a lot of data we should continue using our JSON writers:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah was going to write some quick benchmarks when it came time to consider swapping it out; I think our initial thinking here was if we're using this writer internally there's a good reason