Add interval to gethistogram (#306)

aliyun · Dec 2, 2024 · d719e9d · d719e9d
1 parent 833cf4b
commit d719e9d
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 6 deletions.
diff --git a/client_interface.go b/client_interface.go
@@ -302,6 +302,7 @@ type ClientInterface interface {
 	PullLogsWithQuery(plr *PullLogRequest) (gl *LogGroupList, plm *PullLogMeta, err error)
 	// GetHistograms query logs with [from, to) time range
 	GetHistograms(project, logstore string, topic string, from int64, to int64, queryExp string) (*GetHistogramsResponse, error)
+	GetHistogramsV2(project, logstore string, ghr *GetHistogramRequest) (*GetHistogramsResponse, error)
 	// GetLogs query logs with [from, to) time range
 	GetLogs(project, logstore string, topic string, from int64, to int64, queryExp string,
 		maxLineNum int64, offset int64, reverse bool) (*GetLogsResponse, error)
@@ -319,6 +320,7 @@ type ClientInterface interface {
 
 	// GetHistogramsToCompleted query logs with [from, to) time range to completed
 	GetHistogramsToCompleted(project, logstore string, topic string, from int64, to int64, queryExp string) (*GetHistogramsResponse, error)
+	GetHistogramsToCompletedV2(project, logstore string, ghr *GetHistogramRequest) (*GetHistogramsResponse, error)
 	// GetLogsToCompleted query logs with [from, to) time range to completed
 	GetLogsToCompleted(project, logstore string, topic string, from int64, to int64, queryExp string, maxLineNum int64, offset int64, reverse bool) (*GetLogsResponse, error)
 	// GetLogsToCompletedV2 query logs with [from, to) time range to completed

diff --git a/client_store.go b/client_store.go
@@ -247,12 +247,22 @@ func (c *Client) GetHistograms(project, logstore string, topic string, from int6
 	return ls.GetHistograms(topic, from, to, queryExp)
 }
 
+func (c *Client) GetHistogramsV2(project, logstore string, ghr *GetHistogramRequest) (*GetHistogramsResponse, error) {
+	ls := convertLogstore(c, project, logstore)
+	return ls.GetHistogramsV2(ghr)
+}
+
 // GetHistogramsToCompleted query logs with [from, to) time range to completed
 func (c *Client) GetHistogramsToCompleted(project, logstore string, topic string, from int64, to int64, queryExp string) (*GetHistogramsResponse, error) {
 	ls := convertLogstore(c, project, logstore)
 	return ls.GetHistogramsToCompleted(topic, from, to, queryExp)
 }
 
+func (c *Client) GetHistogramsToCompletedV2(project, logstore string, ghr *GetHistogramRequest) (*GetHistogramsResponse, error) {
+	ls := convertLogstore(c, project, logstore)
+	return ls.GetHistogramsToCompletedV2(ghr)
+}
+
 // GetLogs query logs with [from, to) time range
 func (c *Client) GetLogs(project, logstore string, topic string, from int64, to int64, queryExp string,
 	maxLineNum int64, offset int64, reverse bool) (*GetLogsResponse, error) {

diff --git a/log_store.go b/log_store.go
@@ -650,18 +650,22 @@ func (s *LogStore) PullLogsWithQuery(plr *PullLogRequest) (gl *LogGroupList, plm
 
 // GetHistograms query logs with [from, to) time range
 func (s *LogStore) GetHistograms(topic string, from int64, to int64, queryExp string) (*GetHistogramsResponse, error) {
+	return s.GetHistogramsV2(&GetHistogramRequest{
+		Topic: topic,
+		From:  from,
+		To:    to,
+		Query: queryExp,
+	})
+}
+
+func (s *LogStore) GetHistogramsV2(ghr *GetHistogramRequest) (*GetHistogramsResponse, error) {
 
 	h := map[string]string{
 		"x-log-bodyrawsize": "0",
 		"Accept":            "application/json",
 	}
 
-	urlVal := url.Values{}
-	urlVal.Add("type", "histogram")
-	urlVal.Add("from", strconv.Itoa(int(from)))
-	urlVal.Add("to", strconv.Itoa(int(to)))
-	urlVal.Add("topic", topic)
-	urlVal.Add("query", queryExp)
+	urlVal := ghr.ToURLParams()
 
 	uri := fmt.Sprintf("/logstores/%s?%s", s.Name, urlVal.Encode())
 	r, err := request(s.project, "GET", uri, h, nil)
@@ -866,6 +870,20 @@ func (s *LogStore) GetHistogramsToCompleted(topic string, from int64, to int64,
 	return res, err
 }
 
+func (s *LogStore) GetHistogramsToCompletedV2(ghr *GetHistogramRequest) (*GetHistogramsResponse, error) {
+	var res *GetHistogramsResponse
+	var err error
+	f := func() (bool, error) {
+		res, err = s.GetHistogramsV2(ghr)
+		if err == nil {
+			return res.IsComplete(), nil
+		}
+		return false, err
+	}
+	s.getToCompleted(f)
+	return res, err
+}
+
 // GetLogsV2 query logs with [from, to) time range
 func (s *LogStore) GetLogsV2(req *GetLogRequest) (*GetLogsResponse, error) {
 	resp, httpRsp, err := s.getLogsV3Internal(req)

diff --git a/model.go b/model.go
@@ -44,6 +44,25 @@ func (glr *GetLogRequest) ToURLParams() url.Values {
 	return urlVal
 }
 
+type GetHistogramRequest struct {
+	Topic    string `json:"topic"`
+	From     int64  `json:"from"`
+	To       int64  `json:"to"`
+	Query    string `json:"query"`
+	Interval int32  `json:"interval"`
+}
+
+func (ghr *GetHistogramRequest) ToURLParams() url.Values {
+	urlVal := url.Values{}
+	urlVal.Add("type", "histogram")
+	urlVal.Add("from", strconv.Itoa(int(ghr.From)))
+	urlVal.Add("to", strconv.Itoa(int(ghr.To)))
+	urlVal.Add("topic", ghr.Topic)
+	urlVal.Add("query", ghr.Query)
+	urlVal.Add("interval", strconv.Itoa(int(ghr.Interval)))
+	return urlVal
+}
+
 type PullLogRequest struct {
 	Project          string
 	Logstore         string

diff --git a/token_auto_update_client.go b/token_auto_update_client.go
@@ -891,6 +891,16 @@ func (c *TokenAutoUpdateClient) GetHistograms(project, logstore string, topic st
 	return
 }
 
+func (c *TokenAutoUpdateClient) GetHistogramsV2(project, logstore string, ghr *GetHistogramRequest) (h *GetHistogramsResponse, err error) {
+	for i := 0; i < c.maxTryTimes; i++ {
+		h, err = c.logClient.GetHistogramsV2(project, logstore, ghr)
+		if !c.processError(err) {
+			return
+		}
+	}
+	return
+}
+
 func (c *TokenAutoUpdateClient) GetHistogramsToCompleted(project, logstore string, topic string, from int64, to int64, queryExp string) (h *GetHistogramsResponse, err error) {
 	for i := 0; i < c.maxTryTimes; i++ {
 		h, err = c.logClient.GetHistogramsToCompleted(project, logstore, topic, from, to, queryExp)
@@ -901,6 +911,16 @@ func (c *TokenAutoUpdateClient) GetHistogramsToCompleted(project, logstore strin
 	return
 }
 
+func (c *TokenAutoUpdateClient) GetHistogramsToCompletedV2(project, logstore string, ghr *GetHistogramRequest) (h *GetHistogramsResponse, err error) {
+	for i := 0; i < c.maxTryTimes; i++ {
+		h, err = c.logClient.GetHistogramsToCompletedV2(project, logstore, ghr)
+		if !c.processError(err) {
+			return
+		}
+	}
+	return
+}
+
 func (c *TokenAutoUpdateClient) GetLogsV2(project, logstore string, req *GetLogRequest) (r *GetLogsResponse, err error) {
 	for i := 0; i < c.maxTryTimes; i++ {
 		r, err = c.logClient.GetLogsV2(project, logstore, req)