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

chore: better error handling

Browse Source
This commit is contained in:
Ankit Nayan 2023-01-08 22:49:11 +05:30
parent 435d74c37e
commit 0c27d5acbc
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ee/query-service/app/server.go
View File

@ -275,22 +275,31 @@ func extractDashboardMetaData(path string, r *http.Request) (map[string]interfac
data := map[string]interface{}{} data := map[string]interface{}{}
if path == pathToExtractBodyFrom && (r.Method == "POST") { if path == pathToExtractBodyFrom && (r.Method == "POST") {
bodyBytes, _ := ioutil.ReadAll(r.Body) if r.Body != nil {
r.Body.Close() // must close bodyBytes, err := ioutil.ReadAll(r.Body)
r.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes)) if err != nil {
return nil, false
json.Unmarshal(bodyBytes, &requestBody) }
r.Body.Close() // must close
r.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
json.Unmarshal(bodyBytes, &requestBody)
} else {
return nil, false
}
} else { } else {
return nil, false return nil, false
} }
compositeMetricQuery, compositeMetricQueryExists := requestBody["compositeMetricQuery"] compositeMetricQuery, compositeMetricQueryExists := requestBody["compositeMetricQuery"]
compositeMetricQueryMap := compositeMetricQuery.(map[string]interface{})
signozMetricFound := false signozMetricFound := false
if compositeMetricQueryExists { if compositeMetricQueryExists {
compositeMetricQueryMap := compositeMetricQuery.(map[string]interface{})
signozMetricFound = telemetry.GetInstance().CheckSigNozMetrics(compositeMetricQueryMap) signozMetricFound = telemetry.GetInstance().CheckSigNozMetrics(compositeMetricQueryMap)
queryType, queryTypeExists := compositeMetricQueryMap["queryType"] queryType, queryTypeExists := compositeMetricQueryMap["queryType"]
if queryTypeExists { if queryTypeExists {
data["queryType"] = queryType data["queryType"] = queryType

21
pkg/query-service/app/server.go
View File

@ -244,25 +244,34 @@ func extractDashboardMetaData(path string, r *http.Request) (map[string]interfac
data := map[string]interface{}{} data := map[string]interface{}{}
if path == pathToExtractBodyFrom && (r.Method == "POST") { if path == pathToExtractBodyFrom && (r.Method == "POST") {
bodyBytes, _ := ioutil.ReadAll(r.Body) if r.Body != nil {
r.Body.Close() // must close bodyBytes, err := ioutil.ReadAll(r.Body)
r.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes)) if err != nil {
json.Unmarshal(bodyBytes, &requestBody) return nil, false
}
r.Body.Close() // must close
r.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
json.Unmarshal(bodyBytes, &requestBody)
} else {
return nil, false
}
} else { } else {
return nil, false return nil, false
} }
compositeMetricQuery, compositeMetricQueryExists := requestBody["compositeMetricQuery"] compositeMetricQuery, compositeMetricQueryExists := requestBody["compositeMetricQuery"]
compositeMetricQueryMap := compositeMetricQuery.(map[string]interface{})
signozMetricFound := false signozMetricFound := false
if compositeMetricQueryExists { if compositeMetricQueryExists {
compositeMetricQueryMap := compositeMetricQuery.(map[string]interface{})
signozMetricFound = telemetry.GetInstance().CheckSigNozMetrics(compositeMetricQueryMap) signozMetricFound = telemetry.GetInstance().CheckSigNozMetrics(compositeMetricQueryMap)
queryType, queryTypeExists := compositeMetricQueryMap["queryType"] queryType, queryTypeExists := compositeMetricQueryMap["queryType"]
if queryTypeExists { if queryTypeExists {
data["queryType"] = queryType data["queryType"] = queryType
} }
panelType, panelTypeExists := compositeMetricQueryMap["panelType"] panelType, panelTypeExists := compositeMetricQueryMap["panelType"]
if panelTypeExists { if panelTypeExists {