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

Extend httpclient with new method + custom headers #4180

Merged
merged 3 commits into from
Oct 15, 2024
Merged

Extend httpclient with new method + custom headers #4180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5849c3f
Add SearchTraceQLWithRangeAndLimit to httpclient
federicotdn Oct 13, 2024
21a0201
Add custom headers
federicotdn Oct 13, 2024
ce1c3dc
Fix mock
federicotdn Oct 13, 2024
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
5 changes: 5 additions & 0 deletions cmd/tempo-vulture/mocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ func (m *MockHTTPClient) SearchTraceQL(query string) (*tempopb.SearchResponse, e
panic("unimplemented")
}

//nolint:all
func (m *MockHTTPClient) SearchTraceQLWithRangeAndLimit(query string, start int64, end int64, limit int64, spss int64) (*tempopb.SearchResponse, error) {
panic("unimplemented")
}

//nolint:all
func (m *MockHTTPClient) SearchTraceQLWithRange(query string, start int64, end int64) (*tempopb.SearchResponse, error) {
if m.err != nil {
Expand Down
41 changes: 36 additions & 5 deletions pkg/httpclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ type TempoHTTPClient interface {
QueryTraceWithRange(id string, start int64, end int64) (*tempopb.Trace, error)
SearchTraceQL(query string) (*tempopb.SearchResponse, error)
SearchTraceQLWithRange(query string, start int64, end int64) (*tempopb.SearchResponse, error)
SearchTraceQLWithRangeAndLimit(query string, start int64, end int64, limit int64, spss int64) (*tempopb.SearchResponse, error)
MetricsSummary(query string, groupBy string, start int64, end int64) (*tempopb.SpanMetricsSummaryResponse, error)
GetOverrides() (*userconfigurableoverrides.Limits, string, error)
SetOverrides(limits *userconfigurableoverrides.Limits, version string) (string, error)
Expand All @@ -64,6 +65,7 @@ type Client struct {
BaseURL string
OrgID string
client *http.Client
headers map[string]string
}

func New(baseURL, orgID string) *Client {
Expand All @@ -80,6 +82,13 @@ func NewWithCompression(baseURL, orgID string) *Client {
return c
}

func (c *Client) SetHeader(key string, value string) {
if c.headers == nil {
c.headers = make(map[string]string)
}
c.headers[key] = value
}

func (c *Client) WithTransport(t http.RoundTripper) {
c.client.Transport = t
}
Expand Down Expand Up @@ -129,6 +138,12 @@ func (c *Client) doRequest(req *http.Request) (*http.Response, []byte, error) {
req.Header.Set(orgIDHeader, c.OrgID)
}

if c.headers != nil {
for k, v := range c.headers {
req.Header.Set(k, v)
}
}

resp, err := http.DefaultClient.Do(req)
if err != nil {
return nil, nil, fmt.Errorf("error querying Tempo %v", err)
Expand Down Expand Up @@ -225,7 +240,7 @@ func (c *Client) SearchTagValuesV2WithRange(tag string, start int64, end int64)
// Search Tempo. tags must be in logfmt format, that is "key1=value1 key2=value2"
func (c *Client) Search(tags string) (*tempopb.SearchResponse, error) {
m := &tempopb.SearchResponse{}
_, err := c.getFor(c.buildSearchQueryURL("tags", tags, 0, 0), m)
_, err := c.getFor(c.buildSearchQueryURL("tags", tags, 0, 0, 0, 0), m)
if err != nil {
return nil, err
}
Expand All @@ -237,7 +252,7 @@ func (c *Client) Search(tags string) (*tempopb.SearchResponse, error) {
// epoch timestamps in seconds.
func (c *Client) SearchWithRange(tags string, start int64, end int64) (*tempopb.SearchResponse, error) {
m := &tempopb.SearchResponse{}
_, err := c.getFor(c.buildSearchQueryURL("tags", tags, start, end), m)
_, err := c.getFor(c.buildSearchQueryURL("tags", tags, start, end, 0, 0), m)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -291,7 +306,7 @@ func (c *Client) QueryTraceWithRange(id string, start int64, end int64) (*tempop

func (c *Client) SearchTraceQL(query string) (*tempopb.SearchResponse, error) {
m := &tempopb.SearchResponse{}
_, err := c.getFor(c.buildSearchQueryURL("q", query, 0, 0), m)
_, err := c.getFor(c.buildSearchQueryURL("q", query, 0, 0, 0, 0), m)
if err != nil {
return nil, err
}
Expand All @@ -301,7 +316,17 @@ func (c *Client) SearchTraceQL(query string) (*tempopb.SearchResponse, error) {

func (c *Client) SearchTraceQLWithRange(query string, start int64, end int64) (*tempopb.SearchResponse, error) {
m := &tempopb.SearchResponse{}
_, err := c.getFor(c.buildSearchQueryURL("q", query, start, end), m)
_, err := c.getFor(c.buildSearchQueryURL("q", query, start, end, 0, 0), m)
if err != nil {
return nil, err
}

return m, nil
}

func (c *Client) SearchTraceQLWithRangeAndLimit(query string, start int64, end int64, limit int64, spss int64) (*tempopb.SearchResponse, error) {
m := &tempopb.SearchResponse{}
_, err := c.getFor(c.buildSearchQueryURL("q", query, start, end, limit, spss), m)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -329,13 +354,19 @@ func (c *Client) MetricsSummary(query string, groupBy string, start int64, end i
return m, nil
}

func (c *Client) buildSearchQueryURL(queryType string, query string, start int64, end int64) string {
func (c *Client) buildSearchQueryURL(queryType string, query string, start int64, end int64, limit int64, spss int64) string {
joinURL, _ := url.Parse(c.BaseURL + "/api/search?")
q := joinURL.Query()
if start != 0 && end != 0 {
q.Set("start", strconv.FormatInt(start, 10))
q.Set("end", strconv.FormatInt(end, 10))
}
if limit != 0 {
q.Set("limit", strconv.FormatInt(limit, 10))
}
if spss != 0 {
q.Set("spss", strconv.FormatInt(spss, 10))
}
q.Set(queryType, query)
joinURL.RawQuery = q.Encode()

Expand Down