GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-13 04:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

dbOverview API with nullable string

Browse Source
This commit is contained in:
Ankit Anand 2021-05-29 22:15:49 +05:30
parent 588bf2b93a
commit 762a3cdfcd
6 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pkg/query-service/__debug_bin Executable file
View File

Binary file not shown.

30
pkg/query-service/app/clickhouseReader/reader.go
View File

@ -239,3 +239,33 @@ func (r *ClickHouseReader) SearchSpans(ctx context.Context, queryParams *model.S
return &searchSpansResult, nil
}
func (r *ClickHouseReader) GetServiceDBOverview(ctx context.Context, queryParams *model.GetServiceOverviewParams) (*[]model.ServiceDBOverviewItem, error) {
var serviceDBOverviewItem []model.ServiceDBOverviewItem
query := fmt.Sprintf("SELECT toStartOfInterval(timestamp, INTERVAL %s minute) as time, avg(durationNano) as avgDuration, count(1) as numCalls, dbSystem FROM %s WHERE serviceName='%s' AND timestamp>='%s' AND timestamp<='%s' AND kind='3' AND dbName IS NOT NULL GROUP BY time, dbSystem ORDER BY time DESC", strconv.Itoa(int(queryParams.StepSeconds/60)), r.indexTable, queryParams.ServiceName, strconv.FormatInt(queryParams.Start.UnixNano(), 10), strconv.FormatInt(queryParams.End.UnixNano(), 10))
err := r.db.Select(&serviceDBOverviewItem, query)
zap.S().Info(query)
if err != nil {
zap.S().Debug("Error in processing sql query: ", err)
return nil, fmt.Errorf("Error in processing sql query")
}
for i, _ := range serviceDBOverviewItem {
timeObj, _ := time.Parse(time.RFC3339Nano, serviceDBOverviewItem[i].Time)
serviceDBOverviewItem[i].Timestamp = int64(timeObj.UnixNano())
serviceDBOverviewItem[i].Time = ""
serviceDBOverviewItem[i].CallRate = float32(serviceDBOverviewItem[i].NumCalls) / float32(queryParams.StepSeconds)
}
if serviceDBOverviewItem == nil {
serviceDBOverviewItem = []model.ServiceDBOverviewItem{}
}
return &serviceDBOverviewItem, nil
}

4
pkg/query-service/app/druidReader/reader.go
View File

@ -50,3 +50,7 @@ func (druid *DruidReader) GetServices(ctx context.Context, query *model.GetServi
func (druid *DruidReader) SearchSpans(ctx context.Context, query *model.SpanSearchParams) (*[]model.SearchSpansResult, error) {
return druidQuery.SearchSpans(druid.Client, query)
}
func (druid *DruidReader) GetServiceDBOverview(ctx context.Context, query *model.GetServiceOverviewParams) (*[]model.ServiceDBOverviewItem, error) {
return druidQuery.GetServiceDBOverview(druid.SqlClient, query)
}

25
pkg/query-service/app/http_handler.go
View File

@ -60,7 +60,7 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router) {
router.HandleFunc("/api/v1/services", aH.getServices).Methods(http.MethodGet)
// router.HandleFunc("/api/v1/services/list", aH.getServicesList).Methods(http.MethodGet)
router.HandleFunc("/api/v1/service/overview", aH.getServiceOverview).Methods(http.MethodGet)
// router.HandleFunc("/api/v1/service/dbOverview", aH.getServiceDBOverview).Methods(http.MethodGet)
router.HandleFunc("/api/v1/service/dbOverview", aH.getServiceDBOverview).Methods(http.MethodGet)
// router.HandleFunc("/api/v1/service/externalAvgDuration", aH.GetServiceExternalAvgDuration).Methods(http.MethodGet)
// router.HandleFunc("/api/v1/service/externalErrors", aH.getServiceExternalErrors).Methods(http.MethodGet)
// router.HandleFunc("/api/v1/service/external", aH.getServiceExternal).Methods(http.MethodGet)
@ -177,21 +177,22 @@ func (aH *APIHandler) user(w http.ResponseWriter, r *http.Request) {
// }
// func (aH *APIHandler) getServiceDBOverview(w http.ResponseWriter, r *http.Request) {
func (aH *APIHandler) getServiceDBOverview(w http.ResponseWriter, r *http.Request) {
// query, err := parseGetServiceExternalRequest(r)
// if aH.handleError(w, err, http.StatusBadRequest) {
// return
// }
query, err := parseGetServiceExternalRequest(r)
if aH.handleError(w, err, http.StatusBadRequest) {
return
}
// result, err := druidQuery.GetServiceDBOverview(aH.sqlClient, query)
// if aH.handleError(w, err, http.StatusBadRequest) {
// return
// }
result, err := (*aH.reader).GetServiceDBOverview(context.Background(), query)
// aH.writeJSON(w, r, result)
if aH.handleError(w, err, http.StatusBadRequest) {
return
}
// }
aH.writeJSON(w, r, result)
}
// func (aH *APIHandler) getServiceExternal(w http.ResponseWriter, r *http.Request) {

1
pkg/query-service/app/interface.go
View File

@ -11,4 +11,5 @@ type Reader interface {
GetServices(ctx context.Context, query *model.GetServicesParams) (*[]model.ServiceItem, error)
// GetApplicationPercentiles(ctx context.Context, query *model.ApplicationPercentileParams) ([]godruid.Timeseries, error)
SearchSpans(ctx context.Context, query *model.SpanSearchParams) (*[]model.SearchSpansResult, error)
GetServiceDBOverview(ctx context.Context, query *model.GetServiceOverviewParams) (*[]model.ServiceDBOverviewItem, error)
}

12
pkg/query-service/model/response.go
View File

@ -78,12 +78,12 @@ type ServiceExternalItem struct {
}
type ServiceDBOverviewItem struct {
Time string `json:"time,omitempty"`
Timestamp int64 `json:"timestamp,omitempty"`
DBSystem string `json:"dbSystem,omitempty"`
AvgDuration float32 `json:"avgDuration,omitempty"`
NumCalls int `json:"numCalls,omitempty"`
CallRate float32 `json:"callRate,omitempty"`
Time string `json:"time,omitempty" db:"time,omitempty"`
Timestamp int64 `json:"timestamp,omitempty" db:"timestamp,omitempty"`
DBSystem string `json:"dbSystem,omitempty" db:"dbSystem,omitempty"`
AvgDuration float32 `json:"avgDuration,omitempty" db:"avgDuration,omitempty"`
NumCalls int `json:"numCalls,omitempty" db:"numCalls,omitempty"`
CallRate float32 `json:"callRate,omitempty" db:"callRate,omitempty"`
}
type ServiceMapDependencyItem struct {