Commit 600edd10 authored by makeavish's avatar makeavish
Browse files

fix: create new functions for ee

parent 4b2e1572
Showing with 20 additions and 8 deletions
+20 -8
......@@ -61,7 +61,7 @@ func (ah *APIHandler) queryRangeMetricsV2(w http.ResponseWriter, r *http.Request
wg.Add(1)
go func(name, query string) {
defer wg.Done()
seriesList, tableName, err := ah.opts.DataConnector.GetMetricResult(r.Context(), query)
seriesList, tableName, err := ah.opts.DataConnector.GetMetricResultEE(r.Context(), query)
for _, series := range seriesList {
series.QueryName = name
}
......
......@@ -39,7 +39,7 @@ func (ah *APIHandler) searchTraces(w http.ResponseWriter, r *http.Request) {
return
}
result, err := ah.opts.DataConnector.SearchTraces(r.Context(), traceId, spanId, levelUpInt, levelDownInt)
result, err := ah.opts.DataConnector.SearchTracesEE(r.Context(), traceId, spanId, levelUpInt, levelDownInt)
if ah.HandleError(w, err, http.StatusBadRequest) {
return
}
......
......@@ -45,7 +45,7 @@ func (r *ClickhouseReader) Start(readerReady chan bool) {
r.ClickHouseReader.Start(readerReady)
}
func (r *ClickhouseReader) SearchTraces(ctx context.Context, traceId string, spanId string, levelUp int, levelDown int) (*[]basemodel.SearchSpansResult, error) {
func (r *ClickhouseReader) SearchTracesEE(ctx context.Context, traceId string, spanId string, levelUp int, levelDown int) (*[]basemodel.SearchSpansResult, error) {
var searchScanResponses []basemodel.SearchSpanDBResponseItem
query := fmt.Sprintf("SELECT timestamp, traceID, model FROM %s.%s WHERE traceID=$1", r.ClickHouseReader.TraceDB, r.SpansTable)
......@@ -304,8 +304,8 @@ func breadthFirstSearch(spansPtr *model.Span, targetId string) (*model.Span, err
return nil, nil
}
// GetMetricResult runs the query and returns list of time series
func (r *ClickhouseReader) GetMetricResult(ctx context.Context, query string) ([]*basemodel.Series, string, error) {
// GetMetricResultEE runs the query and returns list of time series
func (r *ClickhouseReader) GetMetricResultEE(ctx context.Context, query string) ([]*basemodel.Series, string, error) {
defer utils.Elapsed("GetMetricResult")()
zap.S().Infof("Executing metric result query: %s", query)
......
......@@ -1711,7 +1711,12 @@ func (r *ClickHouseReader) GetUsage(ctx context.Context, queryParams *model.GetU
return &usageItems, nil
}
func (r *ClickHouseReader) SearchTraces(ctx context.Context, traceId string, spanId string, levelUp int, levelDown int) (*[]model.SearchSpansResult, error) {
func (r *ClickHouseReader) SearchTracesEE(ctx context.Context, traceId string, spanId string, levelUp int, levelDown int) (*[]model.SearchSpansResult, error) {
zap.S().Error("SearchTracesEE is not implemented for opensource version")
return nil, fmt.Errorf("SearchTracesEE is not implemented for opensource version")
}
func (r *ClickHouseReader) SearchTraces(ctx context.Context, traceId string, spanId string) (*[]model.SearchSpansResult, error) {
var searchScanResponses []model.SearchSpanDBResponseItem
......@@ -2823,6 +2828,11 @@ func (r *ClickHouseReader) GetMetricAutocompleteMetricNames(ctx context.Context,
}
func (r *ClickHouseReader) GetMetricResultEE(ctx context.Context, query string) ([]*model.Series, string, error) {
zap.S().Error("GetMetricResultEE is not implemented for opensource version")
return nil, "", fmt.Errorf("GetMetricResultEE is not implemented for opensource version")
}
// GetMetricResult runs the query and returns list of time series
func (r *ClickHouseReader) GetMetricResult(ctx context.Context, query string) ([]*model.Series, string, error) {
......
......@@ -1322,7 +1322,7 @@ func (aH *APIHandler) SearchTraces(w http.ResponseWriter, r *http.Request) {
traceId := vars["traceId"]
spanId := r.URL.Query().Get("spanId")
result, err := aH.reader.SearchTraces(r.Context(), traceId, spanId, 0, 0)
result, err := aH.reader.SearchTraces(r.Context(), traceId, spanId)
if aH.HandleError(w, err, http.StatusBadRequest) {
return
}
......
......@@ -46,7 +46,8 @@ type Reader interface {
GetNextPrevErrorIDs(ctx context.Context, params *model.GetErrorParams) (*model.NextPrevErrorIDs, *model.ApiError)
// Search Interfaces
SearchTraces(ctx context.Context, traceID string, spanId string, levelUp int, levelDown int) (*[]model.SearchSpansResult, error)
SearchTraces(ctx context.Context, traceID string, spanId string) (*[]model.SearchSpansResult, error)
SearchTracesEE(ctx context.Context, traceID string, spanId string, levelUp int, levelDown int) (*[]model.SearchSpansResult, error)
// Setter Interfaces
SetTTL(ctx context.Context, ttlParams *model.TTLParams) (*model.SetTTLResponseItem, *model.ApiError)
......@@ -55,6 +56,7 @@ type Reader interface {
GetMetricAutocompleteTagKey(ctx context.Context, params *model.MetricAutocompleteTagParams) (*[]string, *model.ApiError)
GetMetricAutocompleteTagValue(ctx context.Context, params *model.MetricAutocompleteTagParams) (*[]string, *model.ApiError)
GetMetricResult(ctx context.Context, query string) ([]*model.Series, string, error)
GetMetricResultEE(ctx context.Context, query string) ([]*model.Series, string, error)
GetTotalSpans(ctx context.Context) (uint64, error)
GetSpansInLastHeartBeatInterval(ctx context.Context) (uint64, error)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment